escape exclamation mark (!) in urls

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index 6f418f05f7d9086d6990abcf06762cdeea8cde93..458d7e8866323812fc99b9d7defdfa2dce427781 100755 (executable)
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -69,6 +69,8 @@ view() {
   fi
 }
 
+alias urlsave="sed 's:%:\%25:g;s:\?:\%3F:g;s:&:\%26:g;s:'\'':\%27:g;s: :\%20:g;s;!;\%21;g'"
+
 _printVideo(){
   info="$1"
   cache="${_DATA}/cache/$info.cache"
@@ -89,18 +91,18 @@ _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" |sed -r 's:%:%25:g;s:\&:%26:g;')"
+    linkinfo="$(echo -n "$info" |urlsave)"
     tee "$cache" <<VIDEOend
-      <div class="thumb">
+      <li class="thumb">
         <a class="watchlink" name="$linkinfo" href="?action=watch&i=$linkinfo">
           <img src="$thumb">
         </a>
@@ -109,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