diff --git a/CHANGELIST.md b/CHANGELIST.md index 3a0c6ff0..c7af33e4 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -40,6 +40,7 @@ - Allow default system if skipping system detection enabled - Add internal support for all Redump site codes - Use the Volume Label special site code +- Capture newlines in Redump fields ### 2.1 (2021-07-22) - Enum, no more diff --git a/RedumpLib/Data/Constants.cs b/RedumpLib/Data/Constants.cs index 75afae0b..be76e168 100644 --- a/RedumpLib/Data/Constants.cs +++ b/RedumpLib/Data/Constants.cs @@ -25,7 +25,7 @@ namespace RedumpLib.Data + "(?.*?)(?.*?)(?.*?)" + "(?.*?)(?.*?)(?.*?)" + "(?.*?)(?.*?)(?.*?)" - + "(?.*?)(?.*?)(?.*?)"); + + "(?.*?)(?.*?)(?.*?)", RegexOptions.Singleline); /// /// Regex matching the category field on a disc page @@ -35,12 +35,12 @@ namespace RedumpLib.Data /// /// Regex matching the comments field on a disc page /// - public static Regex CommentsRegex = new Regex(@"Comments(.*?)"); + public static Regex CommentsRegex = new Regex(@"Comments(.*?)", RegexOptions.Singleline); /// /// Regex matching the contents field on a disc page /// - public static Regex ContentsRegex = new Regex(@"Contents(.*?)"); + public static Regex ContentsRegex = new Regex(@"Contents(.*?)", RegexOptions.Singleline); /// /// Regex matching individual disc links on a results page @@ -110,7 +110,7 @@ namespace RedumpLib.Data + @"Creation(?.*?)(?.*?)(?.*?)(?.*?)" + @"Modification(?.*?)(?.*?)(?.*?)(?.*?)" + @"Expiration(?.*?)(?.*?)(?.*?)(?.*?)" - + @"Effective(?.*?)(?.*?)(?.*?)(?.*?)"); + + @"Effective(?.*?)(?.*?)(?.*?)(?.*?)", RegexOptions.Singleline); /// /// Regex matching the region field on a disc page @@ -120,12 +120,12 @@ namespace RedumpLib.Data /// /// Regex matching a double-layer disc ringcode information /// - public static Regex RingCodeDoubleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould + public static Regex RingCodeDoubleRegex = new Regex(@"", RegexOptions.Singleline); // Varies based on available fields, like Addtional Mould /// /// Regex matching a single-layer disc ringcode information /// - public static Regex RingCodeSingleRegex = new Regex(@""); // Varies based on available fields, like Addtional Mould + public static Regex RingCodeSingleRegex = new Regex(@"", RegexOptions.Singleline); // Varies based on available fields, like Addtional Mould /// /// Regex matching the serial field on a disc page @@ -150,7 +150,7 @@ namespace RedumpLib.Data /// /// Regex matching a single track on a disc page /// - public static Regex TrackRegex = new Regex(@"(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)"); + public static Regex TrackRegex = new Regex(@"(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)(?.*?)", RegexOptions.Singleline); /// /// Regex matching the track count on a disc page