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

diff --git a/list.sh b/list.sh
index 71f70f9..a4bdbc7 100644
--- a/list.sh
+++ b/list.sh
@@ -29,7 +29,7 @@ list_item() {
     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
+              [span .time %i:%02imin] [span .dim %ix%i] %s
               [checkbox "select" "%s" id="select_%s"][label for="select_%s" +]
             ]' \
       "$link" "$link" "${name##*/}" \
@@ -37,11 +37,11 @@ list_item() {
       "$width" "$height" \
       "$(printf '%s\n' "${tags#tags=}" \
          | sed -r "$UNSTRING"' s;^;,;; s;,+;,;g; s;,$;;;
-                   :X s;,([^,]+)(,|$); [span .tag \1]\2;; tX;'
+                   :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"
+    meta_purge "$_DATA/$ITEM/$name"
   fi
 }
 
@@ -87,13 +87,48 @@ list_filter(){
   fi
 }
 
+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_order(){
-  local fm fn fn
+  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 -n -k1 |sed 's;^;metashort\t;;'
+    sort -sn -k1 |sed 's;^;metashort\t;;'
   elif [ $ORDER = Date ]; then
     while read -r fm; do
       sn="${fm##*	}"
@@ -101,7 +136,7 @@ list_order(){
       printf '%i	%s	%s\n' \
              "$(stat -c %Y "$fn")" "${fm%	*}" "$fn"
     done \
-    | sort -rn -k1 |cut -f2- |sed 's;^;metalong\t;;'
+    | sort -srn -k1 |sed -r 's;^[0-9]+\t;metalong\t;;'
   fi
 }
 
@@ -160,10 +195,16 @@ list_paginate() {
   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="%s" %s]' "?p=${c}&${qry}" "$n" \
+    || printf '[a .page href="%s" %s]' "?p=${c}&${qry}" "$n"
   done
   printf ']'
 }
@@ -172,7 +213,10 @@ 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="/style.css" ]
 ] [body
@@ -190,12 +234,18 @@ printf 'Content-Type: text/html;charset=utf-8\r\n\r\n'
   [form method=POST action="?a=multitag"'
     list_items \
     | list_paginate
+    [ -d "$_DATA/$ITEM/.index" ] && { printf '
+    [div #editing'
+      w_tagging
     printf '
-    [div #editing
-      [a href="#multitag" Add Tags]'
-      w_index || w_tagging
-      printf '
-    ]
-  ]
+    ]'; }
+  printf '
+  ]'
+  [ ! -d "$_DATA/$ITEM/.index" ] && { printf '
+  [div #editing'
+    w_index
+  printf '
+  ]'; }
+  printf '
 ] ]
 '; } | "$_EXEC/cgilite/html-sh.sed"