X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=list.sh;h=324d8eb29007e6e548b63da225b25595ac723a90;hb=f99cce3548251966cd0b7c9ead81460e2f14466c;hp=cb0e4c159bc9a556638301087c046c1e7a232617;hpb=3c586e3fe4da20469de93897d03d41f82cb15b3b;p=serve0

diff --git a/list.sh b/list.sh
index cb0e4c1..324d8eb 100644
--- a/list.sh
+++ b/list.sh
@@ -1,44 +1,124 @@
 #!/bin/sh
 
-list_dir(){
-  dir="$(HTML "$1")"
-  printf '[a .list .dir href="%s" %s]' \
-    "$dir" "$dir"
-}
+list_item() {
+  name="$(HTML "$1")"
+  path="$(HTML "$ITEM/$1")"
+  meta="$_DATA/$ITEM/$1"; meta="${meta%/*}/.index/meta"
 
-list_file(){
-  file="$(HTML "$1")"
-  printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"] %s]]' \
-    "$file" "$file" "$file"
+  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 "	${1##*/}" "$meta")
+	EOF
+    printf '[div .list .file
+              [a href="%s" [img src="%s?a=thumbnail"][label %s]]
+              [span .time %i:%imin] [span .dim %ix%i] %s
+            ]' \
+      "$path" "$path" "$name" \
+      "$((length / 60))" "$((length % 60))" \
+      "$width" "$height" \
+      "$(printf %s\\n "${tags#tags=}" |tr , ' ' |xargs printf '[span .tag %s]')"
+  else
+    printf '[div .list .file [a href="%s" [img src="%s?a=thumbnail"][label %s]]]' \
+      "$path" "$path" "$name"
+  fi
 }
 
-list_dirs(){
+list_fs_browse(){
+  [ -d "$_DATA/$ITEM/.index" -a \! "$_DATA/$ITEM" -ot "$_DATA/$ITEM/.index/meta" ] \
+  && dir="$_DATA/$ITEM" . "$_EXEC/update_meta.sh"
   (cd "$_DATA/$ITEM";
-   find ./ -type d -mindepth 1 -maxdepth 1 \
+   find ./ -type d \! -name .index -mindepth 1 -maxdepth 1 \
      -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
-  | cut -d/ -f2-
+   find ./ -type f -mindepth 1 -maxdepth 1 \
+     -exec stat -c '%Y	%n' '{}' +
+  )
 }
-
-list_files(){
+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 ./ -type f -mindepth 1 -maxdepth 1 \
-     -exec stat -c '%Y	%n' "${f#./}" '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
-  | cut -d/ -f2-
+   find ./ \! -path '*/.index/*' -type f \
+     -exec stat -c '%Y	%n' '{}' +
+  )
 }
 
-list_tree(){
+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 f \
-     -exec stat -c '%Y	%n' '{}' +
-   ) \
-  | { [ "$(GET o)" = Date ] && sort -rn || sort -k 2; } \
+    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_index(){
+  (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
+  done \
+  | sort -n \
   | cut -d/ -f2-
 }
 
+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
+  fi
+}
+
+list_paginate() {
+  page="$(GET p |grep -xE '[0-9]+' || printf 1)"
+
+  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
+  done
+  printf ']'
+
+  printf '[div .pagination'
+  for n in $(seq 1 $((c / LISTSIZE + 1)) ); do
+    printf '[a .page href="%s" %s]' \
+      "?p=$(( (n - 1) * LISTSIZE + 1))" "$n"
+  done
+  printf ']'
+}
+
 printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 
 "$_EXEC/cgilite/html-sh.sed" <<-EOF
@@ -46,16 +126,20 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
 [html [head [title Listing]
   [link rel=stylesheet href="/style.css" ]
 ] [body
-  $(w_search)
-  [input type=checkbox #t_prefs .toggle ][label for=t_prefs &#x2699;]
+  [div #navigation
+    [a #t_bookmarks href="#bookmarks" &#x2605;]
+    $(w_search)
+    [a #t_avsearch href="#advsearch" Advanced]
+    [a #t_prefs href="#prefs" &#x2699;]
+  ]
   $(w_prefs)
-  $(if [ $(COOKIE mode) = index ]; then
-    list_tree  |while read -r file; do list_file "$file"; done
-  else
-    list_dirs  |while read -r  dir; do list_dir   "$dir"; done
-    printf '[br]'
-    list_files |while read -r file; do list_file "$file"; done
-  fi)
+
+  $(list_items \
+    | list_paginate
+  )
+  [div #editing
+    $(w_index)
+  ]
 ] ]
 EOF