improved time formatting

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index b4339ad6d6e95afd6fb86b7f4038ba6863e8faf2..ad110e070dcfeebb301108fc4bf16d53a72c3324 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,49 +1,102 @@
 #!/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%/}"
 
+file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
+
 . "$_EXEC/cgilite/cgilite.sh"
-. "$_EXEC/widgets.sh"
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
-ORDER="$(GET o |grep -m1 -xE 'Date|Name|Length' || printf Name)"
-LISTSIZE="$(COOKIE pagesize |grep -m1 -xE '[1-9][0-9]*' || printf 50)"
-
-ITEM="$(printf %s "${PATH_INFO#/}" |sed -r ':X /(^|\/)\.\.($|\/)/s;(^|[^/]*/)..(/|$);;; tX;')"
+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#/}")"
+ACTION="$(GET a)"
 
-case $(GET a) in
+case $ACTION in
   setprefs)
-    printf 'Status: 303 See Other\r\n'
-    SET_COOKIE +$((86400 * 90)) pagesize="$(POST pagesize |grep -m1 -xE '[1-9][0-9]*' || printf 50)"
-    SET_COOKIE +$((86400 * 90))     mode="$(POST     mode |grep -m1 -xE 'browse|index' || printf browse)"
-    SET_COOKIE +$((86400 * 90))  fakemp4="$(POST  fakemp4 |grep -m1 -xE 'yes' || printf no)"
-    printf 'Location: %s\r\n\r\n' "$(POST ref)"
-    exit 0
+    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)
+    bm="$_DATA/.index/bookmarks"
+    . "$_EXEC/cgilite/storage.sh"
+
+    s="$(POST search |STRING)"; f="$(POST filter |STRING)"
+    if LOCK "$bm"; then
+      grep -avF "      search=$s       filter=$f${CR}" "$bm" >"$bm.tmp"
+      [ ! "$(POST delete)" ] \
+      && printf '%s    search=%s       filter=%s\r\n' \
+               "$(POST name |STRING)" "$s" "$f" >>"$bm.tmp"
+      mv "$bm.tmp" "$bm"
+      RELEASE "$bm"
+    fi
+    REDIRECT "$(POST ref)"
+  ;;
+  multitag)
+    . "$_EXEC/multitag.sh"
+    REDIRECT "$(POST ref)"
   ;;
 esac
 
-if [ "$ITEM" = "style.css" ]; then
+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 $(GET a) in
-    tag)
-    ;;
+  case $ACTION in
     thumbnail)
-      printf 'Status: 404 Not Found\r\nContent-Length 0:\r\n\r\n'
+      . "$_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)
     ;;
-    *) . "$_EXEC/cgilite/file.sh"
-      FILE "$_DATA/$ITEM"
+    download)
+      . "$_EXEC/cgilite/file.sh"
+      fakemp4="$(COOKIE fakemp4)"
+      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 $(GET a) in
-    multitag)
+  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"
     ;;