. "$_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#* }"
+ local meta file link name
- if [ "$type" = dir ]; then
- name="${meta%% *}";
- display="$(HTML "$name")"; link="$(URL "$ITEM/$name")"
- printf '[a .list .dir href="%s" %s]' "${link}?${w_refuri#*\?}" "$name"
+ 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/$ITEM/$name" ]; then
- link="$(URL "$ITEM/$name")"
- name="$(HTML "$ITEM/$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]
+ [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" \
- "$(printf '%s\n' "${tags#tags=}" \
- | sed -r "$UNSTRING"' s;^;,;; s;,+;,;g; s;,$;;;
+ "$link" "$link" "${name##/}" \
+ "$((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
- printf 'Canning record for nonexist file: %s\n' "$name" >&2
- 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^" \
- | sed -r 's;\^;\n;g; s;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\&;g' \
+ | sed -E 's;\^;\n;g; s;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\&;g' \
| while read -r f; do
- [ ! "${f#~}" ] && continue
- [ "${f#~}" = "$f" ] \
- && fex="/(\ttags=([^\t]*,)?)(${f})((,[^\t]*)?\t)/{${fex}}" \
- || fex="/(\ttags=([^\t]*,)?)(${f#~})((,[^\t]*)?\t)/d; ${fex}"
+ [ "${f##*[A-Z]*}" ] && tl="y;ABCDEFGHIJKLMNOPQRSTUVWXYZ;abcdefghijklmnopqrstuvwxyz;;"
+ case $f in
+ ''|~) continue;;
+ ~\\\$:*) fex="h; ${tl} /${f#~\\\$:}/d; g;${fex}";;
+ \\\$:*) fex="h; ${tl} /${f#\\\$:}/{g;${fex}}";;
+ ~*) fex="/(\ttags=([^\t]*,)?)(${f#\~})((,[^\t]*)?\t)/d; ${fex}";;
+ *) fex="/(\ttags=([^\t]*,)?)(${f})((,[^\t]*)?\t)/{${fex}}";;
+ esac
printf '%s\n' "${fex}"
done \
| tail -n1
)"
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="$1" file
+ file="$(printf %s\\n "$_DATA/$ITEM/$short".*)"
+ file="${file%%${BR}*}"
+ [ -e "$file" ] && printf %s\\n "${file#${_DATA}/${ITEM}/}"
}
list_filter(){
if [ "$FILTER" ]; then
- sed -nr "$list_fex"
+ debug "FEX:" "$list_fex"
+ sed -nE "$list_fex"
elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
grep -aviEe "$(STRING "${SEARCH}" \
- | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+ | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
s; ;\\+;g;')"
elif [ "${SEARCH}" ]; then
grep -aiEe "$(STRING "${SEARCH}" \
- | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+ | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
s; ;\\+;g;')"
else
fi
}
-groupmatch(){
- if [ ${#1} -gt ${#2} ]; then
- long="$1" short="$2"
- else
- long="$2" short="$1"
- fi
- com="$(expr substr "$long" 1 $((${#long} * 3 / 4)))"
- cut="${short#$com}"
- if [ ${#cut} -lt ${#short} ]; then
- return 0
- else
- return 1
- fi
-}
-
list_order(){
- local fm fn fn al length ln h w t c name buffer l
+ local fm fn fn al length ln h w t c name group o buffer l
if [ $ORDER = Name ]; then
- sort -k6 |sed 's;^;metashort\t;;'
+ sort -k6
elif [ $ORDER = Group ]; then
- { sort -k6; echo '0 0 0 tags= comment= _'; } \
- | while read -r length h w t c name; do
- if groupmatch "$ln" "$name"; then
+ { sort -n -k8 -k6,6 |sort -s -k7,7 ; echo '0 0 0 tags= comment= _'; } \
+ | while read -r length w h t c name group o; do
+ if [ "${ln%% *}" = "${group}" ]; 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"
+ printf '%s\n' "$buffer" |while read -r l; do
+ [ "$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"
+ ln="$group"
done \
- | sort -sn -k1 |sed -r 's;^[0-9]+\t;metashort\t;;'
+ | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;;;'
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="${fm%${CR} *}"
+ fn="$(list_fullname "${fn##* }")"
+ printf '%i %s\n' \
+ "$(stat -c %Y "$fn")" "${fm}"
done \
- | sort -srn -k1 |sed -r 's;^[0-9]+\t;metalong\t;;'
+ | sort -srn -k1 |sed -E 's;^[0-9]+\t;;;'
fi
}
-list_filemeta(){
- local meta base cbase fm cachename
- base="$1"
- meta="$_DATA/$ITEM/$base/.index/meta"
- meta_dir "$_DATA/$ITEM/$base"
-
+list_items() {
+ 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 [ "$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; }
- fi
-}
-
-list_items() {
- local mode meta
- mode="$(COOKIE mode |grep -m1 -axE 'index|browse' || printf browse )"
-
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
}
local page i c n end qry
page="$(GET p |grep -axE '[0-9]+' || printf 1)"; c=1
end=$((page + LISTSIZE))
- qry="${w_refuri#*\?}"; qry="${qry#p=*&}"
+ eval "$LOCAL_META" # localize vars from db_meta
printf '[div .itemlist '
- while read -r i; do
+ while :; do
+ if [ $c -lt $page ]; then
+ read -r discard || break
+ elif [ $c -ge $end ]; then
+ c=$((c + $(wc -l) ))
+ break
+ else
+ read_meta || break
+ list_item
+ fi
c=$((c + 1))
- [ $c -gt $page -a $c -le $end ] && list_item "$i"
done
printf ']'
for n in $( seq 1 $end ); do
c=$(( (n - 1) * LISTSIZE + 1 ))
[ $c = $page ] \
- && printf '[a .page .current href="%s" %s]' "?p=${c}&${qry}" "$n" \
- || printf '[a .page href="%s" %s]' "?p=${c}&${qry}" "$n"
+ && printf '[a .page .current href="?p=%i&%s" %i]' "${c}" "${QUERY_STRING#p=*&}" "$n" \
+ || printf '[a .page href="?p=%i&%s" %i]' "${c}" "${QUERY_STRING#p=*&}" "$n"
done
printf ']'
}
{ printf '
[!DOCTYPE HTML]
-[html [head [title Listing]
+[html [head [title '
+ w_bmname
+ printf ' by %s]' "$ORDER"
+ printf '
[meta name="viewport" content="width=device-width"]
+ [link rel=stylesheet href="/cgilite/common.css" ]
[link rel=stylesheet href="/style.css" ]
] [body
[div #navigation
[a #t_bookmarks href="#bookmarks" ★]'
w_search
printf '
- [a #t_avsearch href="#advsearch" Advanced]
[a #t_prefs href="#prefs" ⚙]
]'
w_bookmarks
projects / serve0 / blobdiff