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

diff --git a/actions/watch.sh b/actions/watch.sh
index 39ca7e0..2a91ce8 100755
--- a/actions/watch.sh
+++ b/actions/watch.sh
@@ -8,7 +8,7 @@ filter="${_REF[f]}"
 page="${_REF[pn]}"
 
 watch_link=''
-[ -n "$info" ]   && watch_link="i=$(urlsave "${info}")&"
+[ -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}&"
@@ -20,20 +20,20 @@ head -n1 "$meta" |read length width height filename
 [ "$width"  -gt 0 ] || width=0
 [ "$height" -gt 0 ] || height=0
 
-linkinfo="$(urlsave "$info")"
+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="$(urlsave "mp4/${info%.*}.mp4")"
+  videourl="$(urlsafe "mp4/${info%.*}.mp4")"
 else
-  videourl="$(urlsave "videos/$info")"
+  videourl="$(urlsafe "videos/$info")"
 fi
 
 case "${_COOKIE[watch]}" in
   raspi)
     rpiaddr="http://pfostenpanne.helmchyn.no-ip.biz/?player=play&path="
-    [ $height -gt 480 -a $width -gt 480 ] && redirect "${rpiaddr}$(urlsave "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")" \
-                                          || redirect "${rpiaddr}$(urlsave "http://jupiter:8000/${videourl}")"
+    [ $height -gt 480 -a $width -gt 480 ] && redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/?action=transcode&i=${linkinfo}&t=480")" \
+                                          || redirect "${rpiaddr}$(urlsafe "http://jupiter:8000/${videourl}")"
   ;;
   480p)
     [ $height -gt 480 ] && redirect "?action=transcode&i=${linkinfo}&t=480" \