From 67f3bb69c983931981f258f56f99be31e247ee0b Mon Sep 17 00:00:00 2001 From: Philpp Bisson Date: Mon, 24 Mar 2014 11:55:17 +0100 Subject: [PATCH 1/5] problem with signiture --- src/lounge/triggers/helpers/youtube | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 From 7fc52880f6b57fdca23dbf31d40c5998978eccbe Mon Sep 17 00:00:00 2001 From: Amir Hassan Date: Tue, 15 Jul 2014 15:58:06 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) 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 From 52ed1a68892b1d79ad423765d6244a7fb29aa903 Mon Sep 17 00:00:00 2001 From: burnoutberni Date: Sun, 14 Dec 2014 20:53:18 +0100 Subject: [PATCH 3/5] added put.io integration --- src/lounge/triggers/helpers/putio | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 src/lounge/triggers/helpers/putio diff --git a/src/lounge/triggers/helpers/putio b/src/lounge/triggers/helpers/putio new file mode 100755 index 000000000..73d430be5 --- /dev/null +++ b/src/lounge/triggers/helpers/putio @@ -0,0 +1,9 @@ +#!/bin/bash +url="$1" + +stream=`curl -IsL -w "%{url_effective}" "$url" -o /dev/null` +stream=${stream:5} +stream="http"$stream + +echo $stream +echo "put.io Stream" From 5add0e653d2095301c79a6b157c7e272a02e45f4 Mon Sep 17 00:00:00 2001 From: burnoutberni Date: Sat, 14 Feb 2015 19:19:57 +0100 Subject: [PATCH 4/5] added title functionality --- src/lounge/triggers/helpers/putio | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/lounge/triggers/helpers/putio diff --git a/src/lounge/triggers/helpers/putio b/src/lounge/triggers/helpers/putio old mode 100755 new mode 100644 index 73d430be5..8a4686541 --- a/src/lounge/triggers/helpers/putio +++ b/src/lounge/triggers/helpers/putio @@ -1,9 +1,19 @@ #!/bin/bash url="$1" -stream=`curl -IsL -w "%{url_effective}" "$url" -o /dev/null` +IFS="&" read -a urlparts <<< "${url}" + +stream=`curl -IsL -w "%{url_effective}" "${urlparts[0]}" -o /dev/null` stream=${stream:5} stream="http"$stream +title=${urlparts[1]} +title=${title#title=} + echo $stream -echo "put.io Stream" +if [ $title ] + then + echo $title + else + echo "put.io Stream" +fi From ba186fe3ad1346fe197fa6bb1e31d1a954ec6ff7 Mon Sep 17 00:00:00 2001 From: burnoutberni Date: Sat, 14 Feb 2015 19:53:18 +0100 Subject: [PATCH 5/5] added urldecoding --- src/lounge/triggers/helpers/putio | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/lounge/triggers/helpers/putio diff --git a/src/lounge/triggers/helpers/putio b/src/lounge/triggers/helpers/putio old mode 100644 new mode 100755 index 8a4686541..f7796f631 --- a/src/lounge/triggers/helpers/putio +++ b/src/lounge/triggers/helpers/putio @@ -1,19 +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 + echo $title | urldecode else echo "put.io Stream" fi