fix bug in exclusive tag support

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index ab09899d64dd64a604b67b760636f7af32240a8f..a4ec856e296cb6a8069bf1e3cf94f3de36710f8e 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -45,7 +45,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,6 +56,7 @@ fi
 [ "$ORDER" = Name   ] && w_coname=checked
 [ "$ORDER" = Date   ] && w_codate=checked
 [ "$ORDER" = Length ] && w_colength=checked
+[ "$ORDER" = Group  ] && w_cogroup=checked
 
 w_bookmarks(){
   local name='' cf='' cs='' bm="$_DATA/.index/bookmarks" proposed_name=''
@@ -99,10 +100,12 @@ w_bookmarks(){
             [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 +113,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,12 +143,14 @@ 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(){
@@ -159,7 +166,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 +197,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 +207,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,16 +225,16 @@ 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_tagging(){
-  local tag category
-  printf '[a href="#multitag" Add Tags]
+  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]'
 
@@ -241,10 +250,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]
+          ]]'
 }