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

[SimpleSort] Fix equivalence

Browse Source
This commit is contained in:
Matt Nadareski
2016-08-29 20:45:20 -07:00
parent 2e204d9473
commit b77cdff0cc
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SabreTools.Helper/Data/Structs.cs
View File

@@ -172,7 +172,7 @@ namespace SabreTools.Helper
{ {
bool equals = false; bool equals = false;
if (!IsDisk && if (IsDisk &&
((String.IsNullOrEmpty(this.MD5) || String.IsNullOrEmpty(other.MD5)) || this.MD5 == other.MD5) && ((String.IsNullOrEmpty(this.MD5) || String.IsNullOrEmpty(other.MD5)) || this.MD5 == other.MD5) &&
((String.IsNullOrEmpty(this.SHA1) || String.IsNullOrEmpty(other.SHA1)) || this.SHA1 == other.SHA1)) ((String.IsNullOrEmpty(this.SHA1) || String.IsNullOrEmpty(other.SHA1)) || this.SHA1 == other.SHA1))
{ {
@@ -250,9 +250,7 @@ namespace SabreTools.Helper
dupefound = this.HashData.Equals(other.HashData, true); dupefound = this.HashData.Equals(other.HashData, true);
} }
return (this.Machine.Equals(other.Machine) && return dupefound;
this.Name == other.Name &&
dupefound);
} }
} }

1
SabreTools.Helper/Tools/RomTools.cs
View File

@@ -128,6 +128,7 @@ namespace SabreTools.Helper
{ {
List<Rom> roms = datdata.Files[key]; List<Rom> roms = datdata.Files[key];
List<Rom> left = new List<Rom>(); List<Rom> left = new List<Rom>();
foreach (Rom rom in roms) foreach (Rom rom in roms)
{ {
if (IsDuplicate(rom, lastrom, logger)) if (IsDuplicate(rom, lastrom, logger))

2
SimpleSort/SimpleSort.cs
View File

@@ -772,7 +772,7 @@ namespace SabreTools
} }
else else
{ {
string archiveFileName = Path.Combine(_outdir, found.Machine + ".zip"); string archiveFileName = Path.Combine(_outdir, found.Machine.Name + ".zip");
FileTools.CopyFileBetweenManagedArchives(input, archiveFileName, rom.Name, found.Name, _logger); FileTools.CopyFileBetweenManagedArchives(input, archiveFileName, rom.Name, found.Name, _logger);
} }
} }