cope with "NN - " as well as "NN" in track names

diff --git a/debian/changelog b/debian/changelog
index d30aefb70d3b9b6e577c7654af833a73089cfecd..17aae3bfab15759f835f85085456c2f1b2036d78 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+disorder (1.5.99+dev3) unstable; urgency=low
+
+  * New version for newer Disobedience
+
+ -- Richard Kettlewell <rjk@greenend.org.uk>  Mon,  1 Oct 2007 18:29:43 +0100
+

 disorder (1.5.99+dev2) unstable; urgency=low
 
   * Install images for use by Disobedience
 disorder (1.5.99+dev2) unstable; urgency=low
 
   * Install images for use by Disobedience

diff --git a/lib/configuration.c b/lib/configuration.c
index 486a2ab817690ab016eff605b1d380494ceb49b5..ae71d6321c32943e28e680f25f79effd839bf319 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -1012,7 +1012,7 @@ static void config_postdefaults(struct config *c) {
   int n;
 
   static const char *namepart[][4] = {
   int n;
 
   static const char *namepart[][4] = {

-    { "title",  "/([0-9]+:)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },
+    { "title",  "/([0-9]+ *[-:] *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display" },

     { "title",  "/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort" },
     { "album",  "/([^/]+)/[^/]+$",                    "$1", "*" },
     { "artist", "/([^/]+)/[^/]+/[^/]+$",              "$1", "*" },
     { "title",  "/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort" },
     { "album",  "/([^/]+)/[^/]+$",                    "$1", "*" },
     { "artist", "/([^/]+)/[^/]+/[^/]+$",              "$1", "*" },


@@ -1021,7 +1021,7 @@ static void config_postdefaults(struct config *c) {
 #define NNAMEPART (int)(sizeof namepart / sizeof *namepart)
 
   static const char *transform[][5] = {
 #define NNAMEPART (int)(sizeof namepart / sizeof *namepart)
 
   static const char *transform[][5] = {

-    { "track", "^.*/([0-9]+:)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display", "" },
+    { "track", "^.*/([0-9]+ *[-:] *)?([^/]+)\\.[a-zA-Z0-9]+$", "$2", "display", "" },

     { "track", "^.*/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort", "" },
     { "dir",   "^.*/([^/]+)$",                          "$1", "*", "" },
     { "dir",   "^(the) ([^/]*)",                        "$2, $1", "sort", "i", },
     { "track", "^.*/([^/]+)\\.[a-zA-Z0-9]+$",           "$1", "sort", "" },
     { "dir",   "^.*/([^/]+)$",                          "$1", "*", "" },
     { "dir",   "^(the) ([^/]*)",                        "$2, $1", "sort", "i", },