X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=index.cgi;h=8f21c83c296f8e077fa38a92ddf7d1c1407c858a;hb=e62035f385af7afb3942e6178f843b1ae1c1c7ff;hp=68d6b5bd91b06d50b420531573792670b3d126e5;hpb=b3b0d44a61029470e449827a1fa4b686e4279b7c;p=serve0

diff --git a/index.cgi b/index.cgi
index 68d6b5b..8f21c83 100755
--- a/index.cgi
+++ b/index.cgi
@@ -6,19 +6,33 @@
 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)"
+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#/}")"
 
 case $(GET a) in
   setprefs)
-    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)"
+    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)"
+    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)"
   ;;
 esac
@@ -34,7 +48,7 @@ elif [ -f "$_DATA/$ITEM" ]; then
     thumbnail)
       . "$_EXEC/cgilite/file.sh"
       index="$_DATA/${ITEM%/*}/.index"
-      thumb="$index/${ITEM##*/}.jpg"
+      thumb="$index/${ITEM##*/}"; thumb="${thumb%.*}.jpg"
       [ -d "$index" -a \! -f "$thumb" ] \
       && file="$_DATA/$ITEM" . "$_EXEC/thumbnail.sh"
       FILE "$thumb"
@@ -42,11 +56,15 @@ elif [ -f "$_DATA/$ITEM" ]; then
     delete)
     ;;
     *) . "$_EXEC/cgilite/file.sh"
-      FILE "$_DATA/$ITEM"
+      fakemp4="$(COOKIE fakemp4)"
+      FILE "$_DATA/$ITEM" "$([ "$fakemp4" = yes ] && printf 'video/mp4')"
     ;;
   esac
 elif [ -d "$_DATA/$ITEM" ]; then
   case $(GET a) in
+    advsearch)
+      . "$_EXEC/advsearch.sh"
+    ;;
     spawnindex)
       if [ "$(POST recursive)" = yes ]; then
         find "$_DATA/$ITEM" -depth -type d \! -name .index \
@@ -57,6 +75,8 @@ elif [ -d "$_DATA/$ITEM" ]; then
       REDIRECT "$(POST ref)"
     ;;
     multitag)
+      . "$_EXEC/multitag.sh"
+      REDIRECT "$(POST ref)"
     ;;
     *) . "$_EXEC/list.sh"
     ;;