X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fwatch.sh;h=f79600984ad4dc89a4afd57161f3969a88d96431;hb=ff8b54fea63a05cceab0a2f834f22b0db92e8bdf;hp=b7fad863753d47f28bc40b94c5c9cd81e1a80d4d;hpb=dfdaf2aee35b9b1ae112df2828b6ab7fa380a7a8;p=serve0

diff --git a/actions/watch.sh b/actions/watch.sh
index b7fad86..f796009 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -9,13 +9,9 @@ search="${_POST[s]}"
 filter="${_POST[f]}"
 page="${_POST[pn]}"
 
-watch_link=''
+watch_link="${_POST[page]}&"
 [ -n "$location" ] && watch_link="l=$(urlsafe "${location}")&"
 [ -n "$info" ]     && watch_link="i=$(urlsafe "${info}")&"
-[ -n "$order" ]    && watch_link="${watch_link}o=${order}&"
-[ -n "$search" ]   && watch_link="${watch_link}s=${search}&"
-[ -n "$filter" ]   && watch_link="${watch_link}f=${filter}&"
-[ -n "$page" ]     && watch_link="${watch_link}pn=${page}"
 
 meta="${_DATA}/meta/$info.meta"
 head -n1 "$meta" |read length width height filename
@@ -31,6 +27,7 @@ if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
 elif [ -n "$foreign" ]; then
   _COOKIE[watch]=server
   videourl="${_GET[url]}"
+  watch_link="w=$(urlsafe "${_GET[return]}")"
 elif [ -z "$info" ]; then
   videourl="$(urlsafe "${location#/}")"
 else
@@ -39,8 +36,14 @@ fi
 
 case "$_COOKIE[watch]" in
   raspi)
-    rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
-    redirect "${rpiaddr}$(urlsafe "http://${HTTP_HOST}/${videourl}")"
+    #rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch"
+    #redirect "${rpiaddr}&url=$(urlsafe "http://${HTTP_HOST}/${videourl}")&return=$(urlsafe "http://${HTTP_HOST}/${_POST[page]}")"
+    ncat atoemchen 80 >&- <<-EOF
+	GET /?action=watch&url=$(urlsafe "http://${HTTP_HOST}/${videourl}") HTTP/1.1$(printf \\r)
+	Host: atoemchen$(printf \\r)
+	$(printf \\r)
+	EOF
+    redirect "?p=playctl&${watch_link}w=$(urlsafe "${_POST[page]}#${_GET[i]}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \