X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=0474fa5ea7f07ce669995f6caaf3ed4288438c0f;hb=3dd32a6a37e2b67132a666b9a1327485dfcf8558;hp=62a40271b735f06cd9a8bd255374d79457facdca;hpb=875e8557d847cdcbd5c32ae42ff1c3fec451828d;p=serve0

diff --git a/widgets.sh b/widgets.sh
index 62a4027..0474fa5 100644
--- a/widgets.sh
+++ b/widgets.sh
@@ -5,33 +5,132 @@ include_widgets="$0"
 
 . "$_EXEC/cgilite/storage.sh"
 
-w_refuri="$(HTML "$REQUEST_URI")"
-
-w_tags="$(find "$_DATA/" -path '*/.index/meta' -print0 \
-        | xargs -r0 cut -f4 \
-        | cut -d= -f2- |tr , '\n' | sort -u)"
-w_tags="$(UNSTRING "$w_tags")"
-w_tagcategories="$(printf %s "$w_tags" |cut -sd: -f1 |sort -u)"
+w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
+
+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
+[ "$ORDER" = Length ] && w_colength=checked
+
+w_bookmarks(){
+  local name='' cf='' cs='' bm="$_DATA/.index/bookmarks" proposed_name=''
+  [ ! -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;}'
+    )"
+
+  printf '[form #bookmarks action=?a=bookmark method=POST
+            [a href="#" x]
+            [hidden "ref" "%s"]
+            [hidden "search" "%s"][hidden "filter" "%s"]
+            [label Name for current page:]
+            [input name="name" value="%s" placeholder="Name" ]
+            [button type="submit" %s]' \
+            "$w_refuri" \
+            "$(HTML "$SEARCH")" "$(HTML "$FILTER")" \
+            "$(HTML "${name:-${proposed_name}}")" \
+            "${name:+Update}${proposed_name:+Add}"
+  [ "$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
+
+    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]
+            [br]' \
+            "$(HTML "$name" |sed 's;&#44\;;&[wbr];g;')" \
+            "$search" "$filter" \
+            "$search" "$filter" \
+            "$search" "$filter"
+  done
+  printf ']'
+}
 
 w_search(){
   printf '
   [form #search method=GET action=?
     [select name=o size=1 
       [option disabled=disabled Order By]
-      [option value=Name Name]
-      [option value=Date Date]
-      [option value=Length Length]
+      [option value=Name %s Name]
+      [option value=Date %s Date]
+      [option value=Length %s Length]
     ]
     [input name=s placeholder=Search value="%s"]
   ]
   ' \
+  "$w_coname" "$w_codate" "$w_colength" \
   "$(HTML "$SEARCH")"
 }
 
 w_prefs(){
-  local fakemp4 mode
-  fakemp4="$(COOKIE fakemp4)"
-  mode="$(COOKIE mode)"
+  local tm tf
+
+  tm=''; [ "$(COOKIE mode)" = index ] && tm=' '
+  tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
+
   printf '
   [form #prefs method="POST" action="?a=setprefs"
     [a href="#" x]
@@ -45,9 +144,7 @@ w_prefs(){
   ]
   ' \
   "$w_refuri" "$LISTSIZE" \
-  "$([ "$mode" = index ] || printf checked)" \
-  "$([ "$mode" = index ] && printf checked)" \
-  "$([ "$fakemp4" = yes    ] && printf checked)"
+  "${tm:-checked}" "${tm:+checked}" "$tf"
 }
 
 w_index(){
@@ -62,48 +159,48 @@ w_index(){
 }
 
 w_advsearch(){
-  local n lbid tag category tn filter f
-  filter="${FILTER}^"
+  local n lbid tag category filter f t
+  filter="$(HTML "${FILTER}^" |sed "$w_ascii")"
 
   printf '[form #advsearch action=?a=advsearch method=POST
             [a href="#" Hide]
             [p .help Select multiple tags from each category by holding down the [strong Ctrl] key on your keyboard.[br]
-            Refine the search further by setting additional search tags using the [strong "+and"] button.]
-            [hidden "ref" "%s"]
-         ' "$w_refuri"
+            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#*^}"
 
-    lbid="$(HTML "cat_${n}_(none)")"
+    t=''; [ "$f" -a ! "${f%%~*}" ] && t=" "
+
+    lbid="cat_${n}_(none)"
     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" ] && printf 'checked')" $n \
-            $n "$([ "$f" -a ! "${f%%~*}" ] || printf 'checked')" $n $n \
-            $n "$([ "$f" -a ! "${f%%~*}" ] && printf 'checked')" $n $n
-    f="|${f#~}|"
+            $n "${f:+checked}" $n \
+            $n "${t:-checked}" $n $n \
+            $n "${t:+checked}" $n $n
 
+    f="|${f#~}|"
     printf '*\n%s\n' "$w_tagcategories" \
     | while read -r category; do
-      catn="$(HTML "$category")"
-      lbid="cat_${n}_${catn}"
-      printf '[radio "cat_%i" "%s" .cat id="%s" %s][label for="%s" %s]
+      lbid="cat_${n}_${category}"
+
+      t=''
+      [ "$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' \
-              $n "$catn" "$lbid" \
-              "$([ ! "${f%%*|${category}:*}" -o ! "${category%\*}" ] && printf 'checked')" \
-              "$lbid" "$catn" $n
+              $n "$category" "$t" "$lbid" "$lbid" "$category" $n
 
-      printf %s "$w_tags" \
-      | { [ "$category" = '*' ] && grep -vF ':' || grep -wF "${category}"; } \
+      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
-        [ ! "$tag" ] && continue
-        tg="$(HTML "$tag")"; tn="${tg#*:}"
-        printf '[option %s value="%s" %s]' \
-          "$([ ! "${f%%*|${tag}|*}" ] && printf 'selected')" \
-          "$tg" "$tn"
+        t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked
+        printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}"
       done
       printf '\n]'
     done
@@ -112,11 +209,14 @@ w_advsearch(){
 
   printf '[fieldset .submit [select name=order
             [option disabled=disabled Order By]
-            [option value=Name Name]
-            [option value=Date Date]
-            [option value=Length Length]
+            [option value=Name %s Name]
+            [option value=Date %s Date]
+            [option value=Length %s Length]
           ][button type=submit Apply Filter]]
-          ]'
+          ]' \
+          "$w_coname" \
+          "$w_codate" \
+          "$w_colength"
 }
 
 w_tagging(){
@@ -126,13 +226,12 @@ w_tagging(){
 
   printf 'Tags\n%s\n' "$w_tagcategories" \
   | while read -r category; do
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$(HTML "$category")"
+    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category"
     printf %s "$w_tags" \
-    | { [ "$category" = 'Tags' ] && grep -vF ':' || grep -wF "${category}"; } \
+    | { [ "$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
-      [ ! "$tag" ] && continue
-      tag="$(HTML "$tag")"; tn="${tag#*:}"
-      printf '[option value="%s" %s]' "$tag" "$tn"
+      printf '[option value="%s"\n%s]' "$tag" "${tag#*:}"
     done
     printf ']]'
   done