X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=b941aa7f246d32a3a9e5ff09c0ee509e9ebd2b30;hp=2dc1a8340307a7ca0f09f4d26c74d45b975d1ba8;hb=HEAD;hpb=7b674b9084ef483caee686be6cc051920eae2a70

diff --git a/list.sh b/list.sh
old mode 100644
new mode 100755
index 2dc1a83..94a9264
--- a/list.sh
+++ b/list.sh
@@ -2,143 +2,187 @@
 
 . "$_EXEC/indexmeta.sh"
 . "$_EXEC/widgets.sh"
+. "$_EXEC/db_meta.sh"
 
 list_item() {
-  local name path length width height tags comment n
-  name="$(HTML "$1")"
-  path="$(URL "$ITEM/$1")"
-  qry=$(HTML "$QUERY_STRING")
-
-  if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s" %s]' "${path}?${qry}" "$name"
-  elif [ -f "$_DATA/$ITEM/$1" ]; then
-    read -r length width height tags comment n <<-EOF
-	$(meta_info "$_DATA/$ITEM/$1")
-	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" \
-      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 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 'Canning record for nonexist file: %s\n' "$1" >&2
-    meta_purge "$_DATA/$ITEM/$1"
+    debug "Canning record for nonexist file: $META_NAME"
+    meta_purge "$_DATA/$ITEM/$META_NAME"
   fi
 }
 
-list_directories(){
-  (cd "$_DATA/$ITEM";
-    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
-  ) | cut -d/ -f2- | sort
-}
-
 [ "$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_filemeta(){
-  local meta base f fn file
-  base="$1"
-  meta="$_DATA/$ITEM/$base/.index/meta"
-  meta_dir "$_DATA/$ITEM/$base"
-
-  if [ $ORDER = Name ]; then
-    sort -k6 "$meta"
-  elif [ $ORDER = Length ]; then
-    sort -n "$meta"
-  else
-    cat "$meta"
-  fi \
-  | if [ "$FILTER" ]; then
-    sed -nr "$list_fex"
+list_filter(){
+  if [ "$FILTER" ]; then
+    debug "FEX:" "$list_fex"
+    sed -nE "$list_fex"
   elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
-    grep -viE "$(STRING "${SEARCH#!}")"
+    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
-    grep -iE "$(STRING "${SEARCH}")"
-  fi |cut -f6 | UNSTRING \
-  | while read -r fn; do
-    printf '%s\n' "${base}/${fn%${CR}}"
-  done
+    cat
+  fi
 }
 
-list_index(){
-  local meta
-  (cd "$_DATA/$ITEM";
-    find ./ -path '*/.index/meta'
-  ) | while read -r meta; do
-    list_filemeta "${meta%/.index/meta}"
-  done
-}
+list_order(){
+  local fm fn fn al length ln h w t c name group o buffer l
 
-list_dateorder(){
-  while read -r sn; do 
-    list_fullname "$sn"
-  done \
-  | xargs -rd'\n' stat -c '%Y	%n' \
-  | sort -rn |cut -d/ -f2- \
-  | sed -r 's;\.[^\.]*$;;;'
+  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() {
-  local mode
-  mode="$(COOKIE mode |grep -m1 -xE 'index|browse' || printf browse )"
-
-  [ "$mode" = browse -a "$ITEM" ] && printf '..\n'
-
-  if   [ "$mode" = browse -a "$ORDER" = Date ]; then
-    list_directories
-    list_filemeta . |list_dateorder
-  elif [ "$mode" = index  -a "$ORDER" = Date ]; then
-    list_index |list_dateorder
-  elif [ "$mode" = browse ]; then
-    list_directories
-    list_filemeta .
+  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
-    list_index
+    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() {
-  local page i c n end
-  page="$(GET p |grep -xE '[0-9]+' || printf 1)"; c=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 read -r i; do
-    [ $c -ge $page -a $c -lt $end  ] \
-    && list_item "$(list_fullname "$i")"
+  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))
   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))&$qry" "$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 ']'
 }
@@ -147,30 +191,39 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
 { 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
     printf '
-    [a #t_avsearch href="#advsearch" Advanced]
     [a #t_prefs href="#prefs" &#x2699;]
   ]'
-  w_prefs
+  w_bookmarks
   w_advsearch
+  w_prefs
   printf '
   [form method=POST action="?a=multitag"'
     list_items \
     | list_paginate
-    printf '
-    [div #editing
-      [a href="#multitag" Add Tags]'
+    [ -d "$_DATA/$ITEM/.index" ] && { printf '
+    [div #editing'
       w_tagging
-      w_index
-      printf '
-    ]
-  ]
+    printf '
+    ]'; }
+  printf '
+  ]'
+  [ ! -d "$_DATA/$ITEM/.index" ] && { printf '
+  [div #editing'
+    w_index
+  printf '
+  ]'; }
+  printf '
 ] ]
 '; } | "$_EXEC/cgilite/html-sh.sed"