X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=actions%2Fwatch.sh;h=c198f4a000f851ebb5a1c48c97133ee3747e2340;hb=ede7b5bc5379c40a8351f3a01b8f4f2a52711d7d;hp=2a91ce89b751f976d128f30787c8c21023f96aaa;hpb=be2bfa17d3c7b2ed13c01ee42f54bd614cbbe3e9;p=serve0

diff --git a/actions/watch.sh b/actions/watch.sh
index 2a91ce8..c198f4a 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -2,17 +2,19 @@
 
 cgi_refdata
 info="${_GET[i]}"
+location="$(invalidate "${_GET[l]}" '(.*/)?\.\.(/.*)?|' /)"
 order="${_REF[o]}"
 search="${_REF[s]}"
 filter="${_REF[f]}"
 page="${_REF[pn]}"
 
 watch_link=''
-[ -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}"
+[ -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
@@ -25,6 +27,8 @@ linkinfo="$(urlsafe "$info")"
 if [ "${_COOKIE[fakemp4]}" = yes ] && [ "${info##*.}" != mp4 ]; then
   [ -e "${_DATA}/videos/${info%.*}.mp4" ] || ln -s "${_DATA}/videos/$info" "${_DATA}/mp4/${info%.*}.mp4"
   videourl="$(urlsafe "mp4/${info%.*}.mp4")"
+elif [ -z "$info" ]; then
+  videourl="$(urlsafe "${location#/}")"
 else
   videourl="$(urlsafe "videos/$info")"
 fi
@@ -47,8 +51,20 @@ case "${_COOKIE[watch]}" in
     redirect "$videourl"
   ;;
   server)
-    DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 nohup /usr/bin/mplayer -ao pulse --quiet "${_DATA}/videos/$info" >/dev/null 2>/dev/null &
-    redirect "$HTTP_REFERER"
+    [ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
+    [ -n "$info" ]     && playuri="${_DATA}/videos/$info"
+
+    fifofile="${_DATA}/mplayer.fifo"
+    volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
+    [ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
+
+    DISPLAY=:0 XDG_RUNTIME_DIR=/run/user/1006 \
+      nohup /usr/bin/mplayer -ao pulse --quiet \
+      --slave --input=file="$fifofile" \
+      --volume="$volume" \
+      "$playuri" >/dev/null 2>/dev/null &
+
+    redirect "?p=playctl&${watch_link}"
   ;;
   *) redirect "?p=view&${watch_link}"
   ;;