X-Git-Url: http://git.plutz.net/?p=serve0;a=blobdiff_plain;f=list.sh;h=08cef51f1cf36ff9365347774d03ab378c6050eb;hp=98305c94f1f6a2a0e8cf2d71f6e3b58b5d6d0c6a;hb=d1e7e3c7931410f6705f7f89f03c580380a354f1;hpb=b0cfee07ebebf399963569086924b13fe0a8a335

diff --git a/list.sh b/list.sh
index 98305c9..08cef51 100644
--- a/list.sh
+++ b/list.sh
@@ -37,7 +37,7 @@ list_item() {
       "$width" "$height" \
       "$(printf '%s\n' "${tags#tags=}" \
          | sed -r "$UNSTRING"' s;^;,;; s;,+;,;g; s;,$;;;
-                   :X s;,([^,]+)(,|$); [span .tag\n \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
@@ -87,13 +87,44 @@ list_filter(){
   fi
 }
 
+groupmatch(){
+  if [ ${#1} -gt ${#2} ]; then
+    long="$1" short="$2"
+  else
+    long="$2" short="$1"
+  fi
+  com="$(expr substr "$long" 1 $((${#long} * 3 / 4)))"
+  cut="${short#$com}"
+  if [ ${#cut} -lt ${#short} ]; 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 +132,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
 }