X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=a4bdbc797490d31e68700e559476dcc8d02e4319;hp=fa657d10415d6a3deb4968799b93c874346190a5;hb=608e267413cf7f8399cacbbfc4269d3c3820a3aa;hpb=84232e55d22c7ae59ff9709e350d739813c6aaf6

diff --git a/list.sh b/list.sh
index fa657d1..a4bdbc7 100644
--- a/list.sh
+++ b/list.sh
@@ -1,173 +1,251 @@
 #!/bin/sh
 
 . "$_EXEC/indexmeta.sh"
+. "$_EXEC/widgets.sh"
 
 list_item() {
-  name="$(HTML "$1")"
-  path="$(HTML "$ITEM/$1")"
+  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 "$ITEM/$name")"
+    printf '[a .list .dir href="%s" %s]' "${link}?${w_refuri#*\?}" "$name"
+    return 0
+  fi
 
-  if [ -d "$_DATA/$ITEM/$1" ]; then
-    printf '[a .list .dir href="%s?%s" %s]' \
-      "$path" "$(HTML "$QUERY_STRING")" "$name"
-  else
-    read -r length width height tags comment n <<-EOF
-	$(meta_info "$_DATA/$ITEM/$1")
-	EOF
+  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")"
     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" \
+      "$link" "$link" "${name##*&#47;}" \
       "$((length / 60))" "$((length % 60))" \
       "$width" "$height" \
-      "$(UNSTRING "${tags#tags=}" |tr , '\0' |xargs -r0 printf ' [span .tag %s]')" \
-      "$path" "$path" "$path"
+      "$(printf '%s\n' "${tags#tags=}" \
+         | sed -r "$UNSTRING"' 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"
   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' '{}' +
-  )
+
+[ "$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_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' '{}' +
-  )
+
+list_filter(){
+  if [ "$FILTER" ]; then
+    sed -nr "$list_fex"
+  elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
+    grep -aviEe "$(STRING "${SEARCH}" \
+                 | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                            s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
+                            s; ;\\+;g;')"
+  elif [ "${SEARCH}" ]; then
+    grep -aiEe "$(STRING "${SEARCH}" \
+                 | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                            s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
+                            s; ;\\+;g;')"
+  else
+    cat
+  fi
 }
 
-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
+groupmatch(){
+  a="${1%$CR}" b="${2%$CR}"
+#  if [ ${#a} -gt ${#b} ]; then
+#    long="$a" short="$b"
+#  else
+#    long="$b" short="$a"
+#  fi
+  # com="$(expr substr "$long" 1 $((${#long} * 3 / 4)))"
+  # com="$(expr substr "$long" 1 $((${#long} - 3)))"
+  ## Cut off youtube- and other site suffixes. Cut of last three characters
+  com="$(printf %s "$a" |sed -E 's;-([0-9a-zA-Z_-]{11}|ph[0-9a-f]{13}|[0-9]{8})$;;; s;...$;;;')"
+  cut="${b#$com}"
+  if [ "${cut}" != "${b}" ]; then
+    return 0
+  else
+    return 1
+  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 buffer l
+
+  if [ $ORDER = Name ]; then
+    sort -k6 |sed 's;^;metashort\t;;'
+  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
+        al=$((al + length))
+        buffer="${buffer}${BR}$length	$h	$w	$t	$c	$name"
+      else
+	printf %s\\n "$buffer" |while read -r l; do
+          [ "$l" ] && printf '%s	%s\n' "$al" "$l"
+        done
+        al="$length"
+        buffer="$length	$h	$w	$t	$c	$name"
+      fi
+      ln="$name"
+    done \
+    | sort -sn -k1 |sed -r 's;^[0-9]+\t;metashort\t;;'
+  elif [ $ORDER = Length ]; then
+    sort -sn -k1 |sed 's;^;metashort\t;;'
+  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"
+    done \
+    | sort -srn -k1 |sed -r '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; }
+  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
+  mode="$(COOKIE mode |grep -m1 -axE 'index|browse' || printf browse )"
+  
+  if [ "$mode" = browse ]; then
+    [ "$ITEM" ] && printf 'dir\t..\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}"
+    done
   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))
+  qry="${w_refuri#*\?}"; qry="${qry#&#112;&#61;*&#38;}"
 
   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=$((c + 1))
+    [ $c -gt $page -a $c -le $end  ] && list_item "$i"
   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="%s" %s]' "?p=${c}&${qry}" "$n" \
+    || printf '[a .page href="%s" %s]' "?p=${c}&${qry}" "$n"
   done
   printf ']'
 }
 
-w_tagging(){
-  printf '[div #multitag [input type="hidden" name="ref" value="%s"]' "$(HTML "$REQUEST_URI")"
-  printf '[a href="#" Hide][br]'
-  tags="$(find "$_DATA/$ITEM" -path '*/.index/meta' -exec cut -f4 '{}' + \
-          | cut -d= -f2- |tr , '\n' | sort -u)"
-  tags="$(UNSTRING "$tags")"
-
-  printf '[fieldset [legend %s:][select name=tag size=4 multiple' "Tags"
-  printf %s "$tags" |grep -vF ":" |grep -vxF '' \
-  | while read -r tag; do
-    printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "$tag")"
-  done
-  printf ']]'
-
-  printf %s "$tags" |cut -sd: -f1 |sort -u \
-  | while read -r category; do
-    printf '[fieldset [legend %s:][select name=tag size=4 multiple' "$(HTML "$category")"
-    printf %s "$tags" |grep -wF "${category}" \
-    | while read -r tag; do
-      printf '[option value="%s" %s]' "$(HTML "$tag")" "$(HTML "${tag#*:}")"
-    done
-    printf ']]'
-  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="/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
-    )
-    [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"