X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=b941aa7f246d32a3a9e5ff09c0ee509e9ebd2b30;hp=4596dfc23c593d487e7e07b7dfbd92c63990eeb0;hb=HEAD;hpb=3f9026072887cc5723948ec151dd108cf874225d

diff --git a/list.sh b/list.sh
old mode 100644
new mode 100755
index 4596dfc..94a9264
--- a/list.sh
+++ b/list.sh
@@ -1,167 +1,229 @@
 #!/bin/sh
 
 . "$_EXEC/indexmeta.sh"
+. "$_EXEC/widgets.sh"
+. "$_EXEC/db_meta.sh"
 
 list_item() {
-  name="$(HTML "$1")"
-  path="$(HTML "$ITEM/$1")"
-  meta="$_DATA/$ITEM/$1"; meta="${meta%/*}/.index/meta"
-
-  if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s?%s" %s]' \
-      "$path" "$(HTML "$QUERY_STRING")" "$name"
-  elif [ -f "$meta" ]; then
-    read -r length width height tags comment n <<-EOF
-	$(grep -m1 -F "	$(meta_name "$1")" "$meta")
-	EOF
+  local meta file link 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
+
+  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:%imin] [span .dim %ix%i] %s
-              [checkbox "select" "%s" id="select_%s" form="multitag"][label for="select_%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" +]
             ]' \
-      "$path" "$path" "$name" \
-      "$((length / 60))" "$((length % 60))" \
-      "$width" "$height" \
-      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')" \
-      "$path" "$path" "$path"
+      "$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 '[div .list .file [a href="%s" [img src="%s?a=thumbnail"][label %s]]]' \
-      "$path" "$path" "$name"
+    debug "Canning record for nonexist file: $META_NAME"
+    meta_purge "$_DATA/$ITEM/$META_NAME"
   fi
 }
 
-list_fs_browse(){
-  meta_dir "$_DATA/$ITEM"
-  (cd "$_DATA/$ITEM";
-   find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
-     -exec stat -c '%Y	%n' '{}' +
-   find ./ -type f -mindepth 1 -maxdepth 1 \
-     -exec stat -c '%Y	%n' '{}' +
-  )
-}
-list_fs_index(){
-  find "$_DATA/$ITEM" -type d -name .index \
-  | while d="$(line)"; do
-    meta_dir "${d%/.index}"
-  done
-  (cd "$_DATA/$ITEM";
-   find ./ \! -path '*/.index/*' -type f \
-     -exec stat -c '%Y	%n' '{}' +
-  )
+[ "$FILTER" ] && list_fex="$(
+  fex='p'
+  STRING "$FILTER^" \
+  | sed -E 's;\^;\n;g; s;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\&;g' \
+  | while read -r f; do
+    [ "${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(){
+  local short="$1" file
+  file="$(printf %s\\n "$_DATA/$ITEM/$short".*)"
+  file="${file%%${BR}*}"
+  [ -e "$file" ] && printf %s\\n "${file#${_DATA}/${ITEM}/}"
 }
 
-list_browse(){
-  meta="$_DATA/$ITEM/.index/meta"
-  meta_dir "$_DATA/$ITEM"
-  (cd "$_DATA/$ITEM";
-    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
-  ) | cut -d/ -f2- | sort
-  sort -n "$meta" | cut -f6- \
-  | while f="$(line)"; do
-    [ -e "$_DATA/$ITEM/$f" ] && printf '%s\n' "$f"
-  done
+list_filter(){
+  if [ "$FILTER" ]; then
+    debug "FEX:" "$list_fex"
+    sed -nE "$list_fex"
+  elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
+    grep -aviEe "$(STRING "${SEARCH}" \
+                 | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                            s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
+                            s; ;\\+;g;')"
+  elif [ "${SEARCH}" ]; then
+    grep -aiEe "$(STRING "${SEARCH}" \
+                 | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                            s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
+                            s; ;\\+;g;')"
+  else
+    cat
+  fi
 }
-list_index(){
-  (cd "$_DATA/$ITEM";
-    find ./ -path '*/.index/meta'
-  ) | while meta="$(line)"; do
-    base="${meta%/.index/meta}"
-    meta_dir "$_DATA/$ITEM/$base"
-    cut -f1,6- <"$_DATA/$ITEM/$meta" \
-    | while f="$(line)"; do
-      fn="$(printf '%s\n' "$_DATA/$ITEM/$base/${f#*	}".*)"
-      fn="${fn%%${BR}*}"; fn="${fn##*/}"
-      [ -e "$_DATA/$ITEM/$base/${fn}" ] \
-      && printf '%s	%s\n' "${f%%	*}" "${base}/${fn}"
-    done
-  done \
-  | sort -n \
-  | cut -d/ -f2-
+
+list_order(){
+  local fm fn fn al length ln h w t c name group o buffer l
+
+  if [ $ORDER = Name ]; then
+    sort -k6
+  elif [ $ORDER = Group ]; 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	$w	$h	$t	$c	$name"
+      else
+	printf '%s\n' "$buffer" |while read -r l; do
+          [ "$l" ] && printf '%i	%s\n' "$al" "$l"
+        done
+        al="$length"
+        buffer="$length	$w	$h	$t	$c	$name"
+      fi
+      ln="$group"
+    done \
+    | sort -s -n -k1,1 |sed -E 's;^[0-9]+\t;;;'
+  elif [ $ORDER = Length ]; then
+    sort -sn -k1
+  elif [ $ORDER = Date ]; then
+    while read -r fm; do
+      fn="${fm%${CR}	*}"
+      fn="$(list_fullname "${fn##*	}")"
+      printf '%i	%s\n' \
+             "$(stat -c %Y "$fn")" "${fm}"
+    done \
+    | sort -srn -k1 |sed -E 's;^[0-9]+\t;;;'
+  fi
 }
 
 list_items() {
-  mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
-
-  [ "$mode" = browse -a "$ITEM" ] && printf '..\n'
-
-  if   [ "$mode" = browse -a "$ORDER" = Date ]; then
-    list_fs_browse | sort -rn | cut -d/ -f2-
-  elif [ "$mode" = browse -a "$ORDER" = Name ]; then
-    list_fs_browse | sort -k 2 | cut -d/ -f2-
-  elif [ "$mode" = index  -a "$ORDER" = Date ]; then
-    list_fs_index | sort -rn | cut -d/ -f2-
-  elif [ "$mode" = index  -a "$ORDER" = Name ]; then
-    list_fs_index | sort -k 2 | cut -d/ -f2-
-  elif [ "$mode" = browse -a "$ORDER" = Length ]; then
-    list_browse
-  elif [ "$mode" = index  -a "$ORDER" = Length ]; then
-    list_index
+  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 '0	0	0	\	\	../\n'
+    (cd "$_DATA/$ITEM";
+      find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
+    ) | 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
 }
 
 list_paginate() {
-  page="$(GET p |grep -xE '[0-9]+' || printf 1)"
+  local page i c n end qry
+  page="$(GET p |grep -axE '[0-9]+' || printf 1)"; c=1
+  end=$((page + LISTSIZE))
+  eval "$LOCAL_META"  # localize vars from db_meta
 
   printf '[div .itemlist '
-  while i="$(line)"; do
-    c=$((${c-0} + 1))
+  while :; do
     if [ $c -lt $page ]; then
-      true
-    elif [ $c -lt $((LISTSIZE + page)) ]; then
-      list_item "$i"
+      read -r discard || break
+    elif [ $c -ge $end ]; then
+      c=$((c + $(wc -l) ))
+      break
+    else
+      read_meta || break
+      list_item
     fi
+    c=$((c + 1))
   done
   printf ']'
 
+  [ $(( c % LISTSIZE )) -gt 0 ] \
+  && end=$((c / LISTSIZE + 1)) \
+  || end=$((c / LISTSIZE))
+
   printf '[div .pagination'
-  for n in $(seq 1 $((c / LISTSIZE + 1)) ); do
-    printf '[a .page href="%s" %s]' \
-      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n"
+  for n in $( seq 1 $end ); do
+    c=$(( (n - 1) * LISTSIZE + 1 ))
+    [ $c = $page ] \
+    && 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 ']'
 }
 
-w_tagging(){
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$(HTML "$REQUEST_URI")"
-  printf '[a href="#" Hide][br]'
-  find "$_DATA/$ITEM" -path '*/.index/meta' \
-       -exec cut -f4 '{}' + \
-  | cut -d= -f2- |tr , '\n' | sort -u \
-  | while read tag; do
-    cat_old="${category}"; category="${tag%%:*}"
-    [ "$category" = "$tag" ] && category="(none)"
-    [ "$cat_old" -a "$cat_old" != "$category" ] && printf ']]'
-    [ "$cat_old" != "$category" ] \
-    && printf '[fieldset [legend %s:][select name="tag" size=4 multiple' $(HTML "$category")
-    printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "${tag#*:}")"
-  done
-  printf ']][fieldset [legend New:][textarea name=newtag\n][button type=Submit Add Tags]]]'
-}
-
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
-"$_EXEC/cgilite/html-sh.sed" <<-EOF
+{ 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" &#x2605;]
-    $(w_search)
-    [a #t_avsearch href="#advsearch" Advanced]
+    [a #t_bookmarks href="#bookmarks" &#x2605;]'
+    w_search
+    printf '
     [a #t_prefs href="#prefs" &#x2699;]
-  ]
-  $(w_prefs)
-
-  [form method=POST action="?a=multitag"
-    $(list_items \
-      | list_paginate
-    )
-    [div #editing
-      [a href="#multitag" Add Tags] $(w_tagging)
-      $(w_index)
-    ]
-  ]
+  ]'
+  w_bookmarks
+  w_advsearch
+  w_prefs
+  printf '
+  [form method=POST action="?a=multitag"'
+    list_items \
+    | list_paginate
+    [ -d "$_DATA/$ITEM/.index" ] && { printf '
+    [div #editing'
+      w_tagging
+    printf '
+    ]'; }
+  printf '
+  ]'
+  [ ! -d "$_DATA/$ITEM/.index" ] && { printf '
+  [div #editing'
+    w_index
+  printf '
+  ]'; }
+  printf '
 ] ]
-EOF
-
+'; } | "$_EXEC/cgilite/html-sh.sed"