improve save url conversion

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index ac3532b4f6349b717b0df290c27a5156d93a114d..0ec440c23d4c8d2bb4e42d0e27a7b3c6844d2913 100755 (executable)
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -25,7 +25,7 @@ page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
 page_link=''
-[ -n "$info" ]   && page_link="${page_link}i=${info}&"
+[ -n "$info" ]   && page_link="i=$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')&"
 [ -n "$order" ]  && page_link="${page_link}o=${order}&"
 [ -n "$search" ] && page_link="${page_link}s=${search}&"
 [ -n "$filter" ] && page_link="${page_link}f=${filter}&"
@@ -69,6 +69,8 @@ view() {
   fi
 }
 
+alias urlsave="sed 's:%:\%25:g;s:\?:\%3F:g;s:&:\%26:g;s:'\'':\%27:g;s: :\%20:g'"
+
 _printVideo(){
   info="$1"
   cache="${_DATA}/cache/$info.cache"
@@ -89,18 +91,19 @@ _printVideo(){
 #    [ -f "$reenc.mp4" ] && reenc="$reenc.mp4" || reenc="$reenc.mkv"
     [ -r "$meta" ] || ". ${_EXEC}/helpers/genmeta.sh" "$video" "$meta"
     [ -r "$thumb" ] || ". ${_EXEC}/helpers/genthumb.sh" "$video" "$thumb"
-    [ -L "$mpfake" ] || ln -s "../$video" "$mpfake"
-    video="$(echo "videos/$info" |sed 's/\?/\%6F/g')"
-    thumb="$(echo "thumbs/$info.jpg" |sed 's/\?/%6F/g')"
-    mpfake="$(echo "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:' |sed 's/\?/%6F/g')"
+    [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
+    video="$(echo "videos/$info" |urlsave)"
+    thumb="$(echo "thumbs/$info.jpg" |urlsave)"
+    mpfake="$(echo "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:' |urlsave)"
 
     [ "$(($length % 60))" -lt 10 ] &&\
       minutes="$(($length / 60)):0$(($length % 60))" ||\
       minutes="$(($length / 60)):$(($length % 60))"
 
+    linkinfo="$(echo -n "$info" |urlsave)"
     tee "$cache" <<VIDEOend
-      <div class="thumb">
-        <a class="watchlink" name="$info" href="?action=watch&i=$info">
+      <li class="thumb">
+        <a class="watchlink" name="$linkinfo" href="?action=watch&i=$linkinfo">
           <img src="$thumb">
         </a>
         <a class="videolink" href="$video">$info</a>
@@ -108,7 +111,7 @@ _printVideo(){
         <a class="videolink fake-mp4" href="$mpfake">fake-mp4</a>
         <input type="checkbox" name="tagsel" value="$info">
         <span class="info property">${minutes}min</span>
-        <span class="info property">${width}x${height}</span><br>
+        <span class="info property">${width}x${height}</span>
        $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       </div>
 VIDEOend