SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Better deal with volume labels (#780)

Browse Source 
* Better deal with volume labels

* Add missing using

* use nullable string

* Deal with review comments

* Fix issues

* Better deal with Xbox/Xbox360 labels

* Use FirstOrDefault

* Add todo
This commit is contained in:
Deterous
2024-12-15 09:58:09 +09:00
committed by GitHub
parent 55696f1f47
commit eaa77dbeed
4 changed files with 77 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELIST.md
View File

@@ -72,6 +72,7 @@
- Simplify prefix filtering
- Fix issue with odd quoting
- Add DumpingParameters for DIC and Redumper
- Better deal with volume labels
### 3.2.4 (2024-11-24)

25
MPF.Frontend/Tools/FrontendTool.cs
View File

@@ -59,15 +59,26 @@ namespace MPF.Frontend.Tools
return RedumpSystem.MicrosoftXbox;
// Microsoft Xbox 360
if (volumeLabel.Equals("XBOX360", StringComparison.OrdinalIgnoreCase))
if (volumeLabel.Equals("XBOX360"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("XGD2DVD_NTSC", StringComparison.OrdinalIgnoreCase))
else if (volumeLabel.Equals("XGD2DVD_NTSC"))
return RedumpSystem.MicrosoftXbox360;
// Microsoft Xbox 360 - Too overly broad even if a lot of discs use this
//if (volumeLabel.Equals("CD_ROM", StringComparison.OrdinalIgnoreCase))
// return RedumpSystem.MicrosoftXbox360; // Also for Xbox One?
//if (volumeLabel.Equals("DVD_ROM", StringComparison.OrdinalIgnoreCase))
else if (volumeLabel.Equals("XBOX_TINYTEST"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("13599"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("14719"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("15574"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("16197"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("16197"))
return RedumpSystem.MicrosoftXbox360;
else if (volumeLabel.Equals("17349"))
return RedumpSystem.MicrosoftXbox360;
// DVD_ROM and CD_ROM have too many false positives
//else if (volumeLabel.Equals("DVD_ROM"))
// return RedumpSystem.MicrosoftXbox360;
// Sega Mega-CD / Sega-CD

58
MPF.Frontend/Tools/SubmissionGenerator.cs
View File

@@ -4,6 +4,7 @@ using System.IO;
#if NET35_OR_GREATER || NETCOREAPP
using System.Linq;
#endif
using System.Text;
using System.Threading.Tasks;
using BinaryObjectScanner;
using MPF.Processors;
@@ -396,6 +397,30 @@ namespace MPF.Frontend.Tools
return internalProgram.LongName();
}
/// <summary>
/// Simplifies a volume label into uppercase alphanumeric only string
/// </summary>
/// <param name="labels">Volume label to simplify</param>
/// <returns>Simplified volume label</returns>
private static string? SimplifyVolumeLabel(string? label)
{
if (label == null || label.Length == 0)
return null;
var labelBuilder = new StringBuilder();
foreach (char c in label)
{
if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'))
labelBuilder.Append(char.ToUpper(c));
}
string? simpleLabel = labelBuilder.ToString();
if (simpleLabel == null || simpleLabel.Length == 0)
return null;
else
return simpleLabel;
}
/// <summary>
/// Formats a list of volume labels and their corresponding filesystems
/// </summary>
@@ -403,6 +428,10 @@ namespace MPF.Frontend.Tools
/// <returns>Formatted string of volume labels and their filesystems</returns>
private static string? FormatVolumeLabels(string? driveLabel, Dictionary<string, List<string>>? labels)
{
// Treat empty label as null
if (driveLabel != null && driveLabel.Length == 0)
driveLabel = null;
// Must have at least one label to format
if (driveLabel == null && (labels == null || labels.Count == 0))
return null;
@@ -417,7 +446,32 @@ namespace MPF.Frontend.Tools
return driveLabel;
}
// If only one label, don't mention fs
// Get the default label to compare against
// TODO: Full pairwise comparison of all labels, not just comparing against drive/UDF label.
string? defaultLabel = null;
if (driveLabel != null && driveLabel.Length != 0)
defaultLabel = SimplifyVolumeLabel(driveLabel);
#if NET35_OR_GREATER || NETCOREAPP
else
defaultLabel = labels.Where(label => label.Value.Contains("UDF")).Select(label => label.Key).FirstOrDefault();
#endif
// Remove duplicate/useless volume labels
if (defaultLabel != null && defaultLabel.Length != 0)
{
List<string> keysToRemove = new List<string>();
foreach (KeyValuePair<string, List<string>> label in labels)
{
string? tempLabel = SimplifyVolumeLabel(label.Key);
// Remove duplicate volume labels and remove "DVD_ROM" / "CD_ROM" labels
if (defaultLabel == tempLabel || label.Key == "DVD_ROM" || label.Key == "CD_ROM")
keysToRemove.Add(label.Key);
}
foreach (string key in keysToRemove)
labels.Remove(key);
}
// If only one unique label left, don't mention fs
#if NET20
string[] keyArr = new string[labels.Count];
labels.Keys.CopyTo(keyArr, 0);
@@ -450,7 +504,7 @@ namespace MPF.Frontend.Tools
}
// Ensure that no labels are empty
volLabels = volLabels.FindAll(l => !string.IsNullOrEmpty(l?.Trim()));
volLabels = volLabels.FindAll(label => !string.IsNullOrEmpty(label?.Trim()));
// Print each label separated by a comma and a space
if (volLabels.Count == 0)

4
MPF.Processors/DiscImageCreator.cs
View File

@@ -1963,8 +1963,8 @@ namespace MPF.Processors
if (Convert.ToUInt32(label[0]) == 0x7F || Convert.ToUInt32(label[0]) < 0x20)
label = label.Substring(1);
// Skip if label is blank
if (label == null || label.Length <= 0)
// Skip if label is blank, and skip Joliet (DIC Joliet parsing is broken?)
if (label == null || label.Length <= 0 || volType == "Joliet")
{
volType = "UNKNOWN";
line = sr.ReadLine();