aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Solve CDRDAO, CDRWin and CloneCD when disc catalog number uses whole ASCII and not only numeric digits.

Browse Source
This commit is contained in:
Natalia Portillo
2018-06-23 18:18:58 +01:00
parent a07e6f493a
commit c7bb65090f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.DiscImages/CDRDAO.cs
View File

@@ -76,7 +76,7 @@ namespace DiscImageChef.DiscImages
@"^\s*DATAFILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*(?<length>[\d]+:[\d]+:[\d]+)?"; @"^\s*DATAFILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*(?<length>[\d]+:[\d]+:[\d]+)?";
const string REGEX_INDEX = @"^\s*INDEX\s*(?<address>\d+:\d+:\d+)"; const string REGEX_INDEX = @"^\s*INDEX\s*(?<address>\d+:\d+:\d+)";
const string REGEX_ISRC = @"^\s*ISRC\s*""(?<isrc>[A-Z0-9]{5,5}[0-9]{7,7})"""; const string REGEX_ISRC = @"^\s*ISRC\s*""(?<isrc>[A-Z0-9]{5,5}[0-9]{7,7})""";
const string REGEX_MCN = @"^\s*CATALOG\s*""(?<catalog>[\d]{13,13})"""; const string REGEX_MCN = @"^\s*CATALOG\s*""(?<catalog>[\x21-\x7F]{13,13})""";
const string REGEX_PREGAP = @"^\s*START\s*(?<address>\d+:\d+:\d+)?"; const string REGEX_PREGAP = @"^\s*START\s*(?<address>\d+:\d+:\d+)?";
const string REGEX_STEREO = @"^\s*(?<num>(TWO|FOUR))_CHANNEL_AUDIO"; const string REGEX_STEREO = @"^\s*(?<num>(TWO|FOUR))_CHANNEL_AUDIO";
const string REGEX_TRACK = const string REGEX_TRACK =

2
DiscImageChef.DiscImages/CDRWin.cs
View File

@@ -156,7 +156,7 @@ namespace DiscImageChef.DiscImages
const string REGEX_BARCODE = @"\bUPC_EAN\s+(?<barcode>[\d]{12,13})$"; const string REGEX_BARCODE = @"\bUPC_EAN\s+(?<barcode>[\d]{12,13})$";
const string REGEX_COMMENT = @"\bREM\s+(?<comment>.+)$"; const string REGEX_COMMENT = @"\bREM\s+(?<comment>.+)$";
const string REGEX_CDTEXT = @"\bCDTEXTFILE\s+(?<filename>.+)$"; const string REGEX_CDTEXT = @"\bCDTEXTFILE\s+(?<filename>.+)$";
const string REGEX_MCN = @"\bCATALOG\s+(?<catalog>\d{13})$"; const string REGEX_MCN = @"^\s*CATALOG\s*(?<catalog>[\x21-\x7F]{13})$";
const string REGEX_TITLE = @"\bTITLE\s+(?<title>.+)$"; const string REGEX_TITLE = @"\bTITLE\s+(?<title>.+)$";
const string REGEX_GENRE = @"\bGENRE\s+(?<genre>.+)$"; const string REGEX_GENRE = @"\bGENRE\s+(?<genre>.+)$";
const string REGEX_ARRANGER = @"\bARRANGER\s+(?<arranger>.+)$"; const string REGEX_ARRANGER = @"\bARRANGER\s+(?<arranger>.+)$";

2
DiscImageChef.DiscImages/CloneCD.cs
View File

@@ -59,7 +59,7 @@ namespace DiscImageChef.DiscImages
const string DISC_SESSIONS = @"^\s*Sessions\s*=\s*(?<value>\d+)"; const string DISC_SESSIONS = @"^\s*Sessions\s*=\s*(?<value>\d+)";
const string DISC_SCRAMBLED = @"^\s*DataTracksScrambled\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 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_PREGAP = @"^\s*PreGapMode\s*=\s*(?<value>\d+)";
const string SESSION_SUBCHANNEL = @"^\s*PreGapSubC\s*=\s*(?<value>\d+)"; const string SESSION_SUBCHANNEL = @"^\s*PreGapSubC\s*=\s*(?<value>\d+)";
const string ENTRY_SESSION = @"^\s*Session\s*=\s*(?<value>\d+)"; const string ENTRY_SESSION = @"^\s*Session\s*=\s*(?<value>\d+)";