X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=widgets.sh;h=fc6818e206748cb2c933e409e35afc52b0c14bbe;hp=4d42c41d0bc73a0cd65f164033f5d295e10cddcd;hb=HEAD;hpb=ccc8de4ebdd18fb52cdb8ce2013573d079186fba

diff --git a/widgets.sh b/widgets.sh
index 4d42c41..35058cb 100755
--- a/widgets.sh
+++ b/widgets.sh
@@ -11,27 +11,36 @@ w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 w_str_s="$(STRING "$SEARCH")"
 w_str_f="$(STRING "$FILTER")"
 
-c_tags="$_DATA/.index/tags.cache"; c_tagcategories="$_DATA/.index/tagcategories.cache"
-if [ ! -s "$c_tags" -o ! -s "$c_tagcategories" ] \
-   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$c_tags")" ]
-  then
-  w_tags="$(
-    list_meta |sed -E '
-      s;^.*\ttags=([^\t]*)\t.*$;\1;;
-      s;,;\n;g;
-    ' \
-    | sort |uniq -c |sort -rn |sed -E 's;^ *[0-9]+ ;;;' \
-    | UNSTRING | HTML \
-    | sed -E 's;&#x0A\;;\n;g; s;\n+;\n;g;'
-  )"
-  w_tagcategories="$(printf %s "$w_tags" | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |sort -u )"
-  printf %s "$w_tags" >"$c_tags"
-  printf %s "$w_tagcategories" >"$c_tagcategories"
-else
-  w_tags="$(cat "$c_tags")"
-  w_tagcategories="$(cat "$c_tagcategories")"
-fi
+taglist(){
+  list_meta |sed -E '
+    s;^.*\ttags=([^\t]*)\t.*$;\1;;
+    s;,;\n;g;
+  ' \
+  | sort |uniq -c |sort -rn |sed -E 's;^ *[0-9]+ ;;;' \
+  | UNSTRING | HTML \
+  | sed -E 's;&#x0A\;;\n;g; s;\n+;\n;g;'
+}
+tagorder(){
+  printf '*\n%s\n$\n' "$w_tagcategories" \
+  | while read -r category; do
+    printf '%s\n' "$w_tags" \
+    | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
+    | { sed -u 10q; sort; }
+  done
+}
 
+c_tags="$_DATA/.index/tags.cache";
+if [ ! -s "$c_tags" ]; then
+  taglist >"$c_tags.$$"
+  mv "$c_tags.$$" "$c_tags"
+fi
+w_tags="$(cat "$c_tags")"
+w_tagcategories="$(
+  printf %s "$w_tags" \
+  | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' \
+  |sort -u
+)"
+w_tags="$(tagorder)"
 
 [ "$ORDER" = Name   ] && w_coname=checked
 [ "$ORDER" = Date   ] && w_codate=checked
@@ -84,54 +93,55 @@ w_bookmarks(){
     name="$(UNSTRING "$name")";
     search="$(UNSTRING "${search}" |URL)";
     filter="$(UNSTRING "${filter}" |URL)";
-    cat <<-EOF
-	[label .link . $(HTML "$name" |sed 's;&#44\;;&[wbr];g;')]
-	[a .link target=blank href="/?o=Name&s=${search}&f=${filter}" by Name]
-	[a .link target=blank href="/?o=Date&s=${search}&f=${filter}" by Date]
-	[a .link target=blank href="/?o=Length&s=${search}&f=${filter}" by Length]
-	[a .link target=blank href="/?o=Group&s=${search}&f=${filter}" by Group]
-	EOF
+    printf '
+      [label .link . %s][a .conjunct href="?o=%s&s=%s&f=%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=Group&s=%s&f=%s" by Group]
+    ' "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
+      "$ORDER" "${SEARCH:+${SEARCH}} $search" "${FILTER:+${FILTER}^}$filter" \
+      "$search" "$filter"  "$search" "$filter" \
+      "$search" "$filter"  "$search" "$filter"
   done
   printf ']'
 }
 
 w_search(){
-  cat <<-EOF
-	[form #search method=GET action=./?
-	  [select name=o size=1
-	    [option disabled=disabled Order By]
-	    [option value=Name ${w_coname} Name]
-	    [option value=Date ${w_codate} Date]
-	    [option value=Length ${w_colength} Length]
-	    [option value=Group ${w_cogroup} Group]
-	  ]
-	  [input name=s placeholder=Search value="$(HTML "$SEARCH")"]
-	  [a #t_avsearch href="#advsearch" Advanced]
-	]
-	EOF
+  printf '
+    [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 type="search" name=s placeholder=Search value="%s"][button .search type=submit Search]
+      [a #t_avsearch href="#advsearch" Advanced]
+    ]' "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \
+       "$(HTML "$SEARCH")"
 }
 
 w_prefs(){
   local tm tf td
 
-  tm=''; [ "$(COOKIE mode)" = index ] && tm=' '
+  tm=''; [ "$(COOKIE mode)" = browse ] && tm=' '
   tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
   td=''; [ "$(COOKIE downscale)" = yes ] && td=checked
 
-  cat <<-EOF
-	[form #prefs method="POST" action="?a=setprefs"
-	  [a href="#" x]
-	  [hidden "ref" "${w_refuri}"]
-	  [label for=prefs_ps Pagesize]
-	  [input #prefs_ps type=number name=pagesize value="${LISTSIZE}"][br]
-	  [radio "mode" "browse" ${tm:-checked=checked} #prefs_modebrowse] [label for=prefs_modebrowse Browse Folders][br]
-	  [radio "mode" "index" ${tm:+checked=checked} #prefs_modeindex ] [label for=prefs_modeindex View Full Index][br]
-	  [checkbox "fakemp4" "yes" ${tf} #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file type][br]
-	  [checkbox "downscale" "yes" ${td} #prefs_downscale] [label for=prefs_downscale Prefer downscale to 480p][br]
-	  [submit "index" "update" Force Index Update][br]
-	  [submit "store" "store" Set Cookie]
-	]
-	EOF
+  printf '
+  [form #prefs method="POST" action="?a=setprefs"
+    [a href="#" x]
+    [hidden "ref" "%s"]
+    [label for=prefs_ps Pagesize]
+    [input #prefs_ps type=number name=pagesize value="%i"][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 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=checked}" "${tm:-checked=checked}" "$tf" "$td"
 }
 
 w_index(){
@@ -150,66 +160,71 @@ w_advsearch(){
   local n lbid tag category filter f t d
   filter="$(HTML "${FILTER}^")"
 
-  cat <<-EOF
-	[form #advsearch action=./?a=advsearch method=POST
-	  [a href="#" X]
-	  [p .help Refine the search further by setting additional search tags using the [strong "+and"] button.]
-	EOF
+  printf '[form #advsearch action=./?a=advsearch method=POST
+          [a href="#" X]
+          [p .help Refine the search further by setting additional search tags using the [strong "+and"] button.]'
 
   for n in 1 2 3 4 5 6 7 8 9 10; do
     f="${filter%%^*}"; filter="${filter#*^}"
-
     t=''; [ "$f" -a ! "${f%%~*}" ] && t=" "
-
     lbid="cat_${n}_(none)"
-    cat <<-EOF
-	[input .and type=checkbox name=and id="and_${n}" ${f:+checked=checked}][label for="and_${n}" +and
-	][fieldset .select
-	[radio "pol_${n}" "pos" .pol ${t:-checked=checked} #pol_pos_${n}"][label for=pol_pos_${n} Any]
-	[radio "pol_${n}" "neg" .pol ${t:+checked=checked} #pol_neg_${n}"][label for=pol_neg_${n} None]
-	[label .head Category:]
-	EOF
+
+    printf \
+     '[input .and type=checkbox name=and id="and_%i" %s][label for="and_%i" +and
+      ][fieldset .select
+      [radio "pol_%i" "pos" .pol %s #pol_pos_%i"][label for=pol_pos_%i Any]
+      [radio "pol_%i" "neg" .pol %s #pol_neg_%i"][label for=pol_neg_%i None]
+      [label .head Category:]' \
+      "$n" "${f:+checked=checked}" "$n" \
+      "$n" "${t:-checked=checked}" "$n" "$n" \
+      "$n" "${t:+checked=checked}" "$n" "$n"
 
     f="|${f#\~}|"
-    printf '*\n%s\n$\n' "$w_tagcategories" \
-    | while read -r category; do
-      lbid="cat_${n}_${category}"
-
-      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]
-              [div .catselect\n' \
-              $n "$category" "$t" "$lbid" "$lbid" "$category"
-
-      printf '%s\n' "$w_tags" \
-      | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \
-      | { sed -u 10q; sort; } \
-      | while read -r tag; do
-        [ "$tag" ] || continue
-        t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
-        d="${tag#-}"; d="${d#*:}"
-	printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tag" "$t" "$d"
-      done
-      d="${f##*\$:}" d="${d%%\|*}"
-      [ "$category" = \$ ] && printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$d")"
-      printf '\n]'
+    printf '%s\n$:\n' "$w_tags" \
+    | while read tctag; do
+      [ "$tctag" ] || continue
+      category="${tctag#-}"; category="${category%%:*}"
+      tag="${tctag#-}"; tag="${tag#*:}"
+      [ "${tag}" = "${tctag#-}" ] \
+      && category="*"
+  
+      if [ "$category" != "$oldcat" ]; then
+        [ "$oldcat" ] && printf '\n]'
+        lbid="cat_${n}_${category}"
+
+        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]
+                [div .catselect\n' \
+                $n "$category" "$t" "$lbid" "$lbid" "$category"
+      fi
+
+      if [ "$category" = '$' ]; then
+        tag="${f##*\$:}" tag="${tag%%\|*}"
+        printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$tag")"
+      else
+        t=''; [ ! "${f%%*|${tctag}|*}" ] && t=checked
+        printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tctag" "$t" "$tag"
+      fi
+
+      oldcat="$category"
     done
+    [ "$w_tags" ] && printf '\n]'
     printf ']'
   done
 
-  cat <<-EOF
-	  [fieldset .submit [select name=order
-	    [option disabled=disabled Order By]
-	    [option value=Name ${w_coname} Name]
-	    [option value=Date ${w_codate} Date]
-	    [option value=Length ${w_colength} Length]
-	    [option value=Group ${w_cogroup} Group]
-	  ][button type=submit Apply Filter]]
-	]
-	EOF
+  printf \
+   '[fieldset .submit [select name=order
+      [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]
+    ][button type=submit Apply Filter]]
+  ]' "$w_coname" "$w_codate" "$w_colength" "$w_cogroup"
 }
 
 w_delete(){
@@ -222,7 +237,7 @@ w_delete(){
 }
 
 w_tagging(){
-  local tag category d
+  local tctag oldcat="" category tag
 
   cat <<-EOF
 	[a href="#multitag" Add Tags / Remove Tags]
@@ -230,25 +245,29 @@ w_tagging(){
 	  [a href="#" X]
 	EOF
 
-  printf 'Tags\n%s\n' "$w_tagcategories" \
-  | while read -r category; do
-    [ "$category" ] || continue
-    printf '[fieldset [legend %s:][div .tagselect\n' "$category"
-    printf %s "$w_tags" \
-    | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \
-    | { sed -u 10q; sort; } \
-    | while read -r tag; do
-      [ "$tag" ] || continue
-      d="${tag#-}"; d="${d#*:}"
-      printf '[label [checkbox "tag" "%s"] %s]\n' "$tag" "$d"
-    done
-    printf ']]'
+  printf '%s\n' "$w_tags" \
+  | while read tctag; do
+    [ "$tctag" ] || continue
+    category="${tctag#-}"; category="${category%%:*}"
+    tag="${tctag#-}"; tag="${tag#*:}"
+
+    [ "${tag}" = "${tctag#-}" ] \
+    && category="Tags"
+
+    if [ "$category" != "$oldcat" ]; then
+      [ "$oldcat" ] && printf ']]'
+      printf '[fieldset [legend %s:][div .tagselect\n' "$category"
+    fi
+    printf '[label [checkbox "tag" "%s"] %s]\n' "$tctag" "$tag"
+
+    oldcat="$category"
   done
+  [ "$w_tags" ] && printf ']]'
 
   cat <<-EOF
-	  [fieldset [legend New:][textarea name=newtag\n]
+	  [fieldset [legend New:][textarea name=newtag]
 	  [label [checkbox "makegroup" "true"] Join selected into group]
-	  [submit "op" "del" Remove Tags][submit "op" "add" Add Tags]
+	  [submit "op" "del" Remove][submit "op" "flip" Flip][submit "op" "add" Add]
 	]]
 	EOF
 }