integrated bookmark manager

[serve0] / widgets.sh

diff --git a/widgets.sh b/widgets.sh
index 4a64deb08df1957c4ff03eac7e2c1c1ad8f4d261..9bb6d93e9a8ff7ffd5108e7479383a58450f1b31 100644 (file)
--- a/widgets.sh
+++ b/widgets.sh
@@ -5,7 +5,7 @@ include_widgets="$0"
 
 . "$_EXEC/cgilite/storage.sh"
 
-w_refuri="$(HTML "$REQUEST_URI")"
+w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 
 w_tags="$(find "$_DATA/" -path '*/.index/meta' -print0 \
         | xargs -r0 sed -r '
@@ -19,24 +19,52 @@ w_tagcategories="$(printf %s "$w_tags" | cut -sd: -f1 | uniq)"
 [ "$ORDER" = Length ] && w_colength=checked
 
 w_bookmarks(){
-  local name link bm
-  bm="$_DATA/.index/bookmarks"
-
-  printf '[form #bookmarks action=?a=bookmarks method=POST
-            [a href="#" X]
+  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"]
-          ' "$w_refuri"
-
-  name="$(grep -m1 -F "        $(STRING "${REQUEST_URI}")" "$bm")"
-  printf '[hidden "link" "%s"][input name="name" value="%s"]' \
-         "$(HTML "$link")" "$(HTML "$name")"
-
-  sort "$bm" |while read -r name link; do
-    name="$(UNSTRING "$name")"
-    link="$(UNSTRING "$link")"
-    if [ "$link" != "$REQUEST_URI" ]; then
-      printf '[a href="%s"\n%s]' "$(HTML "$link")" "$(HTML "$name")"
-    fi
+            [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")" \
+            "$search" "$filter" \
+            "$search" "$filter" \
+            "$search" "$filter"
   done
   printf ']'
 }