diff --git a/SabreTools.Helper/Dats/DatFile.cs b/SabreTools.Helper/Dats/DatFile.cs index 8e0675ac..3f435cc8 100644 --- a/SabreTools.Helper/Dats/DatFile.cs +++ b/SabreTools.Helper/Dats/DatFile.cs @@ -489,54 +489,6 @@ namespace SabreTools.Helper.Dats #region Cloning Methods [MODULAR DONE] public object Clone() - { - DatFile df = new DatFile - { - FileName = _fileName, - Name = _name, - Description = _description, - RootDir = _rootDir, - Category = _category, - Version = _version, - Date = _date, - Author = _author, - Email = _email, - Homepage = _homepage, - Url = _url, - Comment = _comment, - Header = _header, - Type = _type, - ForceMerging = _forceMerging, - ForceNodump = _forceNodump, - ForcePacking = _forcePacking, - ExcludeOf = _excludeOf, - DatFormat = _datFormat, - MergeRoms = _mergeRoms, - SortedBy = _sortedBy, - UseGame = _useGame, - Prefix = _prefix, - Postfix = _postfix, - Quotes = _quotes, - RepExt = _repExt, - AddExt = _addExt, - RemExt = _remExt, - GameName = _gameName, - Romba = _romba, - RomCount = _romCount, - DiskCount = _diskCount, - TotalSize = _totalSize, - CRCCount = _crcCount, - MD5Count = _md5Count, - SHA1Count = _sha1Count, - BaddumpCount = _baddumpCount, - NodumpCount = _nodumpCount, - }; - - df.Set(_files); - return df; - } - - public object CloneHeader() { return new DatFile { diff --git a/SabreTools.Helper/Dats/Partials/DatFile.ConvertUpdate.cs b/SabreTools.Helper/Dats/Partials/DatFile.ConvertUpdate.cs index aeeb1271..3d84fada 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.ConvertUpdate.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.ConvertUpdate.cs @@ -157,7 +157,7 @@ namespace SabreTools.Helper.Dats if ((diff & DiffMode.NoDupes) != 0) { post = " (No Duplicates)"; - outerDiffData = (DatFile)CloneHeader(); + outerDiffData = (DatFile)Clone(); outerDiffData.FileName += post; outerDiffData.Name += post; outerDiffData.Description += post; @@ -168,7 +168,7 @@ namespace SabreTools.Helper.Dats if ((diff & DiffMode.Dupes) != 0) { post = " (Duplicates)"; - dupeData = (DatFile)CloneHeader(); + dupeData = (DatFile)Clone(); dupeData.FileName += post; dupeData.Name += post; dupeData.Description += post; @@ -186,7 +186,7 @@ namespace SabreTools.Helper.Dats Parallel.For(0, inputs.Count, j => { string innerpost = " (" + Path.GetFileNameWithoutExtension(inputs[j].Split('¬')[0]) + " Only)"; - DatFile diffData = (DatFile)CloneHeader(); + DatFile diffData = (DatFile)Clone(); diffData.FileName += innerpost; diffData.Name += innerpost; diffData.Description += innerpost; @@ -319,7 +319,7 @@ namespace SabreTools.Helper.Dats } else { - diffData = (DatFile)CloneHeader(); + diffData = (DatFile)Clone(); diffData.FileName += post; diffData.Name += post; diffData.Description += post; @@ -459,7 +459,7 @@ namespace SabreTools.Helper.Dats if (File.Exists(inputFileName)) { - DatFile innerDatdata = (DatFile)CloneHeader(); + DatFile innerDatdata = (DatFile)Clone(); logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\""); innerDatdata.Parse(inputFileName, 0, 0, filter, trim, single, root, logger, true, clean, softlist, @@ -481,7 +481,6 @@ namespace SabreTools.Helper.Dats { logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\""); DatFile innerDatdata = (DatFile)Clone(); - innerDatdata.Delete(); innerDatdata.Parse(file, 0, 0, filter, trim, single, root, logger, true, clean, softlist, keepext: ((innerDatdata.DatFormat & DatFormat.TSV) != 0 || (innerDatdata.DatFormat & DatFormat.CSV) != 0)); diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs index dce6cad0..5c1a2782 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs @@ -511,7 +511,7 @@ namespace SabreTools.Helper.Dats } // Setup the fixdat - DatFile matched = (DatFile)CloneHeader(); + DatFile matched = (DatFile)Clone(); matched.Reset(); matched.FileName = "fixDat_" + matched.FileName; matched.Name = "fixDat_" + matched.Name; diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Splitters.cs b/SabreTools.Helper/Dats/Partials/DatFile.Splitters.cs index 9caadb14..7e9aa9ae 100644 --- a/SabreTools.Helper/Dats/Partials/DatFile.Splitters.cs +++ b/SabreTools.Helper/Dats/Partials/DatFile.Splitters.cs @@ -337,7 +337,7 @@ namespace SabreTools.Helper.Dats BucketByGame(false, true, logger, output: false, lower: false); // Create a temporary DAT to add things to - DatFile tempDat = (DatFile)CloneHeader(); + DatFile tempDat = (DatFile)Clone(); tempDat.Name = null; // Sort the input keys @@ -354,7 +354,7 @@ namespace SabreTools.Helper.Dats SplitByLevelHelper(tempDat, outDir, shortname, basedat, logger); // Reset the DAT for the next items - tempDat = (DatFile)CloneHeader(); + tempDat = (DatFile)Clone(); tempDat.Name = null; } diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs index b9a1a316..91384701 100644 --- a/SabreTools/Partials/SabreTools_Inits.cs +++ b/SabreTools/Partials/SabreTools_Inits.cs @@ -114,7 +114,6 @@ namespace SabreTools { // Clone the base Dat for information DatFile datdata = (DatFile)basedat.Clone(); - datdata.Reset(); string basePath = Path.GetFullPath(path); bool success = datdata.PopulateFromDir(basePath, noMD5, noSHA1, removeDateFromAutomaticName, parseArchivesAsFiles, enableGzip,