Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index 4d7e8aa6fc045cdd1f49a29637d8b664917b3df4..79b9a87efda3acf8ac0e2084d29a0a67927b1378 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,30 +1,24 @@
 #!/bin/sh
 
-for n in "$@"; do case ${n%%=*} in
-  data) _DATA="${n#data=}";;
-  exec) _exec="${n#exec=}";;
-  noerr) exec 2>&-;;
-esac; done
-
-[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
-[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
-
+exec 2>/dev/null
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
-. "$_EXEC/cgilite/cgilite.sh"
+. "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
-ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length' || printf Name)"
-LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 50)"
-ITEM="$(PATH "${PATH_INFO#/}")"
+ORDER="$(GET o |grep -m1 -axE 'Date|Name|Length|Group' || printf Name)"
+LISTSIZE="$(COOKIE pagesize |grep -m1 -axE '[1-9][0-9]*' || printf 60)"
+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 60)"
+    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)
@@ -46,52 +40,57 @@ case $ACTION in
     . "$_EXEC/multitag.sh"
     REDIRECT "$(POST ref)"
   ;;
+  thumbnail) if [ -f "$_DATA/$PATH_INFO" ]; then
+    . "$_EXEC/cgilite/file.sh"
+    index="$_DATA/${PATH_INFO%/*}/.index"
+    thumb="$index/${PATH_INFO##*/}"; thumb="${thumb%.*}.jpg"
+    if [ -d "$index" -a ! -f "$thumb" ] && { printf %s "$PATH_INFO" |grep -qE -e "${file_pattern}" ;}; then
+      . "$_EXEC/thumbnail.sh"
+      gen_thumb "$_DATA/$PATH_INFO" "$thumb"
+    fi
+    FILE "$thumb"
+    return 0
+  fi;;
+  download) if [ -f "$_DATA/$PATH_INFO" ]; then
+    . "$_EXEC/cgilite/file.sh"
+    fakemp4="$(COOKIE fakemp4)"
+    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
+    return 0
+  fi;;
+  delete) if [ -f "$_DATA/$PATH_INFO" ]; then
+    :
+  fi;;
+  advsearch) if [ -d "$_DATA/$PATH_INFO" ]; then
+    . "$_EXEC/advsearch.sh"
+    return 0
+  fi;;
+  spawnindex) if [ -d "$_DATA/$PATH_INFO" ]; then
+    if [ "$(POST recursive)" = yes ]; then
+      find "$_DATA/$PATH_INFO" -depth -type d \! -name .index \
+                          -exec mkdir -p '{}'/.index \;
+    else
+      mkdir -p "$_DATA/$PATH_INFO/.index"
+    fi
+    REDIRECT "$(POST ref)"
+  fi;;
 esac
 
-if [ "$ITEM" = "/style.css" ]; then
+if [ -f "$_EXEC/$PATH_INFO" ]; 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
-    thumbnail)
-      . "$_EXEC/cgilite/file.sh"
-      . "$_EXEC/thumbnail.sh"
-      index="$_DATA/${ITEM%/*}/.index"
-      thumb="$index/${ITEM##*/}"; thumb="${thumb%.*}.jpg"
-      [ -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"
-      fakemp4="$(COOKIE fakemp4)"
-      FILE "$_DATA/$ITEM" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
-    ;;
-    *) . "$_EXEC/view.sh"
-  esac
-elif [ -d "$_DATA/$ITEM" ]; then
-  case $ACTION in
-    advsearch)
-      . "$_EXEC/advsearch.sh"
-    ;;
-    spawnindex)
-      if [ "$(POST recursive)" = yes ]; then
-        find "$_DATA/$ITEM" -depth -type d \! -name .index \
-                            -exec mkdir -p '{}'/.index \;
-      else
-        mkdir -p "$_DATA/$ITEM/.index"
-      fi
-      REDIRECT "$(POST ref)"
-    ;;
-    *) . "$_EXEC/list.sh"
-    ;;
-  esac
+  FILE "$_EXEC/$PATH_INFO"
+  return 0
+elif [ -f "$_DATA/$PATH_INFO" ]; then
+  . "$_EXEC/view.sh"
+  return 0
+elif [ -d "$_DATA/$PATH_INFO" ]; then
+  . "$_EXEC/list.sh"
+  return 0
 else
   printf 'Status: 404 Not Found\r\nContent-Length 0:\r\n\r\n'
 fi