Mixed tag sorting: most common first, then alphabetically

diff --git a/widgets.sh b/widgets.sh
index dd34bc0b627ae68b395d235fa0b024996cc45568..0474fa5ea7f07ce669995f6caaf3ed4288438c0f 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -7,26 +7,52 @@ include_widgets="$0"
 
 w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 
-w_tags="$( {
-  find "$_DATA/" -path '*/.index/meta' -print0 \
-  | xargs -r0 sed -r '
-    s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
-    s;,;\n;g;'"$UNSTRING" \
-  | sort \
-  | while read tag; do
-    [ "$tag" = "$otag" ] \
-    && cn=$((${cn:-0} + 1)) \
-    || {
-      printf "%i       %s\n" "$cn" "$otag"
-      cn=1
-    }
-    otag="$tag"
-  done
-  printf "%i   %s\n" "$cn" "$otag"
-} |sort -rn |cut -f2- )"
-w_tagcategories="$(printf %s "$w_tags" | cut -sd: -f1 | sort -u \
-                   |HTML |sed 's;&#58\;;:;g; s;&#10\;;\n;g;')"
-w_tags="$( printf %s "$w_tags" |HTML |sed 's;&#58\;;:;g; s;&#10\;;\n;g;')"
+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;
+  s-A-A-g; s-B-B-g; s-C-C-g; s-D-D-g; s-E-E-g; s-F-F-g;
+  s-G-G-g; s-H-H-g; s-I-I-g; s-J-J-g; s-K-K-g; s-L-L-g;
+  s-M-M-g; s-N-N-g; s-O-O-g; s-P-P-g; s-Q-Q-g; s-R-R-g;
+  s-S-S-g; s-T-T-g; s-U-U-g; s-V-V-g; s-W-W-g; s-X-X-g;
+  s-Y-Y-g; s-Z-Z-g;
+  s-a-a-g; s-b-b-g; s-c-c-g; s-d-d-g; s-e-e-g; s-f-f-g;
+  s-g-g-g; s-h-h-g; s-i-i-g; s-j-j-g; s-k-k-g; s-l-l-g;
+  s-m-m-g; s-n-n-g; s-o-o-g; s-p-p-g; s-q-q-g; s-r-r-g;
+  s-s-s-g; s-t-t-g; s-u-u-g; s-v-v-g; s-w-w-g; s-x-x-g;
+  s-y-y-g; s-z-z-g;
+  s---\--g; s-/-/-g; s-/-/-g; s-:-:-g; s-=-=-g; s-@-@-g;
+  s-_-_-g; s-~-~-g;              s-- -g; s-^-^-g; s-|-|-g;
+'
+
+w_tags="$_DATA/.index/tags.cache"; w_tagcategories="$_DATA/.index/tagcategories.cache"
+if [ ! -f "$w_tags" -o ! -f "$w_tagcategories" ] \
+   || [ "$(find "$_DATA/" -path '*/.index/meta' -newer "$w_tags" -quit)" ]
+  then
+  w_tags="$( { local cn=1
+    find "$_DATA/" -path '*/.index/meta' -print0 \
+    | xargs -r0 sed -r '
+      s;^.*\t.*\t.*\ttags=(.*)\tcomment=.*\t.*\r$;\1;;
+      s;,;\n;g;'"$UNSTRING" \
+    | sort \
+    | while read tag; do
+      [ "$tag" = "$otag" ] \
+      && cn=$((cn + 1)) \
+      || {
+        printf "%i     %s\n" "$cn" "$otag"
+        cn=1
+      }
+      otag="$tag"
+    done
+    printf "%i %s\n" "$cn" "$otag"
+  } |sort -rn |cut -f2- |HTML |sed "$w_ascii s-
-\n-g;" |tee "$w_tags" )"
+  w_tagcategories="$(printf %s "$w_tags" \
+                     | cut -sd: -f1 |sort -u \
+                     | tee "$w_tagcategories" )"
+else
+  w_tags="$(cat "$w_tags")"
+  w_tagcategories="$(cat "$w_tagcategories")"
+fi
+
 
 [ "$ORDER" = Name   ] && w_coname=checked
 [ "$ORDER" = Date   ] && w_codate=checked
@@ -134,7 +160,7 @@ w_index(){
 
 w_advsearch(){
   local n lbid tag category filter f t
-  filter="$(HTML "${FILTER}^" |sed 's;&#126\;;~;g; s;&#94\;;^;g; s;&#124\;;|;g; s;&#58\;;:;g;')"
+  filter="$(HTML "${FILTER}^" |sed "$w_ascii")"
 
   printf '[form #advsearch action=?a=advsearch method=POST
             [a href="#" Hide]
@@ -171,6 +197,7 @@ w_advsearch(){
 
       printf '%s\n' "$w_tags" \
       | { [ "$category" = '*' ] && grep -avF ':' |grep -avxF '' || grep -awF "${category}"; } \
+      | { for n in 1 2 3 4 5 6 7 8 9 0; do line; done; sort; } \
       | while read -r tag; do
         t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
         printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
@@ -202,6 +229,7 @@ w_tagging(){
     printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
     printf %s "$w_tags" \
     | { [ "$category" = 'Tags' ] && grep -avF ':' | grep -avxF '' || grep -awF "${category}"; } \
+    | { for n in 1 2 3 4 5 6 7 8 9 0; do line; done; sort; } \
     | while read -r tag; do
       printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done