diff --git a/DiscImageChef.DiscImages/CDRDAO.cs b/DiscImageChef.DiscImages/CDRDAO.cs index 7501f8cd8..597340d72 100644 --- a/DiscImageChef.DiscImages/CDRDAO.cs +++ b/DiscImageChef.DiscImages/CDRDAO.cs @@ -76,7 +76,7 @@ namespace DiscImageChef.DiscImages @"^\s*DATAFILE\s*""(?.+)""\s*(#(?\d+))?\s*(?[\d]+:[\d]+:[\d]+)?"; const string REGEX_INDEX = @"^\s*INDEX\s*(?
\d+:\d+:\d+)"; const string REGEX_ISRC = @"^\s*ISRC\s*""(?[A-Z0-9]{5,5}[0-9]{7,7})"""; - const string REGEX_MCN = @"^\s*CATALOG\s*""(?[\d]{13,13})"""; + const string REGEX_MCN = @"^\s*CATALOG\s*""(?[\x21-\x7F]{13,13})"""; const string REGEX_PREGAP = @"^\s*START\s*(?
\d+:\d+:\d+)?"; const string REGEX_STEREO = @"^\s*(?(TWO|FOUR))_CHANNEL_AUDIO"; const string REGEX_TRACK = diff --git a/DiscImageChef.DiscImages/CDRWin.cs b/DiscImageChef.DiscImages/CDRWin.cs index 7d2d0ea20..bb32c7862 100644 --- a/DiscImageChef.DiscImages/CDRWin.cs +++ b/DiscImageChef.DiscImages/CDRWin.cs @@ -156,7 +156,7 @@ namespace DiscImageChef.DiscImages const string REGEX_BARCODE = @"\bUPC_EAN\s+(?[\d]{12,13})$"; const string REGEX_COMMENT = @"\bREM\s+(?.+)$"; const string REGEX_CDTEXT = @"\bCDTEXTFILE\s+(?.+)$"; - const string REGEX_MCN = @"\bCATALOG\s+(?\d{13})$"; + const string REGEX_MCN = @"^\s*CATALOG\s*(?[\x21-\x7F]{13})$"; const string REGEX_TITLE = @"\bTITLE\s+(?.+)$"; const string REGEX_GENRE = @"\bGENRE\s+(?<genre>.+)$"; const string REGEX_ARRANGER = @"\bARRANGER\s+(?<arranger>.+)$"; diff --git a/DiscImageChef.DiscImages/CloneCD.cs b/DiscImageChef.DiscImages/CloneCD.cs index 4c186c83e..eb15012bb 100644 --- a/DiscImageChef.DiscImages/CloneCD.cs +++ b/DiscImageChef.DiscImages/CloneCD.cs @@ -59,7 +59,7 @@ namespace DiscImageChef.DiscImages const string DISC_SESSIONS = @"^\s*Sessions\s*=\s*(?<value>\d+)"; const string DISC_SCRAMBLED = @"^\s*DataTracksScrambled\s*=\s*(?<value>\d+)"; const string CDTEXT_LENGTH = @"^\s*CDTextLength\s*=\s*(?<value>\d+)"; - const string DISC_CATALOG = @"^\s*CATALOG\s*=\s*(?<value>\w+)"; + const string DISC_CATALOG = @"^\s*CATALOG\s*=\s*(?<value>[\x21-\x7F]{13})"; const string SESSION_PREGAP = @"^\s*PreGapMode\s*=\s*(?<value>\d+)"; const string SESSION_SUBCHANNEL = @"^\s*PreGapSubC\s*=\s*(?<value>\d+)"; const string ENTRY_SESSION = @"^\s*Session\s*=\s*(?<value>\d+)";