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

[SabreTools, Flags, DatFile, README] Add update description

Browse Source
This commit is contained in:
Matt Nadareski
2018-01-06 22:04:28 -08:00
parent 6961d401a8
commit 99c4c4e5a2
5 changed files with 135 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -1786,9 +1786,6 @@ namespace SabreTools.Library.DatFiles
watch.Stop(); watch.Stop();
// For comparison's sake, we want to use CRC as the base ordering
BucketBy(SortedBy.CRC, DedupeType.Full);
// Now we want to try to replace each item in each input DAT from the base // Now we want to try to replace each item in each input DAT from the base
foreach (string path in inputFileNames) foreach (string path in inputFileNames)
{ {
@@ -1798,104 +1795,140 @@ namespace SabreTools.Library.DatFiles
DatFile intDat = new DatFile(); DatFile intDat = new DatFile();
intDat.Parse(path, 1, 1, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName); intDat.Parse(path, 1, 1, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName);
// For comparison's sake, we want to use CRC as the base ordering // If we are matching based on hashes of any sort
intDat.BucketBy(SortedBy.CRC, DedupeType.None); if ((replaceMode & ReplaceMode.Names) != 0
|| (replaceMode & ReplaceMode.Hashes) != 0)
// Then we do a hashwise comparison against the base DAT
List<string> keys = intDat.Keys;
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
{ {
List<DatItem> datItems = intDat[key]; // For comparison's sake, we want to use CRC as the base ordering
List<DatItem> newDatItems = new List<DatItem>(); BucketBy(SortedBy.CRC, DedupeType.Full);
foreach (DatItem datItem in datItems) intDat.BucketBy(SortedBy.CRC, DedupeType.None);
// Then we do a hashwise comparison against the base DAT
List<string> keys = intDat.Keys;
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
{ {
// If we have something other than a Rom or Disk, then this doesn't do anything List<DatItem> datItems = intDat[key];
if (datItem.Type != ItemType.Disk && datItem.Type != ItemType.Rom) List<DatItem> newDatItems = new List<DatItem>();
foreach (DatItem datItem in datItems)
{ {
newDatItems.Add((DatItem)datItem.Clone()); // If we have something other than a Rom or Disk, then this doesn't do anything
continue; if (datItem.Type != ItemType.Disk && datItem.Type != ItemType.Rom)
}
List<DatItem> dupes = datItem.GetDuplicates(this, sorted: true);
DatItem newDatItem = (DatItem)datItem.Clone();
if (dupes.Count > 0)
{
// If we're updating names, replace using the first found name
if ((replaceMode & ReplaceMode.Names) != 0)
{ {
newDatItem.Name = dupes[0].Name; newDatItems.Add((DatItem)datItem.Clone());
continue;
} }
// If we're updating hashes, only replace if the current item doesn't have them List<DatItem> dupes = datItem.GetDuplicates(this, sorted: true);
if ((replaceMode & ReplaceMode.Hashes) != 0) DatItem newDatItem = (DatItem)datItem.Clone();
if (dupes.Count > 0)
{ {
if (newDatItem.Type == ItemType.Rom) // If we're updating names, replace using the first found name
if ((replaceMode & ReplaceMode.Names) != 0)
{ {
Rom newRomItem = (Rom)newDatItem; newDatItem.Name = dupes[0].Name;
if (String.IsNullOrEmpty(newRomItem.CRC) && !String.IsNullOrEmpty(((Rom)dupes[0]).CRC))
{
newRomItem.CRC = ((Rom)dupes[0]).CRC;
}
if (String.IsNullOrEmpty(newRomItem.MD5) && !String.IsNullOrEmpty(((Rom)dupes[0]).MD5))
{
newRomItem.MD5 = ((Rom)dupes[0]).MD5;
}
if (String.IsNullOrEmpty(newRomItem.SHA1) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA1))
{
newRomItem.SHA1 = ((Rom)dupes[0]).SHA1;
}
if (String.IsNullOrEmpty(newRomItem.SHA256) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA256))
{
newRomItem.SHA256 = ((Rom)dupes[0]).SHA256;
}
if (String.IsNullOrEmpty(newRomItem.SHA384) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA384))
{
newRomItem.SHA384 = ((Rom)dupes[0]).SHA384;
}
if (String.IsNullOrEmpty(newRomItem.SHA512) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA512))
{
newRomItem.SHA512 = ((Rom)dupes[0]).SHA512;
}
newDatItem = (Rom)newRomItem.Clone();
} }
else if (newDatItem.Type == ItemType.Disk)
{
Disk newDiskItem = (Disk)newDatItem;
if (String.IsNullOrEmpty(newDiskItem.MD5) && !String.IsNullOrEmpty(((Rom)dupes[0]).MD5))
{
newDiskItem.MD5 = ((Rom)dupes[0]).MD5;
}
if (String.IsNullOrEmpty(newDiskItem.SHA1) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA1))
{
newDiskItem.SHA1 = ((Rom)dupes[0]).SHA1;
}
if (String.IsNullOrEmpty(newDiskItem.SHA256) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA256))
{
newDiskItem.SHA256 = ((Rom)dupes[0]).SHA256;
}
if (String.IsNullOrEmpty(newDiskItem.SHA384) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA384))
{
newDiskItem.SHA384 = ((Rom)dupes[0]).SHA384;
}
if (String.IsNullOrEmpty(newDiskItem.SHA512) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA512))
{
newDiskItem.SHA512 = ((Rom)dupes[0]).SHA512;
}
newDatItem = (Disk)newDiskItem.Clone(); // If we're updating hashes, only replace if the current item doesn't have them
if ((replaceMode & ReplaceMode.Hashes) != 0)
{
if (newDatItem.Type == ItemType.Rom)
{
Rom newRomItem = (Rom)newDatItem;
if (String.IsNullOrEmpty(newRomItem.CRC) && !String.IsNullOrEmpty(((Rom)dupes[0]).CRC))
{
newRomItem.CRC = ((Rom)dupes[0]).CRC;
}
if (String.IsNullOrEmpty(newRomItem.MD5) && !String.IsNullOrEmpty(((Rom)dupes[0]).MD5))
{
newRomItem.MD5 = ((Rom)dupes[0]).MD5;
}
if (String.IsNullOrEmpty(newRomItem.SHA1) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA1))
{
newRomItem.SHA1 = ((Rom)dupes[0]).SHA1;
}
if (String.IsNullOrEmpty(newRomItem.SHA256) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA256))
{
newRomItem.SHA256 = ((Rom)dupes[0]).SHA256;
}
if (String.IsNullOrEmpty(newRomItem.SHA384) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA384))
{
newRomItem.SHA384 = ((Rom)dupes[0]).SHA384;
}
if (String.IsNullOrEmpty(newRomItem.SHA512) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA512))
{
newRomItem.SHA512 = ((Rom)dupes[0]).SHA512;
}
newDatItem = (Rom)newRomItem.Clone();
}
else if (newDatItem.Type == ItemType.Disk)
{
Disk newDiskItem = (Disk)newDatItem;
if (String.IsNullOrEmpty(newDiskItem.MD5) && !String.IsNullOrEmpty(((Rom)dupes[0]).MD5))
{
newDiskItem.MD5 = ((Rom)dupes[0]).MD5;
}
if (String.IsNullOrEmpty(newDiskItem.SHA1) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA1))
{
newDiskItem.SHA1 = ((Rom)dupes[0]).SHA1;
}
if (String.IsNullOrEmpty(newDiskItem.SHA256) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA256))
{
newDiskItem.SHA256 = ((Rom)dupes[0]).SHA256;
}
if (String.IsNullOrEmpty(newDiskItem.SHA384) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA384))
{
newDiskItem.SHA384 = ((Rom)dupes[0]).SHA384;
}
if (String.IsNullOrEmpty(newDiskItem.SHA512) && !String.IsNullOrEmpty(((Rom)dupes[0]).SHA512))
{
newDiskItem.SHA512 = ((Rom)dupes[0]).SHA512;
}
newDatItem = (Disk)newDiskItem.Clone();
}
} }
} }
newDatItems.Add(newDatItem);
} }
newDatItems.Add(newDatItem); // Now add the new list to the key
} intDat.Remove(key);
intDat.AddRange(key, newDatItems);
});
}
// Now add the new list to the key // If we are matching based on names of any sort
intDat.Remove(key); if ((replaceMode & ReplaceMode.Descriptions) != 0)
intDat.AddRange(key, newDatItems); {
}); // For comparison's sake, we want to use Machine Name as the base ordering
BucketBy(SortedBy.Game, DedupeType.Full);
intDat.BucketBy(SortedBy.Game, DedupeType.None);
// Then we do a namewise comparison against the base DAT
List<string> keys = intDat.Keys;
Parallel.ForEach(keys, Globals.ParallelOptions, key =>
{
List<DatItem> datItems = intDat[key];
List<DatItem> newDatItems = new List<DatItem>();
foreach (DatItem datItem in datItems)
{
DatItem newDatItem = (DatItem)datItem.Clone();
if (Contains(key) && this[key].Count() > 0)
{
newDatItem.MachineDescription = this[key][0].MachineDescription;
}
newDatItems.Add(newDatItem);
}
// Now add the new list to the key
intDat.Remove(key);
intDat.AddRange(key, newDatItems);
});
}
// Determine the output path for the DAT // Determine the output path for the DAT
string interOutDir = Utilities.GetOutputPath(outDir, path, inplace); string interOutDir = Utilities.GetOutputPath(outDir, path, inplace);

1
SabreTools.Library/Data/Flags.cs
View File

@@ -251,6 +251,7 @@ namespace SabreTools.Library.Data
None = 0x0, None = 0x0,
Names = 0x1, Names = 0x1,
Hashes = Names << 1, Hashes = Names << 1,
Descriptions = Hashes << 1,
} }
/// <summary> /// <summary>

8
SabreTools.Library/README.1ST
View File

@@ -1156,8 +1156,12 @@ Options:
Add a DAT or folder of DATs to the base set to be used in Add a DAT or folder of DATs to the base set to be used in
item name replacement item name replacement
-un, --update-names Update names from base DATs -un, --update-names Update item names from base DATs
This flag enables updating of names from base DATs. This flag enables updating of item names from base DATs.
-udd, --update-desc Update machine descriptions from base DATs
This flag enables updating of machine descriptions from base
DATs
-uh, --update-hashes Update hashes from base DATs -uh, --update-hashes Update hashes from base DATs
This flag enables updating of hashes from base DATs. This flag enables updating of hashes from base DATs.

7
SabreTools/SabreTools.Help.cs
View File

@@ -1272,7 +1272,12 @@ namespace SabreTools
null)); null));
update["base-replace"].AddFeature("update-names", new Feature( update["base-replace"].AddFeature("update-names", new Feature(
new List<string>() { "-un", "--update-names" }, new List<string>() { "-un", "--update-names" },
"Update names from base DATs", "Update item names from base DATs",
FeatureType.Flag,
null));
update["base-replace"].AddFeature("update-desc", new Feature(
new List<string>() { "-udd", "--update-desc" },
"Update machine descriptions from base DATs",
FeatureType.Flag, FeatureType.Flag,
null)); null));
update["base-replace"].AddFeature("update-hashes", new Feature( update["base-replace"].AddFeature("update-hashes", new Feature(

3
SabreTools/SabreTools.cs
View File

@@ -488,6 +488,9 @@ namespace SabreTools
case "update-dat": case "update-dat":
updateDat = true; updateDat = true;
break; break;
case "update-desc":
replaceMode |= ReplaceMode.Descriptions;
break;
case "update-hashes": case "update-hashes":
replaceMode |= ReplaceMode.Hashes; replaceMode |= ReplaceMode.Hashes;
break; break;