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
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 [ -z "$foreign" ];then
+if [ "${_COOKIE[fakemp4]}" = yes ]; then
+ fakename="$(printf %s "${info}" |sed -r 's;.*/;;g; s;.[^.]+$;;; s;\.;_;g;')"
+ if [ "$info" != "${fakename}.mp4" ]; then
+ [ -e "${_DATA}/mp4/${fakename}.mp4" ] || ln -s "${_DATA}/videos/$info" "${_DATA}/mp4/${fakename}.mp4"
+ videourl="$(urlsafe "mp4/${fakename}.mp4")"
+ else
+ videourl="$(urlsafe "videos/$info")"
+ fi
+elif [ -n "$foreign" ]; then
_COOKIE[watch]=server
videourl="${_GET[url]}"
+ watch_link="w=$(urlsafe "${_GET[return]}")"
+elif [ -z "$info" ]; then
+ videourl="$(urlsafe "${location#/}")"
else
videourl="$(urlsafe "videos/$info")"
fi
case "$_COOKIE[watch]" in
raspi)
- rpiaddr="http://atoemchen.helmchyn.no-ip.biz/?action=watch&url="
- redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
+ ncat "$RHOST" "$RPORT" >&- <<-EOF
+ GET /?action=watch&url=$(urlsafe "http://${HTTP_HOST}/${videourl}") HTTP/1.1$(printf \\r)
+ Host: ${RHOST}$(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" \
server)
[ -n "$location" ] && playuri="${treeroot%/}/${location#/}"
[ -n "$info" ] && playuri="${_DATA}/videos/$info"
+ [ -n "$foreign" ] && playuri="$videourl"
metafile="${_DATA}/meta/${info}.meta"
fifofile="${_DATA}/mplayer.fifo"
statusfile="${_DATA}/mplayer.status"
statusfile="/tmp/mplayer.status"
- volume="$(validate "$(cat "${_DATA}/mplayer.volume")" '[1-9]?[0-9]|100' 20)"
+ volume="$(validate "$(cat "${_DATA}/mplayer.volume" || true)" '[1-9]?[0-9]|100' 20)"
[ \! -p "$fifofile" ] && rm -f "$fifofile" && mkfifo -m 600 "$fifofile"
debug PLAYURI "$playuri"
cp "$metafile" "$playmeta"
else
rm "$playmeta"
- "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >/dev/null
+ "${_EXEC}"/helpers/genmeta.sh "$playuri" "$playmeta" >&-
fi
export DISPLAY=":0"
uid="$(id |sed -rn '1s;.*uid=([0-9]+)[^0-9].*;\1;p')"
export XDG_RUNTIME_DIR="/run/user/$uid" # required for Pulseaudio
- xrandr >/dev/null # helps enable all screens
-
- # nohup /usr/bin/mplayer \
- # -slave -input file="$fifofile" \
- # -volume "$volume" \
- # "$playuri" >"$statusfile" 2>/dev/null &
-
- # MPlayer2: (statusline on stderr)
- nohup /usr/bin/mplayer \
- --slave --input=file="$fifofile" \
- --volume="$volume" \
- "$playuri" 2>"$statusfile" >/dev/null &
+ xrandr || true >&- # helps enable all screens
+ xvkbd -text '\x+10000\y+10000' || true >&-
+
+ if mplayer |grep -q MPlayer2; then
+ nohup /usr/bin/mplayer \
+ --slave --input=file="$fifofile" \
+ --volume="$volume" \
+ "$playuri" 2>"$statusfile" >&- &
+ else
+ nohup /usr/bin/mplayer \
+ -slave -input file="$fifofile" \
+ -volume "$volume" \
+ "$playuri" >"$statusfile" &
+ fi
chmod 600 "$statusfile"