SabreTools/SabreTools.RedumpLib
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.RedumpLib.git synced 2026-07-09 02:26:38 +00:00
Code Issues 14 Packages Projects Releases 21 Wiki Activity

Make info constants default

Browse Source
This commit is contained in:
Matt Nadareski
2026-06-21 22:42:04 -04:00
parent 0c78886e03
commit 7e6398db1a
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RedumpTool/Features/QueryFeature.cs
View File

@@ -95,7 +95,7 @@ namespace RedumpTool.Features
}
else
{
discSubpaths = SabreTools.RedumpLib.RedumpInfo.Constants.AllDiscSubpaths;
discSubpaths = SabreTools.RedumpLib.Data.Constants.AllDiscSubpaths;
}
// Output directory validation

2
RedumpTool/Features/SiteFeature.cs
View File

@@ -168,7 +168,7 @@ namespace RedumpTool.Features
}
else
{
discSubpaths = SabreTools.RedumpLib.RedumpInfo.Constants.AllDiscSubpaths;
discSubpaths = SabreTools.RedumpLib.Data.Constants.AllDiscSubpaths;
}
// Override individual flags if shorthand flags used

2
RedumpTool/Features/UserFeature.cs
View File

@@ -95,7 +95,7 @@ namespace RedumpTool.Features
}
else
{
discSubpaths = SabreTools.RedumpLib.RedumpInfo.Constants.AllDiscSubpaths;
discSubpaths = SabreTools.RedumpLib.Data.Constants.AllDiscSubpaths;
}
// Output directory validation

30
SabreTools.RedumpLib/Builder.cs
View File

@@ -264,7 +264,7 @@ namespace SabreTools.RedumpLib
return false;
// Title, Disc Number/Letter, Disc Title
var match = RedumpInfo.Constants.TitleRegex.Match(discData);
var match = Constants.TitleRegex.Match(discData);
if (match.Success)
{
string? title = WebUtility.HtmlDecode(match.Groups[1].Value);
@@ -278,7 +278,7 @@ namespace SabreTools.RedumpLib
#else
info.CommonDiscInfo!.Title = title.Substring(0, firstParenLocation);
#endif
var submatches = RedumpInfo.Constants.DiscNumberLetterRegex.Matches(title);
var submatches = Constants.DiscNumberLetterRegex.Matches(title);
foreach (Match? submatch in submatches)
{
if (submatch is null)
@@ -311,12 +311,12 @@ namespace SabreTools.RedumpLib
}
// Foreign Title
match = RedumpInfo.Constants.ForeignTitleRegex.Match(discData);
match = Constants.ForeignTitleRegex.Match(discData);
if (match.Success)
info.CommonDiscInfo!.ForeignTitleNonLatin = WebUtility.HtmlDecode(match.Groups[1].Value);
// Category
match = RedumpInfo.Constants.CategoryRegex.Match(discData);
match = Constants.CategoryRegex.Match(discData);
if (match.Success)
info.CommonDiscInfo!.Category = match.Groups[1].Value.ToDiscCategory();
else
@@ -325,13 +325,13 @@ namespace SabreTools.RedumpLib
// Region
if (info.CommonDiscInfo.Region is null)
{
match = RedumpInfo.Constants.RegionRegex.Match(discData);
match = Constants.RegionRegex.Match(discData);
if (match.Success)
info.CommonDiscInfo.Region = match.Groups[1].Value.ToRegion();
}
// Languages
var matches = RedumpInfo.Constants.LanguagesRegex.Matches(discData);
var matches = Constants.LanguagesRegex.Matches(discData);
if (matches.Count > 0)
{
var tempLanguages = new List<Language?>();
@@ -352,7 +352,7 @@ namespace SabreTools.RedumpLib
if (includeAllData)
{
// TODO: Re-enable if there's a way of verifying against a disc
//match = RedumpInfo.Constants.SerialRegex.Match(discData);
//match = Data.Constants.SerialRegex.Match(discData);
//if (match.Success)
// info.CommonDiscInfo.Serial = $"(VERIFY THIS) {WebUtility.HtmlDecode(match.Groups[1].Value)}";
}
@@ -360,7 +360,7 @@ namespace SabreTools.RedumpLib
// Error count
if (string.IsNullOrEmpty(info.CommonDiscInfo.ErrorsCount))
{
match = RedumpInfo.Constants.ErrorCountRegex.Match(discData);
match = Constants.ErrorCountRegex.Match(discData);
if (match.Success)
info.CommonDiscInfo.ErrorsCount = match.Groups[1].Value;
}
@@ -368,13 +368,13 @@ namespace SabreTools.RedumpLib
// Version
if (info.VersionAndEditions!.Version is null)
{
match = RedumpInfo.Constants.VersionRegex.Match(discData);
match = Constants.VersionRegex.Match(discData);
if (match.Success)
info.VersionAndEditions.Version = $"(VERIFY THIS) {WebUtility.HtmlDecode(match.Groups[1].Value)}";
}
// Dumpers
matches = RedumpInfo.Constants.DumpersRegex.Matches(discData);
matches = Constants.DumpersRegex.Matches(discData);
if (matches.Count > 0)
{
// Start with any currently listed dumpers
@@ -402,7 +402,7 @@ namespace SabreTools.RedumpLib
if (string.IsNullOrEmpty(info.Extras!.DiscKey))
{
// Validate key is not NULL
match = RedumpInfo.Constants.PS3DiscKey.Match(discData);
match = Constants.PS3DiscKey.Match(discData);
if (match.Success && match.Groups[1].Value != "<span class=\"null\">NULL</span>")
info.Extras.DiscKey = match.Groups[1].Value;
}
@@ -412,7 +412,7 @@ namespace SabreTools.RedumpLib
// Comments
if (includeAllData)
{
match = RedumpInfo.Constants.CommentsRegex.Match(discData);
match = Constants.CommentsRegex.Match(discData);
if (match.Success)
{
// Process the old comments block
@@ -509,7 +509,7 @@ namespace SabreTools.RedumpLib
// Contents
if (includeAllData)
{
match = RedumpInfo.Constants.ContentsRegex.Match(discData);
match = Constants.ContentsRegex.Match(discData);
if (match.Success)
{
// Process the old contents block
@@ -595,7 +595,7 @@ namespace SabreTools.RedumpLib
}
// Added
match = RedumpInfo.Constants.AddedRegex.Match(discData);
match = Constants.AddedRegex.Match(discData);
if (match.Success)
{
if (DateTime.TryParse(match.Groups[1].Value, out DateTime added))
@@ -605,7 +605,7 @@ namespace SabreTools.RedumpLib
}
// Last Modified
match = RedumpInfo.Constants.LastModifiedRegex.Match(discData);
match = Constants.LastModifiedRegex.Match(discData);
if (match.Success)
{
if (DateTime.TryParse(match.Groups[1].Value, out DateTime lastModified))

3
SabreTools.RedumpLib/RedumpInfo/Constants.cs → SabreTools.RedumpLib/Data/Constants.cs
View File

@@ -1,7 +1,6 @@
using System.Text.RegularExpressions;
using SabreTools.RedumpLib.Data;
namespace SabreTools.RedumpLib.RedumpInfo
namespace SabreTools.RedumpLib.Data
{
public static class Constants
{