Changeset 41320 for titan/mediathek


Ignore:
Timestamp:
Nov 28, 2017, 4:15:46 PM (2 years ago)
Author:
obi
Message:

fix

Location:
titan/mediathek
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • titan/mediathek/localhoster/hoster.sh

    r41303 r41320  
    55INPUT=$2
    66DEST=$3
     7USER=$DEST
     8PASS=$4
    79
    810INPUT=`echo $INPUT | sed 's!/Out/?s=!!g'`
     
    418420        mkdir $TMP > /dev/null 2>&1
    419421
    420         echo "$BIN $youtubebin $INPUT" > /tmp/.last_hoster_youtube_dl.log
    421 
    422         $BIN $youtubebin "$INPUT" > $TMP/$TYPE.$hoster.$FILENAME.streamlist
     422        echo "$BIN $youtubebin $INPUT --username $USER --password $PASS" > /tmp/.last_hoster_youtube_dl.log
     423
     424        $BIN $youtubebin "$INPUT" --username "$USER" --password "$PASS" > $TMP/$TYPE.$hoster.$FILENAME.streamlist
    423425        echo $TMP/$TYPE.$hoster.$FILENAME.streamlist
    424426}
     
    509511        echo  "$INPUT" > /tmp/.last_hoster_$TYPE_$hoster.log
    510512        case $hoster in
    511                 *) youtube_dl $INPUT;;
     513                *) youtube_dl $INPUT $USER $PASS;;
    512514        esac
    513515fi
  • titan/mediathek/localparser_secret/sportsondemand.sh

    r41305 r41320  
    560560                                URLTMP=`cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.6 | sed 's#//#\nhttps://#' | grep ^"https://"`
    561561                                if [ "$debug" = "1" ]; then echo $INPUT 999999 $URLTMP; fi
    562 
     562#echo $INPUT 999999 $URLTMP
    563563                                email=`cat /mnt/config/titan.cfg | grep vk_user | cut -d"=" -f2`
    564564                                pass=`cat /mnt/config/titan.cfg | grep vk_pass | cut -d"=" -f2`
     565
     566                                URLYDL=$(cat $(/tmp/localhoster/hoster.sh youtube_dl "$URLTMP" $email $pass))
    565567
    566568                                $curlbin2 "$URLTMP" --referer "$URL$PAGE" -o $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.7
     
    594596                                curl "$URLTMP" --referer "$referer" -o $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12
    595597
    596                                 if [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "This video has been removed from public access." | wc -l` -eq 1 ];then
     598                                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
    597599                                        URL="errormsg=This video has been removed from public access."
    598                                 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
     600                                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
    599601                                        URL="errormsg=This video is protected by privacy settings and is not available for viewing."
    600                                 elif [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "Authorization required" | wc -l` -eq 1 ];then
     602                                elif [ -z "$URLYDL" ] && [ `cat $TMP/cache.$PARSER.$INPUT.$FROM.$FILENAME.12 | grep "Authorization required" | wc -l` -eq 1 ];then
    601603                                        URL="errormsg=You need access to https://vk.com to use this full stream, add VK User/Pass on Tithek Settings"
    602604                                else
     
    626628                                                rm -f $STREAMLIST
    627629                                        fi
    628                                         for ROUND in $URLHLS2 $URLHLS $URL720 $URL360 $URLMP4; do
     630                                        for ROUND in $URLYDL $URLHLS2 $URLHLS $URL720 $URL360 $URLMP4; do
    629631                                                echo "$ROUND" >> $STREAMLIST
    630632                                        done
     
    783785                                echo "$LINE" >> $TMP/$PARSER.$INPUT.$FROM.$FILENAME.list
    784786                        fi
    785 
    786787                done 3<$TMP/cache.$PARSER.$FROM.$FILENAME.2
    787788#               rm $TMP/cache.* > /dev/null 2>&1
Note: See TracChangeset for help on using the changeset viewer.