diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index 1bcaba1c..776012a2 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -351,19 +351,6 @@ namespace SabreTools.Library.DatFiles
_datHeader.DedupeRoms = value;
}
}
- public Hash StripHash
- {
- get
- {
- EnsureDatHeader();
- return _datHeader.StripHash;
- }
- set
- {
- EnsureDatHeader();
- _datHeader.StripHash = value;
- }
- }
public SortedBy SortedBy
{
get { return _sortedBy; }
@@ -1356,7 +1343,6 @@ namespace SabreTools.Library.DatFiles
KeepEmptyGames = this.KeepEmptyGames,
SceneDateStrip = this.SceneDateStrip,
DedupeRoms = this.DedupeRoms,
- StripHash = this.StripHash,
Prefix = this.Prefix,
Postfix = this.Postfix,
AddExtension = this.AddExtension,
@@ -1431,7 +1417,6 @@ namespace SabreTools.Library.DatFiles
KeepEmptyGames = this.KeepEmptyGames,
SceneDateStrip = this.SceneDateStrip,
DedupeRoms = this.DedupeRoms,
- StripHash = this.StripHash,
Prefix = this.Prefix,
Postfix = this.Postfix,
AddExtension = this.AddExtension,
@@ -2182,81 +2167,6 @@ namespace SabreTools.Library.DatFiles
}
}
- ///
- /// Strip the given hash types from the DAT
- ///
- private void StripHashesFromItems()
- {
- // Output the logging statement
- Globals.Logger.User("Stripping requested hashes");
-
- // Now process all of the roms
- List keys = Keys;
- Parallel.ForEach(keys, Globals.ParallelOptions, key =>
- {
- List items = this[key];
- for (int j = 0; j < items.Count; j++)
- {
- DatItem item = items[j];
- if (item.Type == ItemType.Rom)
- {
- Rom rom = (Rom)item;
- if ((StripHash & Hash.MD5) != 0)
- {
- rom.MD5 = null;
- }
- if ((StripHash & Hash.SHA1) != 0)
- {
- rom.SHA1 = null;
- }
- if ((StripHash & Hash.SHA256) != 0)
- {
- rom.SHA256 = null;
- }
- if ((StripHash & Hash.SHA384) != 0)
- {
- rom.SHA384 = null;
- }
- if ((StripHash & Hash.SHA512) != 0)
- {
- rom.SHA512 = null;
- }
-
- items[j] = rom;
- }
- else if (item.Type == ItemType.Disk)
- {
- Disk disk = (Disk)item;
- if ((StripHash & Hash.MD5) != 0)
- {
- disk.MD5 = null;
- }
- if ((StripHash & Hash.SHA1) != 0)
- {
- disk.SHA1 = null;
- }
- if ((StripHash & Hash.SHA256) != 0)
- {
- disk.SHA256 = null;
- }
- if ((StripHash & Hash.SHA384) != 0)
- {
- disk.SHA384 = null;
- }
- if ((StripHash & Hash.SHA512) != 0)
- {
- disk.SHA512 = null;
- }
-
- items[j] = disk;
- }
- }
-
- Remove(key);
- AddRange(key, items);
- });
- }
-
///
/// Strip the dates from the beginning of scene-style set names
///
@@ -5332,12 +5242,6 @@ namespace SabreTools.Library.DatFiles
// Output the number of items we're going to be writing
Globals.Logger.User("A total of {0} items will be written out to '{1}'", Count, FileName);
- // If we are removing hashes, do that now
- if (StripHash != 0x0)
- {
- StripHashesFromItems();
- }
-
// If we are removing scene dates, do that now
if (SceneDateStrip)
{
diff --git a/SabreTools.Library/DatFiles/DatHeader.cs b/SabreTools.Library/DatFiles/DatHeader.cs
index 449f4ccc..8e668ca1 100644
--- a/SabreTools.Library/DatFiles/DatHeader.cs
+++ b/SabreTools.Library/DatFiles/DatHeader.cs
@@ -169,11 +169,6 @@ namespace SabreTools.Library.DatFiles
get { return _dedupeRoms; }
set { _dedupeRoms = value; }
}
- public Hash StripHash
- {
- get { return _stripHash; }
- set { _stripHash = value; }
- }
// Data specific to the Miss DAT type
public bool UseRomName
diff --git a/SabreTools/SabreTools.Help.cs b/SabreTools/SabreTools.Help.cs
index 09878455..56b21237 100644
--- a/SabreTools/SabreTools.Help.cs
+++ b/SabreTools/SabreTools.Help.cs
@@ -884,7 +884,7 @@ namespace SabreTools
FeatureType.Flag,
longDescription: "By default, all available hashes will be written out to the DAT. This will remove all MD5 hashes from the output file(s).");
}
- }
+ } // TODO: Remove
private static Feature _removeSha1Flag
{
get
@@ -896,7 +896,7 @@ namespace SabreTools
FeatureType.Flag,
longDescription: "By default, all available hashes will be written out to the DAT. This will remove all SHA-1 hashes from the output file(s).");
}
- }
+ } // TODO: Remove
private static Feature _removeSha256Flag
{
get
@@ -908,7 +908,7 @@ namespace SabreTools
FeatureType.Flag,
longDescription: "By default, all available hashes will be written out to the DAT. This will remove all SHA-256 hashes from the output file(s).");
}
- }
+ } // TODO: Remove
private static Feature _removeSha384Flag
{
get
@@ -920,7 +920,7 @@ namespace SabreTools
FeatureType.Flag,
longDescription: "By default, all available hashes will be written out to the DAT. This will remove all SHA-384 hashes from the output file(s).");
}
- }
+ } // TODO: Remove
private static Feature _removeSha512Flag
{
get
@@ -932,7 +932,7 @@ namespace SabreTools
FeatureType.Flag,
longDescription: "By default, all available hashes will be written out to the DAT. This will remove all SHA-512 hashes from the output file(s).");
}
- }
+ } // TODO: Remove
private static Feature _removeUnicodeFlag
{
get
diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index cb436f78..2c69e203 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -454,23 +454,18 @@ namespace SabreTools
datHeader.RemoveExtension = true;
break;
case "remove-md5":
- datHeader.StripHash |= Hash.MD5;
datHeader.ExcludeFields[(int)Field.MD5] = true;
break;
case "remove-sha1":
- datHeader.StripHash |= Hash.SHA1;
datHeader.ExcludeFields[(int)Field.SHA1] = true;
break;
case "remove-sha256":
- datHeader.StripHash |= Hash.SHA256;
datHeader.ExcludeFields[(int)Field.SHA256] = true;
break;
case "remove-sha384":
- datHeader.StripHash |= Hash.SHA384;
datHeader.ExcludeFields[(int)Field.SHA384] = true;
break;
case "remove-sha512":
- datHeader.StripHash |= Hash.SHA512;
datHeader.ExcludeFields[(int)Field.SHA512] = true;
break;
case "remove-unicode":