transcoding option for additional resolutions

[serve0] / pages / videoview.sh

diff --git a/pages/videoview.sh b/pages/videoview.sh
index 0ec440c23d4c8d2bb4e42d0e27a7b3c6844d2913..eacc54718e89b41fb8a73acb42190062b6d177c1 100755 (executable)
--- a/pages/videoview.sh
+++ b/pages/videoview.sh
@@ -20,12 +20,12 @@
 info="$_GET[\"i\"]"
 filter="$_GET[\"f\"]"
 search="$_GET[\"s\"]"
-order=$(echo "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
-page=$(echo "$_GET[\"p\"]" |egrep '^[0-9]+$')
+order=$(echo -E "$_GET[\"o\"]" |egrep '^(Name|Date|Length)$')
+page=$(echo -E "$_GET[\"p\"]" |egrep '^[0-9]+$')
 [ -z "$page" ] && page=0
 
 page_link=''
-[ -n "$info" ]   && page_link="i=$(echo -n "$info" |sed -r 's:%:%25:g;s:\&:%26:g;')&"
+[ -n "$info" ]   && page_link="i=$(echo -En "$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,14 +69,12 @@ 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"
   video="${_DATA}/videos/$info"
   meta="${_DATA}/meta/$info.meta"
-  if [ "$cache" -nt "$video" -a "$cache" -nt "$meta" ]; then
+  if [ "$cache" -nt "$meta" ]; then
     cat "$cache"
   else
     tags="$(sed -n 2p "$meta")"
@@ -87,40 +85,42 @@ _printVideo(){
     [ -z "$height" ] && height=0
 
 #    reenc="${_DATA}/vp8/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1:' <<<"$info" )"
-    mpfake="${_DATA}/mp4/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1.mp4:' <<<"$info" )"
+#    mpfake="${_DATA}/mp4/$(sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:\1.mp4:' <<<"$info" )"
 #    [ -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 "../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)"
+#    [ -L "$mpfake" ] || ln -s "../videos/$info" "$mpfake"
+    video="$(urlsave "videos/$info")"
+    thumb="$(urlsave "thumbs/$info.jpg")"
+#    mpfake="$(urlsave "$info" |sed -r 's:^(.*)\.[a-zA-Z0-9]{3,4}$:mp4/\1.mp4:')"
 
     [ "$(($length % 60))" -lt 10 ] &&\
       minutes="$(($length / 60)):0$(($length % 60))" ||\
       minutes="$(($length / 60)):$(($length % 60))"
 
-    linkinfo="$(echo -n "$info" |urlsave)"
+    linkinfo="$(urlsave "$info")"
     tee "$cache" <<VIDEOend
       <li class="thumb">
-        <a class="watchlink" name="$linkinfo" href="?action=watch&i=$linkinfo">
+        <a class="watchlink" name="${linkinfo}" href="?action=watch&i=${linkinfo}">
           <img src="$thumb">
         </a>
         <a class="videolink" href="$video">$info</a>
         <!-- a href="$reenc">VP8</a -->
-        <a class="videolink fake-mp4" href="$mpfake">fake-mp4</a>
+        <!-- a class="videolink fake-mp4" href="$mpfake">fake-mp4</a --
+        <a class="videolink" href="?action=transcode&i=${linkinfo}&t=480">480p</a>
+        <a class="videolink" href="?action=transcode&i=${linkinfo}&t=240">240p</a>
         <input type="checkbox" name="tagsel" value="$info">
         <span class="info property">${minutes}min</span>
         <span class="info property">${width}x${height}</span>
-       $(echo "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
+       $(echo -E "$tags" |sed -r 's:\|*([^|]+)\|*:<span class="info tag">\1</span>:g')
       </div>
 VIDEOend
   fi
 }
 
-_by_name(){ ls ${_DATA}/videos/ |egrep -i "$file_pattern" }
+_by_name(){ find ${_DATA}/videos/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |egrep -i "$file_pattern" }
 _by_date(){ ls -c ${_DATA}/videos/ |egrep -i "$file_pattern" }
-_by_length(){ ls ${_DATA}/by_length/ |sed -r 's:[0-9]{5} - ::g' }
+_by_length(){ find ${_DATA}/by_length/ -mindepth 1 -maxdepth 1 -printf '%f\n' |sort |sed -r 's:[0-9]{5} - ::' }
 
 thumblist() {
   cache="${_DATA}/cache/?o=${order}&s=${search}&f=${filter}&p=${page}"
@@ -151,7 +151,7 @@ thumblist() {
       $genlist |sed -rn 's:^(.+)$:'"${_DATA}"'/meta/\1'.meta':p' |xargs -d\\n egrep -sil "$search" |sed -rn 's:^(.*/)+([^/]+)\.meta$:\2:p'
     elif [ "$filterex" != "q0" ]; then
       $genlist |while read video; do
-        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && echo "$video"
+        [ -r "${_DATA}/meta/$video.meta" ] && sed -rn "2{$filterex;q1}" "${_DATA}/meta/$video.meta" && echo -E "$video"
       done
     else
       $genlist