Changeset 41279

Timestamp:

11/25/17 16:49:46 (6 years ago)

Author:

obi

Message:

update tithek hoster streamlist

Location:

titan

Files:

• mediathek/localhoster/hoster.sh (modified) (3 diffs)
• plugins/tithek/tithek_global.h (modified) (1 diff)

titan/mediathek/localhoster/hoster.sh

@@ -7 +7 @@
 
 INPUT=`echo $INPUT | sed 's!/Out/?s=!!g'`
+
+#FILENAME="`echo $SRC | tr '/' '\n' | tail -n1 | sed 's/.sh//'` $INPUT $PAGE $NEXT"
+FILENAME="`echo $INPUT | sed -e 's/\&\+/./g' -e 's#\/\+#.#g' -e 's/\?\+/./g' -e 's/;\+/./g' -e 's/=\+/./g' -e 's/ \+/./g' -e 's/\.\+/./g'`"
+PICNAME=`echo $FILENAME`
+
+if [ -z "$FILENAME" ]; then
+        FILENAME=none
+fi
 
 ARCH=`cat /etc/.arch`
@@ -241 +249 @@
 aliez()
 {
+        rm -f $TMP/cache.hoster.$hoster.* > /dev/null 2>&1
         #http://emb.aliez.me/player/live.php?id=56180&w=700&h=480"
         REFERER=`echo "$INPUT" | sed -e 's/=/%3D/g' -e 's/&/%26/g'`
         EXTRA="|Referer=$REFERER&User-Agent=$USERAGENT"
 
-        $curlbin "$INPUT" -o $TMP/cache.$hoster.1
-        cat $TMP/cache.$hoster.1 | sed 's/source:/\nfound=/' | grep ^found= | cut -d"'" -f2 >$TMP/cache.$hoster.url1
-        URL=`cat $TMP/cache.$hoster.url1 | head -n1`
-        URLMP41="$URL$EXTRA"
-
+        STREAMLIST="$TMP/$TYPE.$hoster.$FILENAME.streamlist"
+        if [ -e "$STREAMLIST" ];then
+                rm -f $STREAMLIST > /dev/null 2>&1
+        fi
+
+        $curlbin "$INPUT" -o $TMP/cache.hoster.$hoster.1
+        cat $TMP/cache.hoster.$hoster.1 | sed 's/source:/\nfound=/' | grep ^found= | cut -d"'" -f2 >$TMP/cache.hoster.$hoster.url1
+        URL=`cat $TMP/cache.hoster.$hoster.url1 | head -n1`
+        if [ ! -z "$URL" ];then
+                echo "$URL$EXTRA" >> $STREAMLIST
+        fi
 #       URL=""
         #file:  'http://a3.aliez.me:8080/hls/streama57449/index.m3u8?st=dgw2dOq8tyFkLLBLn2ycXA',
 
-        cat $TMP/cache.$hoster.1 | sed 's/file:/\nfound=/' | grep ^found= | cut -d"'" -f2 >$TMP/cache.$hoster.url2
-        URL=`cat $TMP/cache.$hoster.url2 | head -n1`
-        URLMP42="$URL$EXTRA"
-
+        cat $TMP/cache.hoster.$hoster.1 | sed 's/file:/\nfound=/' | grep ^found= | cut -d"'" -f2 >$TMP/cache.hoster.$hoster.url2
+        URL=`cat $TMP/cache.hoster.$hoster.url2 | head -n1`
+        if [ ! -z "$URL" ];then
+                echo "$URL$EXTRA" >> $STREAMLIST
+        fi
 #URL=""
         #"file":                "rtmp%3A%2F%2Fa3.aliez.me%2Flive%2Fstreama57449%3Ftoken%3Dd11304fabb8e64327df8427e1c2fd5d9"
-        cat $TMP/cache.$hoster.1 | sed 's/"file":/\nfound=/' | grep ^found= | cut -d'"' -f2 >$TMP/cache.$hoster.url3
-        URL=`cat $TMP/cache.$hoster.url3 | head -n1`
+        cat $TMP/cache.hoster.$hoster.1 | sed 's/"file":/\nfound=/' | grep ^found= | cut -d'"' -f2 >$TMP/cache.hoster.$hoster.url3
+        URL=`cat $TMP/cache.hoster.$hoster.url3 | head -n1`
 
         if [ "`echo $URL | grep rtmp | wc -l`" -eq 1 ];then
                 #new swfobject.embedSWF("http://i.aliez.me/swf/playernew.swf?0", "mediaspace", "700", "480", "9.0.115.0", false, flashvars, params);
-                cat $TMP/cache.$hoster.1 | sed 's/swfobject.embedSWF/\nfound=/' | grep ^found= | cut -d'"' -f2 >$TMP/cache.$hoster.rtmp.swfurl
-                SWFURL=`cat $TMP/cache.$hoster.rtmp.swfurl | head -n1`
+                cat $TMP/cache.hoster.$hoster.1 | sed 's/swfobject.embedSWF/\nfound=/' | grep ^found= | cut -d'"' -f2 >$TMP/cache.hoster.$hoster.url3.rtmp.swfurl
+                SWFURL=`cat $TMP/cache.hoster.$hoster.url3.rtmp.swfurl | head -n1`
                 URL=`echo "$URL" | sed -e 's/%3A/:/g' -e 's!%2F!/!g' -e 's!%3D!=!g' -e 's!%3F!?!g'`
                 EXTRA=" pageUrl=$REFERER"
@@ -271 +287 @@
                         EXTRA="$EXTRA swfUrl=$SWFURL swfVfy=1 timeout=15 live=1"
                 fi
-                URLRTMP="$URL$EXTRA"
-        fi
-
-        STREAMLIST="$TMP/$PARSER.$INPUT.$FROM.$FILENAME.streamlist"
-        if [ -e "$STREAMLIST" ];then
-                rm -f $STREAMLIST
-        fi
-        for ROUND in $URLMP42 $URLMP41 $URLRTMP; do
-                echo "$ROUND" >> $STREAMLIST
-        done
+                if [ ! -z "$URL" ];then
+                        echo "$URL$EXTRA" >> $STREAMLIST
+                fi
+        fi
         URL=$STREAMLIST
 
 
         echo "$URL"
-#       echo "$URL|If-None-Match=5a1842ad-c4&Accept=*/*&Referer=$REFERER&User-Agent=Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36"
-
-
 }
 

titan/plugins/tithek/tithek_global.h

@@ -1354 +1354 @@
                                 nummer = ostrcat("auto", NULL, 0, 0);
 
-                        if(ostrstr(ret1[i].part, "http://") != NULL)
-                                title = ostrcat("Http Stream", NULL, 0, 0);
-                        else if(ostrstr(ret1[i].part, "https://") != NULL)
-                                title = ostrcat("Https Stream", NULL, 0, 0);
-                        else if(ostrstr(ret1[i].part, "rtmp://") != NULL)
-                                title = ostrcat("RTMP Stream", NULL, 0, 0);
+                        title = ostrcat(ret1[i].part, NULL, 0, 0);
+                        title = stringreplacecharonce(title, ':', '\0');
+                        string_toupper(title);
+                        title = ostrcat(title, " Stream", 1, 0);
 
                         streamurl = ostrcat(ret1[i].part, NULL, 0, 0);