diff --git a/README.md b/README.md index a7747bfe5..e8e274bab 100644 --- a/README.md +++ b/README.md @@ -25,3 +25,4 @@ Contributors * Amir Hassan: * Jascha Ehrenreich * Bernd Forstner +* Florian Bittner diff --git a/src/lounge/triggers/helpers/putio b/src/lounge/triggers/helpers/putio new file mode 100755 index 000000000..f7796f631 --- /dev/null +++ b/src/lounge/triggers/helpers/putio @@ -0,0 +1,33 @@ +#!/bin/bash +# helper script by @burnoutberni +# Get stream URL and title from put.io and resolve to video file + +# input format: https://put.io/v2/files/123456789/mp4/stream?token=abcd1234&title=urlencoded_title +# &title= can be omitted + +urldecode(){ + echo -e "$(sed 's/+/ /g; s/%/\\x/g')" +} + +url="$1" + +# Split title from URL at '&' +IFS="&" read -a urlparts <<< "${url}" + +# Resolve URL +stream=`curl -IsL -w "%{url_effective}" "${urlparts[0]}" -o /dev/null` +stream=${stream:5} +stream="http"$stream + +# Format title +title=${urlparts[1]} +title=${title#title=} + +# Echo video URL and title if existing +echo $stream +if [ $title ] + then + echo $title | urldecode + else + echo "put.io Stream" +fi diff --git a/src/lounge/triggers/helpers/youtube b/src/lounge/triggers/helpers/youtube index 286c8affd..62f702b68 100755 --- a/src/lounge/triggers/helpers/youtube +++ b/src/lounge/triggers/helpers/youtube @@ -30,7 +30,7 @@ IFS="," set -- $STREAMS SELECTED= -for s in $@; do +for s in $@; do f=$(l_urldecode "`parse_query $s "type"`"|cut -d ';' -f1) if [ "$f" != "video/x-flv" ]; then @@ -57,7 +57,7 @@ for s in $@; do elif [ -z "$small" -a "$q" == "small" ]; then small="$s" fi -done +done SELECTED="$large" @@ -69,9 +69,9 @@ if [ -z "$SELECTED" ]; then SELECTED="$small" fi -SURL=$(l_urldecode "`parse_query $SELECTED "url"`") -SIG="`parse_query $SELECTED "sig"`" -URL="$SURL&signature=$SIG" +URL=$(l_urldecode "`parse_query $SELECTED "url"`") +# SIG="`parse_query $SELECTED "sig"`" +# URL="$SURL&signature=$SIG" echo $URL echo $TITLE