From: Paul Hänsch Date: Tue, 16 Nov 2021 03:26:28 +0000 (+0100) Subject: simplified pipelining X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=c33778df95c5c6d8cc00d0fea8a338b313ec55d9;p=serve0 simplified pipelining --- diff --git a/list.sh b/list.sh old mode 100644 new mode 100755 index 60609b6..2384da8 --- a/list.sh +++ b/list.sh @@ -2,50 +2,46 @@ . "$_EXEC/indexmeta.sh" . "$_EXEC/widgets.sh" +. "$_EXEC/db_meta.sh" list_item() { - local meta type length width height tags comment name display link - meta="${1}"; type="${meta%% *}"; meta="${meta#* }" - - if [ "$type" = dir ]; then - name="${meta%% *}"; - display="$(HTML "$name")"; link="$(URL "${PATH_INFO%/}/$name")" - printf '[a .list .dir href="%s" %s]' "${link}?${w_refuri#*\?}" "$name" + local meta file link name + eval "$LOCAL_META" + meta="${1}"; + + read_meta <<-EOF + $meta + EOF + + if [ "${META_NAME%/}" != "${META_NAME}" ]; then + printf '[a .list .dir href="%s?%s" . %s]' \ + "$(URL "${PATH_INFO%/}/${META_NAME}")" "${w_refuri#*\?}" \ + "$(HTML "${META_NAME%/}")" return 0 fi - length="${meta%% *}"; meta="${meta#* }" - width="${meta%% *}"; meta="${meta#* }" - height="${meta%% *}"; meta="${meta#* }" - tags="${meta%% *}"; meta="${meta#* }" - comment="${meta%% *}"; meta="${meta#* }" - name="${meta%% *}"; meta="${meta#* }" - - if [ "$type" = metashort ]; then - name="$(list_fullname "$(UNSTRING "${name%${CR}}")")" - fi - if [ -f "$_DATA/${PATH_INFO%/}/$name" ]; then - link="$(URL "${PATH_INFO%/}/${name#./}")" - name="$(HTML "${PATH_INFO%/}/${name#./}")" + file="$_DATA/${PATH_INFO%/}/$(list_fullname "${META_NAME}")" + if [ -f "$file" ]; then + link="$(URL "${PATH_INFO%/}/${file#${_DATA}/${PATH_INFO}}")" + name="$(HTML "${PATH_INFO%/}/${file#${_DATA}/${PATH_INFO}}")" printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"]][label . %s] [span .time %i:%02imin] [span .dim %ix%i] %s [checkbox "select" "%s" id="select_%s"][label for="select_%s" +] ]' \ "$link" "$link" "${name##/}" \ - "$((length / 60))" "$((length % 60))" \ - "$width" "$height" \ - "$(UNSTRING "${tags#tags=}" \ + "$((META_LENGTH / 60))" "$((META_LENGTH % 60))" \ + "$META_WIDTH" "$META_HEIGHT" \ + "$(printf %s\\n "${META_TAGS}" \ | sed -r 's;^;,;; s;,+;,;g; s;,$;;; :X s;,-?([^,]+)(,|$); [span .tag\n \1]\2;; tX;' )" "$name" "$link" "$link" else - debug "Canning record for nonexist file: $name" - meta_purge "$_DATA/$ITEM/$name" + debug "Canning record for nonexist file: $META_NAME" + meta_purge "$_DATA/$ITEM/$META_NAME" fi } - [ "$FILTER" ] && list_fex="$( fex='p' STRING "$FILTER^" \ @@ -65,12 +61,10 @@ list_item() { )" list_fullname(){ - sn="$1" - [ ! "${sn%%*/*}" ] && base="${sn%/*}" || base=. - file="$(printf '%s' "$_DATA/$ITEM/$sn".*)" - file="${file##*/}" - [ -e "$_DATA/$ITEM/$base/${file}" ] \ - && printf '%s\n' "${base}/${file}" + local short="$(UNSTRING "${1%${CR}}")" file + file="$(printf %s\\n "$_DATA/$ITEM/$short".*)" + file="${file%%${BR}*}" + [ -e "$file" ] && printf %s\\n "${file#${_DATA}/${ITEM}/}" } list_filter(){ @@ -96,7 +90,7 @@ list_order(){ local fm fn fn al length ln h w t c name buffer l if [ $ORDER = Name ]; then - sort -k6 |sed 's;^;metashort\t;;' + sort -k6 elif [ $ORDER = Group ]; then sed -E ' :X @@ -105,73 +99,68 @@ list_order(){ s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^ 0-9]*)([0-9]+)(.*)$;\1\r\3 \2;; tX;' \ | { sort -n -k7 -k8 -k9 -k10 -k11 |sort -s -k6,6 ; echo '0 0 0 tags= comment= _'; } \ - | while read -r length h w t c name; do + | while read -r length w h t c name; do if [ "${ln%% *}" = "${name%% *}" ]; then al=$((al + length)) - buffer="${buffer}${BR}$length $h $w $t $c $name" + buffer="${buffer}${BR}$length $w $h $t $c $name" else printf '%s\n' "$buffer" |while read -r l; do - [ "$l" ] && printf '%s %s\n' "$al" "$l" + [ "$l" ] && printf '%i %s\n' "$al" "$l" done al="$length" - buffer="$length $h $w $t $c $name" + buffer="$length $w $h $t $c $name" fi ln="$name" done \ - | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;metashort\t;;' \ + | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;;;' \ | sed -E ':X s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\r]*)\r([^ ]*) ([^ ]+)( .*)?$;\1\3\2\4;; tX' elif [ $ORDER = Length ]; then - sort -sn -k1 |sed 's;^;metashort\t;;' + sort -sn -k1 elif [ $ORDER = Date ]; then while read -r fm; do - sn="${fm##* }" - fn="$(list_fullname "$(UNSTRING "${sn%${CR}}")")" - printf '%i %s %s\n' \ - "$(stat -c %Y "$fn")" "${fm% *}" "$fn" + fn="$(list_fullname "${fm##* }")" + printf '%i %s\n' \ + "$(stat -c %Y "$fn")" "${fm}" done \ - | sort -srn -k1 |sed -E 's;^[0-9]+\t;metalong\t;;' - fi -} - -list_filemeta(){ - local meta base cbase fm cachename - base="$1" - meta="$_DATA/$ITEM/$base/.index/meta" - meta_dir "$_DATA/$ITEM/$base" - - cachename="$(printf '%s\n' "$mode" "$FILTER" "$SEARCH" "$ORDER" |sha1sum)" - cachename="$_DATA/$ITEM/.index/${cachename% -}.cache" - - if [ "$cachename" -nt "$meta" ] 2>&-; then - cat "$cachename" - else - cbase="$(STRING "$base")" - grep -axE '[0-9]+ [0-9]+ [0-9]+ tags=[^ ]* comment=[^ ]* .+' "$meta" \ - | while read -r fm; do - printf '%s %s/%s\n' "${fm% *}" "$cbase" "${fm##* }" - done \ - | list_filter \ - | list_order \ - | { [ -d "${meta%meta}" ] && tee "$cachename" || cat; } + | sort -srn -k1 |sed -E 's;^[0-9]+\t;;;' fi } list_items() { - local mode meta + local mode meta cachename mode="$(COOKIE mode |grep -m1 -axE 'index|browse' || printf index )" + cachename="$(printf '%s\n' "$mode" "$FILTER" "$SEARCH" "$ORDER" |sha1sum)" + cachename="$_DATA/$ITEM/.index/${cachename% -}.cache" + meta="$_DATA/$ITEM/.index/meta" + meta_dir "$_DATA/$ITEM/" + if [ "$mode" = browse ]; then - [ "$ITEM" ] && printf 'dir\t..\n' + [ "$ITEM" ] && printf '0 0 0 \ \ ../\n' (cd "$_DATA/$ITEM"; find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \ - ) | cut -d/ -f2- | sort |sed 's;^;dir\t;;' - list_filemeta . - elif [ "$mode" = index ]; then - (cd "$_DATA/$ITEM"; - find ./ -path '*/.index/meta' - ) | while read -r meta; do - list_filemeta "${meta%/.index/meta}" + ) | sort |while read dir; do + printf '0 0 0 \\ \\ %s\n' "$(STRING "${dir#./}")" done + + if [ "$cachename" -nt "$meta" ]; then + cat "$cachename" + else + list_meta "$meta" \ + | list_filter \ + | list_order \ + | { [ -d "${cachename%/*}" ] && tee "$cachename" || cat; } + fi + + elif [ "$mode" = index ]; then + if [ -f "$cachename" -a ! "$(find "$_DATA" -path '*/.index/meta' -newer "$cachename")" ]; then + cat "$cachename" + else + list_meta \ + | list_filter \ + | list_order \ + | { [ -d "${cachename%/*}" ] && tee "$cachename" || cat; } + fi fi }