stubs for file deletion

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 446b5d2edfafe6d1078dbcaccb8005db8ff08e56..7c945d6ad3baf954928a47ab862adcca1dee5f04 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -7,6 +7,9 @@ include_widgets="$0"
 
 w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 
+w_str_s="$(STRING "$SEARCH")"
+w_str_f="$(STRING "$FILTER")"
+
 w_ascii='
   s-0-0-g; s-1-1-g; s-2-2-g; s-3-3-g; s-4-4-g; s-5-5-g;
   s-6-6-g; s-7-7-g; s-8-8-g; s-9-9-g;
@@ -45,7 +48,7 @@ if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
     done
   } |sort -rn |cut -f2- |HTML |sed "$w_ascii s-
-\n-g; s;\n\n;\n;g;" |tee "$w_tags" )"
   w_tagcategories="$(printf %s "$w_tags" \
-                     | cut -sd: -f1 |sort -u \
+                     | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |sort -u \
                      | tee "$w_tagcategories" )"
 else
   w_tags="$(cat "$w_tags")"
@@ -56,24 +59,35 @@ fi
 [ "$ORDER" = Name   ] && w_coname=checked
 [ "$ORDER" = Date   ] && w_codate=checked
 [ "$ORDER" = Length ] && w_colength=checked
+[ "$ORDER" = Group  ] && w_cogroup=checked
+
+w_bmname=
+w_bmname(){
+  [ "$w_bmname" ] || w_bmname="$(
+    bm="$_DATA/.index/bookmarks"
+    name="$(grep -m1 -aF "     search=${w_str_s}       filter=${w_str_f}${CR}" "$bm" 2>&-)"
+
+    if [ "$name" ]; then
+      printf '%s' "$name" |cut -f1 |UNSTRING |HTML
+    else
+      printf '%s\t%s' "$SEARCH" "$FILTER" \
+      | sed -r '/^\t$/{  s;\t;All;; q;}
+                /.*\t$/{ s;\t$;;; q;}
+                /^\t.*/{ s;^\t;;;
+                         :x; s;(^|[~^|])([^|^~:]+):;\1;; tx;
+                         s;\^; and ;g; s;\|;,;g; s;~;not ;g; q;}' \
+      | HTML
+    fi
+  )"
+  printf '%s' "$w_bmname"
+}
 
 w_bookmarks(){
-  local name='' cf='' cs='' bm="$_DATA/.index/bookmarks" proposed_name=''
+  local bm="$_DATA/.index/bookmarks" name='' search='' filter=''
   [ ! -d "${bm%/*}" ] && return 0
   [ ! -f "$bm" ] && touch "$bm"
 
-  [ "$SEARCH" ] && cs="$(STRING "$SEARCH")"
-  [ "$FILTER" ] && cf="$(STRING "$FILTER")"
-
-  name="$(grep -m1 -aF "       search=$cs      filter=$cf${CR}" "$bm" |cut -f1 |UNSTRING)"
-  [ ! "$name" ] && proposed_name="$(
-    printf '%s\t%s' "$SEARCH" "$FILTER" \
-    |sed -r '/^\t$/{  s;\t;All;; q;}
-             /.*\t$/{ s;\t$;;; q;}
-             /^\t.*/{ s;^\t;;;
-                      :x; s;(^|[~^|])([^|^~:]+):;\1;; tx;
-                      s;\^; and ;g; s;\|;,;g; s;~;not ;g; q;}'
-    )"
+  grep -qaF "  search=$w_str_s filter=${w_str_f}${CR}" "$bm" && name=Update || name=Add
 
   printf '[form #bookmarks action=?a=bookmark method=POST
             [a href="#" x]
@@ -84,25 +98,26 @@ w_bookmarks(){
             [button type="submit" %s]' \
             "$w_refuri" \
             "$(HTML "$SEARCH")" "$(HTML "$FILTER")" \
-            "$(HTML "${name:-${proposed_name}}")" \
-            "${name:+Update}${proposed_name:+Add}"
+            "$(w_bmname)" "${name}"
   [ "$name" ] && printf ' [submit "delete" "delete" Delete]'
 
   sort "$bm" |while read -r name search filter; do
     search="${search#search=}" filter="${filter#filter=}" filter="${filter%${CR}}"
-    [ "$search" = "${cs}" -a "$filter" = "${cf}" ] && continue
+    [ "$search" = "${w_str_s}" -a "$filter" = "${w_str_f}" ] && continue
 
     name="$(UNSTRING "$name")";
     search="$(UNSTRING "${search}" |URL)";
     filter="$(UNSTRING "${filter}" |URL)";
     printf '[label .link %s]
-            [a .link target=blank href="?o=Name&s=%s&f=%s" by Name]
-            [a .link target=blank href="?o=Date&s=%s&f=%s" by Date]
-            [a .link target=blank href="?o=Length&s=%s&f=%s" by Length]
+            [a .link target=blank href="/?o=Name&s=%s&f=%s" by Name]
+            [a .link target=blank href="/?o=Date&s=%s&f=%s" by Date]
+            [a .link target=blank href="/?o=Length&s=%s&f=%s" by Length]
+            [a .link target=blank href="/?o=Group&s=%s&f=%s" by Group]
             [br]' \
             "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
             "$search" "$filter" \
             "$search" "$filter" \
+            "$search" "$filter" \
             "$search" "$filter"
   done
   printf ']'
@@ -110,25 +125,27 @@ w_bookmarks(){
 
 w_search(){
   printf '
-  [form #search method=GET action=?
+  [form #search method=GET action=./?
     [select name=o size=1 
       [option disabled=disabled Order By]
       [option value=Name %s Name]
       [option value=Date %s Date]
       [option value=Length %s Length]
+      [option value=Group %s Group]
     ]
     [input name=s placeholder=Search value="%s"]
   ]
   ' \
-  "$w_coname" "$w_codate" "$w_colength" \
+  "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \
   "$(HTML "$SEARCH")"
 }
 
 w_prefs(){
-  local tm tf
+  local tm tf td
 
   tm=''; [ "$(COOKIE mode)" = index ] && tm=' '
   tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
+  td=''; [ "$(COOKIE downscale)" = yes ] && td=checked
 
   printf '
   [form #prefs method="POST" action="?a=setprefs"
@@ -138,16 +155,18 @@ w_prefs(){
     [input #prefs_ps type=number name=pagesize value="%s"][br]
     [radio "mode" "browse" %s #prefs_modebrowse] [label for=prefs_modebrowse Browse Folders][br]
     [radio "mode" "index"  %s #prefs_modeindex ] [label for=prefs_modeindex View Full Index][br]
-    [checkbox "fakemp4" "yes" %s #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file ending][br]
+    [checkbox "fakemp4" "yes" %s #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file type][br]
+    [checkbox "downscale" "yes" %s #prefs_downscale] [label for=prefs_downscale Prefer downscale to 480p][br]
+    [submit "index" "update" Force Index Update][br]
     [submit "store" "store" Set Cookie]
   ]
   ' \
   "$w_refuri" "$LISTSIZE" \
-  "${tm:-checked}" "${tm:+checked}" "$tf"
+  "${tm:-checked}" "${tm:+checked}" "$tf" "$td"
 }
 
 w_index(){
-  [ -d "$_DATA/$ITEM/.index" ] && return 1 || printf '
+  printf '
   [form #index method="POST" action="?a=spawnindex"
     [hidden "ref" "%s"]
     [label Set up for Index view: ]
@@ -159,7 +178,7 @@ w_index(){
 }
 
 w_advsearch(){
-  local n lbid tag category filter f t
+  local n lbid tag category filter f t d
   filter="$(HTML "${FILTER}^" |sed "$w_ascii")"
 
   printf '[form #advsearch action=?a=advsearch method=POST
@@ -190,6 +209,7 @@ w_advsearch(){
       t=''
       [ "$category"  = '*' -a   "${f%%|${category}:*}" ] && t=checked
       [ "$category" != '*' -a ! "${f%%|${category}:*}" ] && t=checked
+      [ "$category" != '*' -a ! "${f%%|-${category}:*}" ] && t=checked
 
       printf '[radio "cat_%i" "%s" .cat %s id="%s"][label for="%s" %s]
               [select name=tag_%s size=10 multiple' \
@@ -199,12 +219,13 @@ w_advsearch(){
       | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
       | { for n in 1 2 3 4 5 6 7 8 9 0; do
           read -r line && printf '%s\n' "$line" || break;
-          done;  # path 10 lines through without modification
+          done;  # pass 10 lines through without modification
           sort;  # and sort remaining lines
       } | while read -r tag; do
         [ "$tag" ] || continue
         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
-        printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
+        d="${tag#-}"; d="${d#*:}"
+        printf '[option %s value="%s"\n%s]' "$t" "$tag" "$d"
       done
       printf '\n]'
     done
@@ -216,21 +237,32 @@ w_advsearch(){
             [option value=Name %s Name]
             [option value=Date %s Date]
             [option value=Length %s Length]
+            [option value=Group %s Group]
           ][button type=submit Apply Filter]]
           ]' \
-          "$w_coname" \
-          "$w_codate" \
-          "$w_colength"
+          "$w_coname" "$w_codate" \
+          "$w_colength" "$w_cogroup"
+}
+
+w_delete(){
+  printf '[a href="#multitag" Add Tags / Remove Tags]
+          [div #multitag [input type="hidden" name="ref" value="%s"]
+          [a href="#" Hide][br]
+          [fieldset [legend New:]
+          [submit "op" "filedelete" Delete Files]
+          ]]' "$w_refuri"
 }
 
 w_tagging(){
-  local tag category
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
+  local tag category d
+  printf '[a href="#multitag" Add Tags / Remove Tags]
+          [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
   printf '[a href="#" Hide][br]'
 
   printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
+    [ "$category" ] || continue
+    printf '[fieldset [legend %s:][select name=tag size=4 multiple\n' "$category"
     printf %s "$w_tags" \
     | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \
     | { for n in 1 2 3 4 5 6 7 8 9 0; do
@@ -239,10 +271,13 @@ w_tagging(){
         sort;
     } | while read -r tag; do
       [ "$tag" ] || continue
-      printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
+      d="${tag#-}"; d="${d#*:}"
+      printf '[option value="%s"\n%s]' "$tag" "$d"
     done
     printf ']]'
   done
 
-  printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]'
+  printf '[fieldset [legend New:][textarea name=newtag\n]
+          [submit "op" "del" Remove Tags][submit "op" "add" Add Tags]
+          ]]'
 }