improved time formatting

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 421b81e95ece53ff9c0c58f096518b596062bb0c..ad110e070dcfeebb301108fc4bf16d53a72c3324 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -22,9 +22,11 @@ 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"
     REDIRECT "$(POST ref)"
   ;;
   bookmark)
@@ -42,6 +44,10 @@ case $ACTION in
     fi
     REDIRECT "$(POST ref)"
   ;;
+  multitag)
+    . "$_EXEC/multitag.sh"
+    REDIRECT "$(POST ref)"
+  ;;
 esac
 
 if [ "$ITEM" = "/style.css" ]; then
@@ -53,21 +59,28 @@ elif [ "$ITEM" = "/stereoview.js" ]; then
   FILE "$_EXEC/stereoview.js"
 elif [ -f "$_DATA/$ITEM" ]; then
   case $ACTION in
-    tag)
-    ;;
     thumbnail)
       . "$_EXEC/cgilite/file.sh"
+      . "$_EXEC/thumbnail.sh"
       index="$_DATA/${ITEM%/*}/.index"
       thumb="$index/${ITEM##*/}"; thumb="${thumb%.*}.jpg"
-      [ -d "$index" -a \! -f "$thumb" ] \
-      && file="$_DATA/$ITEM" . "$_EXEC/thumbnail.sh"
+      [ -d "$index" -a ! -f "$thumb" ] \
+      && { printf %s "$ITEM" |grep -qE -e "${file_pattern}" ;} \
+      && gen_thumb "$_DATA/$ITEM" "$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/${ITEM%/*}/.transcode/${ITEM%.*}.480p.webm"
+      if [ "$downscale" = yes -a -f "$downfile" ]; then
+        FILE "$downfile" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
+      else
+        FILE "$_DATA/$ITEM" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
+      fi
     ;;
     *) . "$_EXEC/view.sh"
   esac
@@ -85,10 +98,6 @@ elif [ -d "$_DATA/$ITEM" ]; then
       fi
       REDIRECT "$(POST ref)"
     ;;
-    multitag)
-      . "$_EXEC/multitag.sh"
-      REDIRECT "$(POST ref)"
-    ;;
     *) . "$_EXEC/list.sh"
     ;;
   esac