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

diff --git a/list.sh b/list.sh
index d0868ba..2dc1a83 100644
--- a/list.sh
+++ b/list.sh
@@ -1,16 +1,19 @@
 #!/bin/sh
 
+. "$_EXEC/indexmeta.sh"
+. "$_EXEC/widgets.sh"
+
 list_item() {
+  local name path length width height tags comment n
   name="$(HTML "$1")"
-  path="$(HTML "$ITEM/$1")"
-  meta="$_DATA/$ITEM/$1"; meta="${meta%/*}/.index/meta"
+  path="$(URL "$ITEM/$1")"
+  qry=$(HTML "$QUERY_STRING")
 
   if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s?%s" %s]' \
-      "$path" "$(HTML "$QUERY_STRING")" "$name"
-  elif [ -f "$meta" ]; 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
-	$(grep -m1 -F "	${1##*/}" "$meta")
+	$(meta_info "$_DATA/$ITEM/$1")
 	EOF
     printf '[div .list .file
               [a href="%s" [img src="%s?a=thumbnail"][label %s]]
@@ -20,148 +23,154 @@ list_item() {
       "$path" "$path" "$name" \
       "$((length / 60))" "$((length % 60))" \
       "$width" "$height" \
-      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')" \
+      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
       "$path" "$path" "$path"
   else
-    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"][label %s]]]' \
-      "$path" "$path" "$name"
+    printf 'Canning record for nonexist file: %s\n' "$1" >&2
+    meta_purge "$_DATA/$ITEM/$1"
   fi
 }
 
-list_fs_browse(){
-  [ -d "$_DATA/$ITEM/.index" -a \! "$_DATA/$ITEM" -ot "$_DATA/$ITEM/.index/meta" ] \
-  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
+list_directories(){
   (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' '{}' +
-  )
+    find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
+  ) | cut -d/ -f2- | sort
 }
-list_fs_index(){
-  find "$_DATA/$ITEM" -type d -name .index \
-  | while d="$(line)"; do
-    [ ! "${d%/.index}" -ot "$d/meta" ] \
-    && dir="${d%/.index}" . "$_EXEC/update_meta.sh"
-  done
-  (cd "$_DATA/$ITEM";
-   find ./ \! -path '*/.index/*' -type f \
-     -exec stat -c '%Y	%n' '{}' +
-  )
+
+[ "$FILTER" ] && list_fex="$(
+  fex='p'
+  STRING "$FILTER^" \
+  | sed -r '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}"
+    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}"
 }
 
-list_browse(){
-  meta="$_DATA/$ITEM/.index/meta"
-  [ -d "${meta%/meta}" -a \! "$_DATA/$ITEM" -ot "${meta}" ] \
-  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
-  (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"
+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"
+  elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
+    grep -viE "$(STRING "${SEARCH#!}")"
+  else
+    grep -iE "$(STRING "${SEARCH}")"
+  fi |cut -f6 | UNSTRING \
+  | while read -r fn; do
+    printf '%s\n' "${base}/${fn%${CR}}"
   done
 }
+
 list_index(){
+  local meta
   (cd "$_DATA/$ITEM";
     find ./ -path '*/.index/meta'
-  ) | while meta="$(line)"; do
-    base="${meta%/.index/meta}"
-    [ \! "$_DATA/$ITEM/$base" -ot "$_DATA/$ITEM/$meta" ] \
-    && dir="$_DATA/$ITEM/$base" . "$_EXEC/update_meta.sh"
-    cut -f1,6- <"$_DATA/$ITEM/$meta" \
-    | while f="$(line)"; do
-      [ -e "$_DATA/$ITEM/$base/${f#*	}" ] \
-      && printf '%s	%s\n' "${f%%	*}" "${base}/${f#*	}"
-    done
+  ) | while read -r meta; do
+    list_filemeta "${meta%/.index/meta}"
+  done
+}
+
+list_dateorder(){
+  while read -r sn; do 
+    list_fullname "$sn"
   done \
-  | sort -n \
-  | cut -d/ -f2-
+  | xargs -rd'\n' stat -c '%Y	%n' \
+  | sort -rn |cut -d/ -f2- \
+  | sed -r 's;\.[^\.]*$;;;'
 }
 
 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_fs_browse | sort -rn | cut -d/ -f2-
-  elif [ "$mode" = browse -a "$ORDER" = Name ]; then
-    list_fs_browse | sort -k 2 | cut -d/ -f2-
+    list_directories
+    list_filemeta . |list_dateorder
   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 |list_dateorder
+  elif [ "$mode" = browse ]; then
+    list_directories
+    list_filemeta .
+  elif [ "$mode" = index ]; then
     list_index
   fi
 }
 
 list_paginate() {
-  page="$(GET p |grep -xE '[0-9]+' || printf 1)"
+  local page i c n end
+  page="$(GET p |grep -xE '[0-9]+' || printf 1)"; c=1
+  end=$((page + LISTSIZE))
 
   printf '[div .itemlist '
-  while i="$(line)"; do
-    c=$((${c-0} + 1))
-    if [ $c -lt $page ]; then
-      true
-    elif [ $c -lt $((LISTSIZE + page)) ]; then
-      list_item "$i"
-    fi
+  while read -r i; do
+    [ $c -ge $page -a $c -lt $end  ] \
+    && list_item "$(list_fullname "$i")"
+    c=$((c + 1))
   done
   printf ']'
 
   printf '[div .pagination'
-  for n in $(seq 1 $((c / LISTSIZE + 1)) ); do
+  for n in $( seq 1 $((c / LISTSIZE + 1)) ); do
     printf '[a .page href="%s" %s]' \
-      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n"
+      "?p=$(( (n - 1) * LISTSIZE + 1))&$qry" "$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]
+  [meta name="viewport" content="width=device-width"]
   [link rel=stylesheet href="/style.css" ]
 ] [body
   [div #navigation
-    [a #t_bookmarks href="#bookmarks" &#x2605;]
-    $(w_search)
+    [a #t_bookmarks href="#bookmarks" &#x2605;]'
+    w_search
+    printf '
     [a #t_avsearch href="#advsearch" Advanced]
     [a #t_prefs href="#prefs" &#x2699;]
-  ]
-  $(w_prefs)
-
-  [form method=POST action="?a=multitag"
-    $(list_items \
-      | list_paginate
-    )
+  ]'
+  w_prefs
+  w_advsearch
+  printf '
+  [form method=POST action="?a=multitag"'
+    list_items \
+    | list_paginate
+    printf '
     [div #editing
-      [a href="#multitag" Add Tags] $(w_tagging)
-      $(w_index)
+      [a href="#multitag" Add Tags]'
+      w_tagging
+      w_index
+      printf '
     ]
   ]
 ] ]
-EOF
-
+'; } | "$_EXEC/cgilite/html-sh.sed"