[Mediaportal-svn] r21224 - trunk/mediaportal/Core/Util

[<mis...@de...>]

Author: misterd_sf
Date: 2008-12-29 21:29:53 +0000 (Mon, 29 Dec 2008)
New Revision: 21224

Modified:
   trunk/mediaportal/Core/Util/Util.cs
Log:
Added sf.net patch #1985729 . thanks WhiteDog 

Modified: trunk/mediaportal/Core/Util/Util.cs
===================================================================
--- trunk/mediaportal/Core/Util/Util.cs	2008-12-29 15:23:13 UTC (rev 21223)
+++ trunk/mediaportal/Core/Util/Util.cs	2008-12-29 21:29:53 UTC (rev 21224)
@@ -959,7 +959,7 @@
         // 2nd pattern matches ?cd?## and ?disc?## for example -cd2 which is cd 2.
         //     ? is -_ or space (second ? is optional), ## is 1 or 2 digits
         string[] pattern = {"\\[[0-9]{1,2}-[0-9]{1,2}\\]",
-														 "[-_ ](CD|cd|DISC|disc|part|Part|DVD)[-_ ]{0,1}[0-9]{1,2}"};
+														 "[-_ ]\\({0,1}(CD|cd|DISC|disc|part|Part|DVD)[-_ ]{0,1}[0-9]{1,2}\\){0,1}"};
 
         // Strip the extensions and make everything lowercase
         string strFileName1 = System.IO.Path.GetFileNameWithoutExtension(strFile1).ToLower();
@@ -995,7 +995,7 @@
 
       if (strFileName == null) return;
       string[] pattern = {"\\[[0-9]{1,2}-[0-9]{1,2}\\]",
-													 "[-_ ](CD|cd|DISC|disc|part|Part|DVD)[-_ ]{0,1}[0-9]{1,2}"};
+													 "[-_ ]\\({0,1}(CD|cd|DISC|disc|part|Part|DVD)[-_ ]{0,1}[0-9]{1,2}\\){0,1}"};
       for (int i = 0; i < pattern.Length; i++)
       {
         // See if we can find the special patterns in both filenames
@@ -2881,4 +2881,4 @@
     }
 
   }
-}
\ No newline at end of file
+}