improved group detection by optimising for numbered files

[serve0] / list.sh

diff --git a/list.sh b/list.sh
index 950522f1d302eee5a2b0dc075de4cffa7396d70c..b941aa7f246d32a3a9e5ff09c0ee509e9ebd2b30 100644 (file)
--- a/list.sh
+++ b/list.sh
@@ -93,7 +93,8 @@ groupmatch(){
   else
     long="$2" short="$1"
   fi
-  com="$(expr substr "$long" 1 $((${#long} * 3 / 4)))"
+  # com="$(expr substr "$long" 1 $((${#long} * 3 / 4)))"
+  com="$(expr substr "$long" 1 $((${#long} - 3)))"
   cut="${short#$com}"
   if [ ${#cut} -lt ${#short} ]; then
     return 0
@@ -122,9 +123,9 @@ list_order(){
       fi
       ln="$name"
     done \
-    | sort -n -k1 |cut -f2- |sed 's;^;metashort\t;;'
+    | 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##*      }"
@@ -132,7 +133,7 @@ list_order(){
       printf '%i       %s      %s\n' \
              "$(stat -c %Y "$fn")" "${fm%      *}" "$fn"
     done \
-    | sort -rn -k1 |sed -r 's;^[0-9]+\t;metalong\t;;'
+    | sort -srn -k1 |sed -r 's;^[0-9]+\t;metalong\t;;'
   fi
 }
 
@@ -209,7 +210,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