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

diff --git a/list.sh b/list.sh
index a4bdbc7..8ba460e 100644
--- a/list.sh
+++ b/list.sh
@@ -49,12 +49,12 @@ list_item() {
 [ "$FILTER" ] && list_fex="$(
   fex='p'
   STRING "$FILTER^" \
-  | sed -r 's;\^;\n;g; s;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\&;g' \
+  | sed -E 's;\^;\n;g; s;[]\/\(\)\\\^\$\?\.\+\*\;\[\{\}];\\&;g' \
   | while read -r f; do
-    [ ! "${f#~}" ] && continue
-    [ "${f#~}" = "$f" ] \
+    [ "${f#\~}" ] || continue
+    [ "${f#\~}" = "$f" ] \
     && fex="/(\ttags=([^\t]*,)?)(${f})((,[^\t]*)?\t)/{${fex}}" \
-    || fex="/(\ttags=([^\t]*,)?)(${f#~})((,[^\t]*)?\t)/d; ${fex}"
+    || fex="/(\ttags=([^\t]*,)?)(${f#\~})((,[^\t]*)?\t)/d; ${fex}"
     printf '%s\n' "${fex}"
   done \
   | tail -n1
@@ -71,15 +71,16 @@ list_fullname(){
 
 list_filter(){
   if [ "$FILTER" ]; then
-    sed -nr "$list_fex"
+    printf "FEX: %s\n" "$list_fex" >&2
+    sed -nE "$list_fex"
   elif [ "${SEARCH#!}" != "${SEARCH}" ]; then
     grep -aviEe "$(STRING "${SEARCH}" \
-                 | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                 | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
                             s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
                             s; ;\\+;g;')"
   elif [ "${SEARCH}" ]; then
     grep -aiEe "$(STRING "${SEARCH}" \
-                 | sed -r ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
+                 | sed -E ':x s;((^|[^\\])(\\\\)*)\+;\1 ;g; tx;
                             s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
                             s; ;\\+;g;')"
   else
@@ -87,38 +88,25 @@ 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 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)(.*)$;\1-\r\3 \2\n;;
+      t;
+      s;^([^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^\t]+\t[^ 0-9]*)([0-9]+)(.*)$;\1\r\3 \2;;
+      tX;' \
+    | { sort -n -k7 -k8 -k9 -k10 -k11 |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"
@@ -126,7 +114,8 @@ list_order(){
       fi
       ln="$name"
     done \
-    | sort -sn -k1 |sed -r 's;^[0-9]+\t;metashort\t;;'
+    | sort -s -n -k1,1 |sed -E '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
@@ -136,7 +125,7 @@ list_order(){
       printf '%i	%s	%s\n' \
              "$(stat -c %Y "$fn")" "${fm%	*}" "$fn"
     done \
-    | sort -srn -k1 |sed -r 's;^[0-9]+\t;metalong\t;;'
+    | sort -srn -k1 |sed -E 's;^[0-9]+\t;metalong\t;;'
   fi
 }
 
@@ -165,7 +154,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'