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

diff --git a/widgets.sh b/widgets.sh
old mode 100644
new mode 100755
index f9c0380..35058cb
--- a/widgets.sh
+++ b/widgets.sh
@@ -4,145 +4,270 @@
 include_widgets="$0"
 
 . "$_EXEC/cgilite/storage.sh"
+. "$_EXEC/db_meta.sh"
 
-w_refuri="$(HTML "$REQUEST_URI")"
+w_refuri="$(URL "$PATH_INFO")?$(HTML "$QUERY_STRING")"
 
-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_str_s="$(STRING "$SEARCH")"
+w_str_f="$(STRING "$FILTER")"
 
-CHECK(){ [ "$1" = "$2" ] && printf checked; }
+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
+[ "$ORDER" = Length ] && w_colength=checked
+[ "$ORDER" = Group  ] && w_cogroup=checked
+
+w_bmname=
+w_bmname(){
+  [ "$w_bmname" ] || w_bmname="$(
+    bm="$_DATA/.index/bookmarks"
+    name="$(grep -m1 -aF "	search=${w_str_s}	filter=${w_str_f}${CR}" "$bm" 2>&-)"
+
+    if [ "$name" ]; then
+      printf '%s' "$name" |cut -f1 |UNSTRING |HTML
+    else
+      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;}' \
+      | HTML
+    fi
+  )"
+  printf '%s' "$w_bmname"
+}
+
+w_bookmarks(){
+  local bm="$_DATA/.index/bookmarks" name='' search='' filter=''
+  [ ! -d "${bm%/*}" ] && return 0
+  [ ! -f "$bm" ] && touch "$bm"
+
+  grep -qaF "	search=$w_str_s	filter=${w_str_f}${CR}" "$bm" && name=Update || name=Add
+
+  cat <<-EOF
+	[form #bookmarks action=?a=bookmark method=POST
+	  [a href="#" x]
+	  [hidden "ref" "${w_refuri}"]
+	  [hidden "search" "$(HTML "$SEARCH")"][hidden "filter" "$(HTML "$FILTER")"]
+	  [label Name for current page:]
+	  [input name="name" value="$(w_bmname)" placeholder="Name" ]
+	  [button type="submit" . ${name}]
+	EOF
+  [ "$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" = "${w_str_s}" -a "$filter" = "${w_str_f}" ] && continue
+
+    name="$(UNSTRING "$name")";
+    search="$(UNSTRING "${search}" |URL)";
+    filter="$(UNSTRING "${filter}" |URL)";
+    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(){
   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]
-    ]
-    [input name=s placeholder=Search value="%s"]
-  ]
-  ' \
-  "$(CHECK "$ORDER" Name)" \
-  "$(CHECK "$ORDER" Date)" \
-  "$(CHECK "$ORDER" Length)" \
-  "$(HTML "$SEARCH")"
+    [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 fakemp4 mode
-  fakemp4="$(COOKIE fakemp4)"
-  mode="$(COOKIE mode)"
+  local tm tf td
+
+  tm=''; [ "$(COOKIE mode)" = browse ] && tm=' '
+  tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked
+  td=''; [ "$(COOKIE downscale)" = yes ] && td=checked
+
   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="%s"][br]
+    [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 ending][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" \
-  "$([ "$mode" = index  ] || CHECK)" \
-  "$(CHECK "$mode" index)" \
-  "$(CHECK "$fakemp4" yes)"
+  ]' "${w_refuri}" "${LISTSIZE}" "${tm:+checked=checked}" "${tm:-checked=checked}" "$tf" "$td"
 }
 
 w_index(){
-  [ -d "$_DATA/$ITEM/.index" ] || printf '
-  [form #index method="POST" action="?a=spawnindex"
-    [hidden "ref" "%s"]
-    [label Set up for Index view: ]
-    [checkbox "recursive" "yes" #spawn_recursive] [label for=spawn_recursive Include subdirectories]
-    [submit "spawn" "spawn" Set up]
-  ]
-  ' "$w_refuri"
+  cat <<-EOF
+	[form #index method="POST" action="?a=spawnindex"
+	  [hidden "ref" "${w_refuri}"]
+	  [label Set up for Index view: ]
+	  [checkbox "recursive" "yes" #spawn_recursive] [label for=spawn_recursive Include subdirectories]
+	  [submit "spawn" "spawn" Set up]
+	]
+	EOF
+  return 0
 }
 
 w_advsearch(){
-  local n lbid tag category tn filter f
-  filter="${FILTER}^"
+  local n lbid tag category filter f t d
+  filter="$(HTML "${FILTER}^")"
 
-  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.]
-         '
+  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)"
+
+    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 '%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}"
 
-    lbid="$(HTML "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#~}|"
-
-    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]
-              [select name=tag_%s size=10 multiple' \
-              $n "$catn" "$lbid" \
-              "$([ ! "${f%%*|${category}:*}" -o ! "${category%\*}" ] && printf checked)" \
-              "$lbid" "$catn" $n
-
-      printf %s "$w_tags" \
-      | { [ "$category" = '*' ] && grep -vF ':' || grep -wF "${category}"; } \
-      | while read -r tag; do
-        [ ! "$tag" ] && continue
-        tg="$(HTML "$tag")"; tn="${tg#*&#58;}"
-        printf '[option %s value="%s"\n%s]' \
-          "$([ ! "${f%%*|${tag}|*}" ] && printf selected)" \
-          "$tg" "$tn"
-      done
-      printf '\n]'
+        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
 
-  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]
-          ][button type=submit Apply Filter]]
-          ]' \
-          "$(CHECK "$ORDER" Name)" \
-          "$(CHECK "$ORDER" Date)" \
-          "$(CHECK "$ORDER" Length)"
+  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(){
+  printf '[a href="#multitag" Add Tags / Remove Tags]
+          [div #multitag [input type="hidden" name="ref" value="%s"]
+          [a href="#" X]
+          [fieldset [legend New:]
+          [submit "op" "filedelete" Delete Files]
+          ]]' "$w_refuri"
 }
 
 w_tagging(){
-  local tag category
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri"
-  printf '[a href="#" Hide][br]'
+  local tctag oldcat="" category tag
 
-  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 %s "$w_tags" \
-    | { [ "$category" = 'Tags' ] && grep -vF ':' || grep -wF "${category}"; } \
-    | while read -r tag; do
-      [ ! "$tag" ] && continue
-      tag="$(HTML "$tag")"; tn="${tag#*&#58;}"
-      printf '[option value="%s"\n%s]' "$tag" "$tn"
-    done
-    printf ']]'
+  cat <<-EOF
+	[a href="#multitag" Add Tags / Remove Tags]
+	[div #multitag [input type="hidden" name="ref" value="${w_refuri}"]
+	  [a href="#" X]
+	EOF
+
+  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 ']]'
 
-  printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]'
+  cat <<-EOF
+	  [fieldset [legend New:][textarea name=newtag]
+	  [label [checkbox "makegroup" "true"] Join selected into group]
+	  [submit "op" "del" Remove][submit "op" "flip" Flip][submit "op" "add" Add]
+	]]
+	EOF
 }