X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=list.sh;h=58eb0628b99378367f230bcaf82e4797917b604d;hb=7db7dc21eaa620d93ab65b41ae5aa336cb501db5;hp=cdb99e006a588412c4866ed4d1eaa7682acf445b;hpb=b9192aa3f4cb8f563cdf233f81176e00d4a0e6fb;p=serve0

diff --git a/list.sh b/list.sh
index cdb99e0..58eb062 100644
--- a/list.sh
+++ b/list.sh
@@ -87,34 +87,23 @@ 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 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= _'; } \
+    sed -E '
+      :X
+      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^ 0-9]*)(-[0-9a-zA-Z_-]{11}\r|-ph[0-9a-f]{13}\r|-[0-9]{8}\r|[0-9]+\+?)(.*)$;\1\r\3 \2;;
+      tX;' \
+    | { sort -n -k7 |sort -s -k6,6; echo '0 0 0 tags= comment= _'; } \
     | while read -r length h w t c name; do
-      if groupmatch "$ln" "$name"; then
+      if [ "${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
+	printf '%s\n' "$buffer" |while read -r l; do
           [ "$l" ] && printf '%s	%s\n' "$al" "$l"
         done
         al="$length"
@@ -122,7 +111,8 @@ list_order(){
       fi
       ln="$name"
     done \
-    | sort -sn -k1 |sed -r 's;^[0-9]+\t;metashort\t;;'
+    | sort -s -n -k1 |sed -r 's;^[0-9]+\t;metashort\t;;' \
+    | sed -E ':X s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\r]*)\r([^ ]*) ([^ ]+)( .*)?$;\1\3\2\4;; tX'
   elif [ $ORDER = Length ]; then
     sort -sn -k1 |sed 's;^;metashort\t;;'
   elif [ $ORDER = Date ]; then
@@ -161,7 +151,7 @@ list_filemeta(){
 
 list_items() {
   local mode meta
-  mode="$(COOKIE mode |grep -m1 -axE 'index|browse' || printf browse )"
+  mode="$(COOKIE mode |grep -m1 -axE 'index|browse' || printf index )"
   
   if [ "$mode" = browse ]; then
     [ "$ITEM" ] && printf 'dir\t..\n'