From: Paul Hänsch <paul@plutz.net>
Date: Sat, 21 Jul 2018 01:38:46 +0000 (+0200)
Subject: Mixed tag sorting: most common first, then alphabetically
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=3dd32a6a37e2b67132a666b9a1327485dfcf8558;p=serve0

Mixed tag sorting: most common first, then alphabetically
---

diff --git a/widgets.sh b/widgets.sh
index dd34bc0..0474fa5 100644
--- 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-&#48;-0-g; s-&#49;-1-g; s-&#50;-2-g; s-&#51;-3-g; s-&#52;-4-g; s-&#53;-5-g;
+  s-&#54;-6-g; s-&#55;-7-g; s-&#56;-8-g; s-&#57;-9-g;
+  s-&#65;-A-g; s-&#66;-B-g; s-&#67;-C-g; s-&#68;-D-g; s-&#69;-E-g; s-&#70;-F-g;
+  s-&#71;-G-g; s-&#72;-H-g; s-&#73;-I-g; s-&#74;-J-g; s-&#75;-K-g; s-&#76;-L-g;
+  s-&#77;-M-g; s-&#78;-N-g; s-&#79;-O-g; s-&#80;-P-g; s-&#81;-Q-g; s-&#82;-R-g;
+  s-&#83;-S-g; s-&#84;-T-g; s-&#85;-U-g; s-&#86;-V-g; s-&#87;-W-g; s-&#88;-X-g;
+  s-&#89;-Y-g; s-&#90;-Z-g;
+  s-&#97;-a-g; s-&#98;-b-g; s-&#99;-c-g; s-&#100;-d-g; s-&#101;-e-g; s-&#102;-f-g;
+  s-&#103;-g-g; s-&#104;-h-g; s-&#105;-i-g; s-&#106;-j-g; s-&#107;-k-g; s-&#108;-l-g;
+  s-&#109;-m-g; s-&#110;-n-g; s-&#111;-o-g; s-&#112;-p-g; s-&#113;-q-g; s-&#114;-r-g;
+  s-&#115;-s-g; s-&#116;-t-g; s-&#117;-u-g; s-&#118;-v-g; s-&#119;-w-g; s-&#120;-x-g;
+  s-&#121;-y-g; s-&#122;-z-g;
+  s-&#45;-\--g; s-&#47;-/-g; s-&#47;-/-g; s-&#58;-:-g; s-&#61;-=-g; s-&#64;-@-g;
+  s-&#95;-_-g; s-&#126;-~-g;              s-&#20;- -g; s-&#94;-^-g; s-&#124;-|-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-&#10;-\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