Changeset 41320

Timestamp:

11/28/17 16:15:46 (6 years ago)

Author:

obi

Message:

fix

Location:

titan/mediathek

Files:

• localhoster/hoster.sh (modified) (3 diffs)
• localparser_secret/sportsondemand.sh (modified) (4 diffs)

titan/mediathek/localhoster/hoster.sh

@@ -5 +5 @@
 INPUT=$2
 DEST=$3
+USER=$DEST
+PASS=$4
 
 INPUT=`echo $INPUT | sed 's!/Out/?s=!!g'`
@@ -418 +420 @@
         mkdir $TMP > /dev/null 2>&1
 
-        echo "$BIN $youtubebin $INPUT" > /tmp/.last_hoster_youtube_dl.log
-
-        $BIN $youtubebin "$INPUT" > $TMP/$TYPE.$hoster.$FILENAME.streamlist
+        echo "$BIN $youtubebin $INPUT --username $USER --password $PASS" > /tmp/.last_hoster_youtube_dl.log
+
+        $BIN $youtubebin "$INPUT" --username "$USER" --password "$PASS" > $TMP/$TYPE.$hoster.$FILENAME.streamlist
         echo $TMP/$TYPE.$hoster.$FILENAME.streamlist
 }
@@ -509 +511 @@
         echo  "$INPUT" > /tmp/.last_hoster_$TYPE_$hoster.log
         case $hoster in
-                *) youtube_dl $INPUT;;
+                *) youtube_dl $INPUT $USER $PASS;;
         esac
 fi

titan/mediathek/localparser_secret/sportsondemand.sh

@@ -560 +560 @@
                                 URLTMP=`cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.6 | sed 's#//#\nhttps://#' | grep ^"https://"`
                                 if [ "$debug" = "1" ]; then echo $INPUT 999999 $URLTMP; fi
-
+#echo $INPUT 999999 $URLTMP
                                 email=`cat /mnt/config/titan.cfg | grep vk_user | cut -d"=" -f2`
                                 pass=`cat /mnt/config/titan.cfg | grep vk_pass | cut -d"=" -f2`
+
+                                URLYDL=$(cat $(/tmp/localhoster/hoster.sh youtube_dl "$URLTMP" $email $pass))
 
                                 $curlbin2 "$URLTMP" --referer "$URL$PAGE" -o $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.7
@@ -594 +596 @@
                                 curl "$URLTMP" --referer "$referer" -o $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12
 
-                                if [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "This video has been removed from public access." | wc -l` -eq 1 ];then
+                                if [ -z "$URLYDL" ] && [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "This video has been removed from public access." | wc -l` -eq 1 ];then
                                         URL="errormsg=This video has been removed from public access."
-                                elif [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "This video is protected by privacy settings and is not available for viewing." | wc -l` -eq 1 ];then
+                                elif [ -z "$URLYDL" ] && [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "This video is protected by privacy settings and is not available for viewing." | wc -l` -eq 1 ];then
                                         URL="errormsg=This video is protected by privacy settings and is not available for viewing."
-                                elif [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "Authorization required" | wc -l` -eq 1 ];then
+                                elif [ -z "$URLYDL" ] && [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "Authorization required" | wc -l` -eq 1 ];then
                                         URL="errormsg=You need access to https://vk.com to use this full stream, add VK User/Pass on Tithek Settings"
                                 else
@@ -626 +628 @@
                                                 rm -f $STREAMLIST
                                         fi
-                                        for ROUND in $URLHLS2 $URLHLS $URL720 $URL360 $URLMP4; do
+                                        for ROUND in $URLYDL $URLHLS2 $URLHLS $URL720 $URL360 $URLMP4; do
                                                 echo "$ROUND" >> $STREAMLIST
                                         done
@@ -783 +785 @@
                                 echo "$LINE" >> $TMP/$PARSER.$INPUT.$FROM.$FILENAME.list
                         fi
-
                 done 3<$TMP/cache.$PARSER.$FROM.$FILENAME.2
 #               rm $TMP/cache.* > /dev/null 2>&1