claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken GetKeyDB and related

Browse Source
This commit is contained in:
Matt Nadareski
2025-01-14 14:22:18 -05:00
parent 688e7772e4
commit 222944fae6
13 changed files with 51 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SabreTools.DatItems/DatItem.cs
View File

@@ -447,15 +447,19 @@ namespace SabreTools.DatItems
/// Get the dictionary key that should be used for a given item and bucketing type
/// </summary>
/// <param name="bucketedBy">ItemKey value representing what key to get</param>
/// <param name="machine">Machine associated with the item for renaming</param>
/// <param name="source">Source associated with the item for renaming</param>
/// <param name="lower">True if the key should be lowercased (default), false otherwise</param>
/// <param name="norename">True if games should only be compared on game and file name, false if system and source are counted</param>
/// <returns>String representing the key to be used for the DatItem</returns>
public virtual string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
public virtual string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
{
// Set the output key as the default blank string
string key = string.Empty;
string sourceKeyPadded = source?.Index.ToString().PadLeft(10, '0') + '-';
string machineName = machine?.GetStringFieldValue(Models.Metadata.Machine.NameKey) ?? "Default";
// Now determine what the key should be based on the bucketedBy value
switch (bucketedBy)
{
@@ -464,21 +468,7 @@ namespace SabreTools.DatItems
break;
case ItemKey.Machine:
string sourceString = string.Empty;
if (!norename && source != null)
sourceString = source.Index.ToString().PadLeft(10, '0') + "-";
// TODO: This will never have a value for DB
string machineString = "Default";
var machine = GetFieldValue<Machine>(DatItem.MachineKey);
if (machine != null)
{
var machineName = machine.GetStringFieldValue(Models.Metadata.Machine.NameKey);
if (!string.IsNullOrEmpty(machineName))
machineString = machineName!;
}
key = $"{sourceString}{machineString}";
key = (norename ? string.Empty : sourceKeyPadded) + machineName;
break;
case ItemKey.MD2:

4
SabreTools.DatItems/Formats/Disk.cs
View File

@@ -175,7 +175,7 @@ namespace SabreTools.DatItems.Formats
}
/// <inheritdoc/>
public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
{
// Set the output key as the default blank string
string? key;
@@ -193,7 +193,7 @@ namespace SabreTools.DatItems.Formats
// Let the base handle generic stuff
default:
return base.GetKeyDB(bucketedBy, source, lower, norename);
return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
}
// Double and triple check the key for corner cases

4
SabreTools.DatItems/Formats/File.cs
View File

@@ -334,7 +334,7 @@ namespace SabreTools.DatItems.Formats
}
/// <inheritdoc/>
public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
{
// Set the output key as the default blank string
string? key;
@@ -360,7 +360,7 @@ namespace SabreTools.DatItems.Formats
// Let the base handle generic stuff
default:
return base.GetKeyDB(bucketedBy, source, lower, norename);
return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
}
// Double and triple check the key for corner cases

4
SabreTools.DatItems/Formats/Media.cs
View File

@@ -127,7 +127,7 @@ namespace SabreTools.DatItems.Formats
}
/// <inheritdoc/>
public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
{
// Set the output key as the default blank string
string? key;
@@ -153,7 +153,7 @@ namespace SabreTools.DatItems.Formats
// Let the base handle generic stuff
default:
return base.GetKeyDB(bucketedBy, source, lower, norename);
return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
}
// Double and triple check the key for corner cases

4
SabreTools.DatItems/Formats/Rom.cs
View File

@@ -218,7 +218,7 @@ namespace SabreTools.DatItems.Formats
}
/// <inheritdoc/>
public override string GetKeyDB(ItemKey bucketedBy, Source? source, bool lower = true, bool norename = true)
public override string GetKeyDB(ItemKey bucketedBy, Machine? machine, Source? source, bool lower = true, bool norename = true)
{
// Set the output key as the default blank string
string? key;
@@ -264,7 +264,7 @@ namespace SabreTools.DatItems.Formats
// Let the base handle generic stuff
default:
return base.GetKeyDB(bucketedBy, source, lower, norename);
return base.GetKeyDB(bucketedBy, machine, source, lower, norename);
}
// Double and triple check the key for corner cases