X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=widgets.sh;h=a4ec856e296cb6a8069bf1e3cf94f3de36710f8e;hp=cb5cf9754ac3f9562c4cd1d5126217735628277b;hb=02812995d1df8b60f702be2ec8cf807782a7ab35;hpb=002edf53da30cfd378a6ffca3ae2794361670090 diff --git a/widgets.sh b/widgets.sh index cb5cf97..a4ec856 100644 --- a/widgets.sh +++ b/widgets.sh @@ -7,16 +7,56 @@ 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 -u |HTML |sed 's;:\;;:;g; s; \;;\n;g;')" -w_tagcategories="$(printf %s "$w_tags" | cut -sd: -f1 | uniq)" +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")" ] + 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; printf '\n'; } \ + | while read -r tag; do + [ "$tag" = "$otag" ] \ + && cn=$((cn + 1)) \ + || { + printf "%i %s\n" "$cn" "$otag" + cn=1 + } + otag="$tag" + done + } |sort -rn |cut -f2- |HTML |sed "$w_ascii s- -\n-g; s;\n\n;\n;g;" |tee "$w_tags" )" + w_tagcategories="$(printf %s "$w_tags" \ + | sed -rn '/:/s;^-?([^:]+):.*$;\1;p' |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 +[ "$ORDER" = Group ] && w_cogroup=checked w_bookmarks(){ local name='' cf='' cs='' bm="$_DATA/.index/bookmarks" proposed_name='' @@ -60,10 +100,12 @@ w_bookmarks(){ [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] [br]' \ "$(HTML "$name" |sed 's;,\;;&[wbr];g;')" \ "$search" "$filter" \ "$search" "$filter" \ + "$search" "$filter" \ "$search" "$filter" done printf ']' @@ -71,25 +113,27 @@ w_bookmarks(){ w_search(){ printf ' - [form #search method=GET action=? + [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 name=s placeholder=Search value="%s"] ] ' \ - "$w_coname" "$w_codate" "$w_colength" \ + "$w_coname" "$w_codate" "$w_colength" "$w_cogroup" \ "$(HTML "$SEARCH")" } w_prefs(){ - local tm tf + local tm tf td tm=''; [ "$(COOKIE mode)" = index ] && tm=' ' tf=''; [ "$(COOKIE fakemp4)" = yes ] && tf=checked + td=''; [ "$(COOKIE downscale)" = yes ] && td=checked printf ' [form #prefs method="POST" action="?a=setprefs" @@ -99,16 +143,18 @@ w_prefs(){ [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] + [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" \ - "${tm:-checked}" "${tm:+checked}" "$tf" + "${tm:-checked}" "${tm:+checked}" "$tf" "$td" } w_index(){ - [ -d "$_DATA/$ITEM/.index" ] || printf ' + printf ' [form #index method="POST" action="?a=spawnindex" [hidden "ref" "%s"] [label Set up for Index view: ] @@ -116,11 +162,12 @@ w_index(){ [submit "spawn" "spawn" Set up] ] ' "$w_refuri" + 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}^" |sed "$w_ascii")" printf '[form #advsearch action=?a=advsearch method=POST [a href="#" Hide] @@ -150,16 +197,23 @@ w_advsearch(){ 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 printf '%s\n' "$w_tags" \ - | { [ "$category" = '*' ] && grep -avF ':' |grep -avxF '' || grep -awF "${category}"; } \ - | while read -r tag; do + | { [ "$category" = '*' ] && grep -avF ':' || grep -awF "${category}"; } \ + | { for n in 1 2 3 4 5 6 7 8 9 0; do + read -r line && printf '%s\n' "$line" || break; + done; # pass 10 lines through without modification + sort; # and sort remaining lines + } | 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 '[option %s value="%s"\n%s]' "$t" "$tag" "$d" done printf '\n]' done @@ -171,28 +225,38 @@ w_advsearch(){ [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_coname" "$w_codate" \ + "$w_colength" "$w_cogroup" } w_tagging(){ - local tag category - printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri" + local tag category d + printf '[a href="#multitag" Add Tags / Remove Tags] + [div #multitag [input type="hidden" name="ref" value="%s"]' "$w_refuri" printf '[a href="#" Hide][br]' 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:][select name=tag size=4 multiple\n' "$category" printf %s "$w_tags" \ - | { [ "$category" = 'Tags' ] && grep -avF ':' | grep -avxF '' || grep -awF "${category}"; } \ - | while read -r tag; do - printf '[option value="%s"\n%s]' "$tag" "${tag#*:}" + | { [ "$category" = 'Tags' ] && grep -avF ':' || grep -awF "${category}"; } \ + | { for n in 1 2 3 4 5 6 7 8 9 0; do + read -r line && printf '%s\n' "$line" || break + done; + sort; + } | while read -r tag; do + [ "$tag" ] || continue + d="${tag#-}"; d="${d#*:}" + printf '[option value="%s"\n%s]' "$tag" "$d" done printf ']]' done - printf '[fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]' + printf '[fieldset [legend New:][textarea name=newtag\n] + [submit "op" "del" Remove Tags][submit "op" "add" Add Tags] + ]]' }