updated for new cgilite escaping

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 4d7e8aa6fc045cdd1f49a29637d8b664917b3df4..3cee46fa04bdf3a24b4169451c524cc8dd095c7b 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -15,16 +15,18 @@ file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
-ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length' || printf Name)"
+ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length|Group' || printf Name)"
 LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
-ITEM="$(PATH "${PATH_INFO#/}")"
+ITEM="${PATH_INFO%/}"
 ACTION="$(GET a)"
 
 case $ACTION in
   setprefs)
-    SET_COOKIE +$((86400 * 90)) pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
-    SET_COOKIE +$((86400 * 90))     mode="$(POST     mode |grep -m1 -axE 'browse|index' || printf browse)"
-    SET_COOKIE +$((86400 * 90))  fakemp4="$(POST  fakemp4 |grep -m1 -axE 'yes' || printf no)"
+    SET_COOKIE +$((86400 * 90))  pagesize="$(POST pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
+    SET_COOKIE +$((86400 * 90))      mode="$(POST     mode |grep -m1 -axE 'browse|index' || printf browse)"
+    SET_COOKIE +$((86400 * 90))   fakemp4="$(POST  fakemp4 |grep -m1 -axE 'yes' || printf no)"
+    SET_COOKIE +$((86400 * 90)) downscale="$(POST  downscale |grep -m1 -axE 'yes' || printf no)"
+    [ "$(POST index)" = "update" ] && touch -cd @0 "${_DATA}/.index/meta.time"
     REDIRECT "$(POST ref)"
   ;;
   bookmark)
@@ -48,44 +50,51 @@ case $ACTION in
   ;;
 esac
 
-if [ "$ITEM" = "/style.css" ]; then
+if [ "$PATH_INFO" = "/style.css" ]; then
   . "$_EXEC/cgilite/file.sh"
-  [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
+  [ -r "$_DATA/$PATH_INFO" ] && FILE "$_DATA/$PATH_INFO" \
                         || FILE "$_EXEC/style.css"
-elif [ "$ITEM" = "/stereoview.js" ]; then
+elif [ "$PATH_INFO" = "/stereoview.js" ]; then
   . "$_EXEC/cgilite/file.sh"
   FILE "$_EXEC/stereoview.js"
-elif [ -f "$_DATA/$ITEM" ]; then
+elif [ -f "$_DATA/$PATH_INFO" ]; then
   case $ACTION in
     thumbnail)
       . "$_EXEC/cgilite/file.sh"
       . "$_EXEC/thumbnail.sh"
-      index="$_DATA/${ITEM%/*}/.index"
-      thumb="$index/${ITEM##*/}"; thumb="${thumb%.*}.jpg"
+      index="$_DATA/${PATH_INFO%/*}/.index"
+      thumb="$index/${PATH_INFO##*/}"; thumb="${thumb%.*}.jpg"
       [ -d "$index" -a ! -f "$thumb" ] \
-      && { printf %s "$ITEM" |grep -qE -e "${file_pattern}" ;} \
-      && gen_thumb "$_DATA/$ITEM" "$thumb"
+      && { printf %s "$PATH_INFO" |grep -qE -e "${file_pattern}" ;} \
+      && gen_thumb "$_DATA/$PATH_INFO" "$thumb"
       FILE "$thumb"
     ;;
     delete)
     ;;
-    download) . "$_EXEC/cgilite/file.sh"
+    download)
+      . "$_EXEC/cgilite/file.sh"
       fakemp4="$(COOKIE fakemp4)"
-      FILE "$_DATA/$ITEM" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
+      downscale="$(COOKIE downscale)"
+      downfile="$_DATA/${PATH_INFO%/*}/.transcode/${PATH_INFO%.*}.480p.webm"
+      if [ "$downscale" = yes -a -f "$downfile" ]; then
+        FILE "$downfile" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
+      else
+        FILE "$_DATA/$PATH_INFO" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
+      fi
     ;;
     *) . "$_EXEC/view.sh"
   esac
-elif [ -d "$_DATA/$ITEM" ]; then
+elif [ -d "$_DATA/$PATH_INFO" ]; then
   case $ACTION in
     advsearch)
       . "$_EXEC/advsearch.sh"
     ;;
     spawnindex)
       if [ "$(POST recursive)" = yes ]; then
-        find "$_DATA/$ITEM" -depth -type d \! -name .index \
+        find "$_DATA/$PATH_INFO" -depth -type d \! -name .index \
                             -exec mkdir -p '{}'/.index \;
       else
-        mkdir -p "$_DATA/$ITEM/.index"
+        mkdir -p "$_DATA/$PATH_INFO/.index"
       fi
       REDIRECT "$(POST ref)"
     ;;