X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=index.cgi;h=a33211d6653adbc4fc2980e4d0077277069abc06;hp=8367f92f7bd4ab31e8de6d8569e35bc4fc3588f6;hb=b9eab7e6648bd2aabf00bed5cf274fd6d5118d93;hpb=515c2d0ff3d2858990a1d8343467191b8484268f

diff --git a/index.cgi b/index.cgi
index 8367f92..a33211d 100755
--- 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#/}")"
 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)
@@ -42,47 +44,57 @@ case $ACTION in
     fi
     REDIRECT "$(POST ref)"
   ;;
+  multitag)
+    . "$_EXEC/multitag.sh"
+    REDIRECT "$(POST ref)"
+  ;;
 esac
 
 if [ "$ITEM" = "/style.css" ]; then
   . "$_EXEC/cgilite/file.sh"
   [ -r "$_DATA/$ITEM" ] && FILE "$_DATA/$ITEM" \
                         || FILE "$_EXEC/style.css"
+elif [ "$ITEM" = "/stereoview.js" ]; then
+  . "$_EXEC/cgilite/file.sh"
+  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)
     ;;
-    *) . "$_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
 elif [ -d "$_DATA/$ITEM" ]; then
   case $ACTION in
     advsearch)
       . "$_EXEC/advsearch.sh"
     ;;
-    multitag)
-      if [ "$(POST spawn)" = spawn ]; then
-        case "$(POST recursive)" in
-          yes) find "$_DATA/$ITEM" \
-                    -depth -type d \! -name .index \
-                    -exec mkdir -p '{}'/.index \;
-          ;;
-          *) mkdir -p "$_DATA/$ITEM/.index";;
-        esac
+    spawnindex)
+      if [ "$(POST recursive)" = yes ]; then
+        find "$_DATA/$ITEM" -depth -type d \! -name .index \
+                            -exec mkdir -p '{}'/.index \;
       else
-      . "$_EXEC/multitag.sh"
+        mkdir -p "$_DATA/$ITEM/.index"
       fi
       REDIRECT "$(POST ref)"
     ;;