X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=db_meta.sh;h=9dfbe4c2460a422a23ac1a956a1d0839b4ce3579;hb=58aea282f6a4d479558213e8be76b98dcde8ec4a;hp=e3a5c5fc797b3cb7194c3c47420b6a4fb95d6240;hpb=27e8bd4613796f32768e7cdc7b70cf19ca067174;p=serve0

diff --git a/db_meta.sh b/db_meta.sh
index e3a5c5f..9dfbe4c 100755
--- a/db_meta.sh
+++ b/db_meta.sh
@@ -166,25 +166,41 @@ list_meta(){
 
 dbmeta_autogroup(){
   sed -E '
+    h;  # save original dataset
+
+    # strip common suffixes of web video sites
+    s;-([0-9a-zA-Z_-]{11}|ph[0-9a-f]{13}|xh[0-9a-zA-Z]{5}|[0-9]{6,})\r;-\r;;
+
+    # clear branching status
+    tBRANCH; :BRANCH
+
     # perform auto grouping if group id is missing or empty
     /\r$/bAUTOGROUP; s;\r	\\$;\r;; tAUTOGROUP;
   
-    # skip auto grouping if manual group id is present
-    /\r	.+$/b;
+    # only perform ordering if manual group id is present
+    /\r	.+$/bAUTOORDER;
+
+    b;
+
+    :AUTOORDER
+    # strip all fields but the name
+    s;^([^\t]+	[^\t]+	[^\t]+	[^\t]+	[^\t]+	)([^\r]+)\r	(.+)$;\2;
+
+    # reduce to numerals
+    s;[^0-9]+;;g;
+
+    # append ordering field to dataset
+    H; g; s;\n;\t;;
+    b;
   
     :AUTOGROUP
-    # save original dataset
-    h;
-  
     # strip all fields but the name
     s;^[^\t]+	[^\t]+	[^\t]+	[^\t]+	[^\t]+	;;
-    # strip common suffixes of web video sites
-    s;-([0-9a-zA-Z_-]{11}|ph[0-9a-f]{13}|[0-9]{6,})\r$;-\r;;
   
     # replace all numeric parts and append numerals to an ordering field
     # the group id will be made up of only the non-numeric character frame
     # the ordering field will hold all numbers from the name
-    :X s;^([^\r0-9]*)([0-9]+)([^\r0-9]*)\r\t?([0-9]*)$;\1\r\3\r	\4\2;; tX;
+    :X s;^([^0-9]*)([0-9]+)([^\r]*)\r\t?([0-9]*)$;\1\r\3\r	\4\2;; tX;
   
     # append group id and ordering field to dataset
     H; g; s;\n;\t;;