X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=widgets.sh;h=26d755fb4301e3676b973cad186edfc41f13af8f;hb=f43a20b6cac2227e7bd192b92608c9fc4be89e85;hp=dd34bc0b627ae68b395d235fa0b024996cc45568;hpb=21b87390a05a69a53d5c66e385443d1397273f1a;p=serve0 diff --git a/widgets.sh b/widgets.sh old mode 100644 new mode 100755 index dd34bc0..26d755f --- a/widgets.sh +++ b/widgets.sh @@ -4,142 +4,165 @@ include_widgets="$0" . "$_EXEC/cgilite/storage.sh" +. "$_EXEC/db_meta.sh" 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;:\;;:;g; s; \;;\n;g;')" -w_tags="$( printf %s "$w_tags" |HTML |sed 's;:\;;:;g; s; \;;\n;g;')" +w_str_s="$(STRING "$SEARCH")" +w_str_f="$(STRING "$FILTER")" + +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; \;;\n;g; s;\n+;\n;g;' +} + +tclist(){ + printf %s "$*" \ + | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' \ + |sort -u +} + +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")" + +c_tagcategories="$_DATA/.index/tagcategories.cache" +if [ ! -s "$c_tagcategories" ]; then + tclist "$w_tags" >"$c_tagcategories.$$" + mv "$c_tagcategories.$$" "$c_tagcategories" +fi +w_tagcategories="$(cat "$c_tagcategories")" [ "$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 name='' cf='' cs='' bm="$_DATA/.index/bookmarks" proposed_name='' + local bm="$_DATA/.index/bookmarks" name='' search='' filter='' [ ! -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}" + 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" = "${cs}" -a "$filter" = "${cf}" ] && continue + [ "$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 .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;,\;;&[wbr];g;')" \ - "$search" "$filter" \ - "$search" "$filter" \ - "$search" "$filter" + cat <<-EOF + [label .link . $(HTML "$name" |sed 's;,\;;&[wbr];g;')] + [a .link target=blank href="/?o=Name&s=${search}&f=${filter}" by Name] + [a .link target=blank href="/?o=Date&s=${search}&f=${filter}" by Date] + [a .link target=blank href="/?o=Length&s=${search}&f=${filter}" by Length] + [a .link target=blank href="/?o=Group&s=${search}&f=${filter}" by Group] + EOF 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"] - ] - ' \ - "$w_coname" "$w_codate" "$w_colength" \ - "$(HTML "$SEARCH")" + cat <<-EOF + [form #search method=GET action=./? + [select name=o size=1 + [option disabled=disabled Order By] + [option value=Name ${w_coname} Name] + [option value=Date ${w_codate} Date] + [option value=Length ${w_colength} Length] + [option value=Group ${w_cogroup} Group] + ] + [input name=s placeholder=Search value="$(HTML "$SEARCH")"] + [a #t_avsearch href="#advsearch" Advanced] + ] + EOF } w_prefs(){ - local tm tf + local tm tf td - tm=''; [ "$(COOKIE mode)" = index ] && tm=' ' + 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] - [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] - [submit "store" "store" Set Cookie] - ] - ' \ - "$w_refuri" "$LISTSIZE" \ - "${tm:-checked}" "${tm:+checked}" "$tf" + cat <<-EOF + [form #prefs method="POST" action="?a=setprefs" + [a href="#" x] + [hidden "ref" "${w_refuri}"] + [label for=prefs_ps Pagesize] + [input #prefs_ps type=number name=pagesize value="${LISTSIZE}"][br] + [radio "mode" "browse" ${tm:+checked=checked} #prefs_modebrowse] [label for=prefs_modebrowse Browse Folders][br] + [radio "mode" "index" ${tm:-checked=checked} #prefs_modeindex ] [label for=prefs_modeindex View Full Index][br] + [checkbox "fakemp4" "yes" ${tf} #prefs_fmp4] [label for=prefs_fmp4 Fake .MP4 file type][br] + [checkbox "downscale" "yes" ${td} #prefs_downscale] [label for=prefs_downscale Prefer downscale to 480p][br] + [submit "index" "update" Force Index Update][br] + [submit "store" "store" Set Cookie] + ] + EOF } 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 filter f t - filter="$(HTML "${FILTER}^" |sed 's;~\;;~;g; s;^\;;^;g; s;|\;;|;g; s;:\;;:;g;')" + 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.]' + cat <<-EOF + [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.] + EOF for n in 1 2 3 4 5 6 7 8 9 10; do f="${filter%%^*}"; filter="${filter#*^}" @@ -147,66 +170,93 @@ w_advsearch(){ 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}" $n \ - $n "${t:-checked}" $n $n \ - $n "${t:+checked}" $n $n - - f="|${f#~}|" - printf '*\n%s\n' "$w_tagcategories" \ + cat <<-EOF + [input .and type=checkbox name=and id="and_${n}" ${f:+checked=checked}][label for="and_${n}" +and + ][fieldset .select + [radio "pol_${n}" "pos" .pol ${t:-checked=checked} #pol_pos_${n}"][label for=pol_pos_${n} Any] + [radio "pol_${n}" "neg" .pol ${t:+checked=checked} #pol_neg_${n}"][label for=pol_neg_${n} None] + [label .head Category:] + EOF + + f="|${f#\~}|" + printf '*\n%s\n$\n' "$w_tagcategories" \ | while read -r category; do lbid="cat_${n}_${category}" 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] - [select name=tag_%s size=10 multiple' \ - $n "$category" "$t" "$lbid" "$lbid" "$category" $n + [div .catselect\n' \ + $n "$category" "$t" "$lbid" "$lbid" "$category" printf '%s\n' "$w_tags" \ - | { [ "$category" = '*' ] && grep -avF ':' |grep -avxF '' || grep -awF "${category}"; } \ + | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \ + | { sed -u 10q; sort; } \ | while read -r tag; do + [ "$tag" ] || continue t=''; [ ! "${f%%*|${tag}|*}" ] && t=checked - printf '[option %s value="%s"\n%s]' "$t" "$tag" "${tag#*:}" + d="${tag#-}"; d="${d#*:}" + printf '[label [checkbox "tag_%s" "%s" %s] %s]' "$n" "$tag" "$t" "$d" done + d="${f##*\$:}" d="${d%%\|*}" + [ "$category" = \$ ] && printf '[input name="tag_%i" value="%s"]' "$n" "$(HTML "$d")" printf '\n]' done 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]] - ]' \ - "$w_coname" \ - "$w_codate" \ - "$w_colength" + cat <<-EOF + [fieldset .submit [select name=order + [option disabled=disabled Order By] + [option value=Name ${w_coname} Name] + [option value=Date ${w_codate} Date] + [option value=Length ${w_colength} Length] + [option value=Group ${w_cogroup} Group] + ][button type=submit Apply Filter]] + ] + EOF +} + +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 tag category d + + cat <<-EOF + [a href="#multitag" Add Tags / Remove Tags] + [div #multitag [input type="hidden" name="ref" value="${w_refuri}"] + [a href="#" X] + EOF printf 'Tags\n%s\n' "$w_tagcategories" \ | while read -r category; do - printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$category" + [ "$category" ] || continue + printf '[fieldset [legend %s:][div .tagselect\n' "$category" printf %s "$w_tags" \ - | { [ "$category" = 'Tags' ] && grep -avF ':' | grep -avxF '' || grep -awF "${category}"; } \ + | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \ + | { sed -u 10q; sort; } \ | while read -r tag; do - printf '[option value="%s"\n%s]' "$tag" "${tag#*:}" + [ "$tag" ] || continue + d="${tag#-}"; d="${d#*:}" + printf '[label [checkbox "tag" "%s"] %s]\n' "$tag" "$d" done printf ']]' done - printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]' + cat <<-EOF + [fieldset [legend New:][textarea name=newtag\n] + [label [checkbox "makegroup" "true"] Join selected into group] + [submit "op" "del" Remove Tags][submit "op" "add" Add Tags] + ]] + EOF }