diff --git a/Deheader/Headerer.cs b/Deheader/Headerer.cs index 25880f91..94f896de 100644 --- a/Deheader/Headerer.cs +++ b/Deheader/Headerer.cs @@ -254,7 +254,7 @@ namespace SabreTools } // Now add the information to the database if it's not already there - Helper.File rom = RomTools.GetSingleFileInfo(newfile); + Helper.Rom rom = RomTools.GetSingleFileInfo(newfile); AddHeaderToDatabase(hstr, rom.HashData.SHA1, type); } @@ -309,7 +309,7 @@ namespace SabreTools public bool ReplaceHeader(string file) { // First, get the SHA-1 hash of the file - Helper.File rom = RomTools.GetSingleFileInfo(file); + Helper.Rom rom = RomTools.GetSingleFileInfo(file); // Then try to pull the corresponding headers from the database string header = ""; diff --git a/SabreTools.Helper/Data/Structs.cs b/SabreTools.Helper/Data/Structs.cs index 1bd5b025..31064f8d 100644 --- a/SabreTools.Helper/Data/Structs.cs +++ b/SabreTools.Helper/Data/Structs.cs @@ -44,7 +44,7 @@ namespace SabreTools.Helper /// /// Intermediate struct for holding and processing rom data /// - public struct File : IComparable, IEquatable + public struct Rom : IComparable, IEquatable { public Machine Machine; public string Name; @@ -64,7 +64,7 @@ namespace SabreTools.Helper try { - File comp = (File)obj; + Rom comp = (Rom)obj; if (this.Machine.Name == comp.Machine.Name) { @@ -85,7 +85,7 @@ namespace SabreTools.Helper return ret; } - public bool Equals(File other) + public bool Equals(Rom other) { Logger temp = new Logger(false, ""); temp.Start(); @@ -153,7 +153,7 @@ namespace SabreTools.Helper public ForcePacking ForcePacking; public OutputFormat OutputFormat; public bool MergeRoms; - public Dictionary> Files; + public Dictionary> Files; // Data specific to the Miss DAT type public bool UseGame; @@ -241,7 +241,7 @@ namespace SabreTools.Helper ForcePacking = this.ForcePacking, OutputFormat = this.OutputFormat, MergeRoms = this.MergeRoms, - Files = new Dictionary>(), + Files = new Dictionary>(), UseGame = this.UseGame, Prefix = this.Prefix, Postfix = this.Postfix, diff --git a/SabreTools.Helper/Tools/ArchiveTools.cs b/SabreTools.Helper/Tools/ArchiveTools.cs index c78bfeec..180b7035 100644 --- a/SabreTools.Helper/Tools/ArchiveTools.cs +++ b/SabreTools.Helper/Tools/ArchiveTools.cs @@ -19,7 +19,7 @@ namespace SabreTools.Helper /// Input filename to be moved /// Output directory to build to /// RomData representing the new information - public static void WriteToArchive(string input, string output, File rom) + public static void WriteToArchive(string input, string output, Rom rom) { string archiveFileName = Path.Combine(output, rom.Machine + ".zip"); @@ -69,7 +69,7 @@ namespace SabreTools.Helper /// Input filename to be moved /// Output directory to build to /// RomData representing the new information - public static void WriteToManagedArchive(string input, string output, File rom) + public static void WriteToManagedArchive(string input, string output, Rom rom) { string archiveFileName = Path.Combine(output, rom.Machine + ".zip"); @@ -474,9 +474,9 @@ namespace SabreTools.Helper /// Input file to get data from /// Logger object for file and console output /// List of RomData objects representing the found data - public static List GetArchiveFileInfo(string input, Logger logger) + public static List GetArchiveFileInfo(string input, Logger logger) { - List roms = new List(); + List roms = new List(); string gamename = Path.GetFileNameWithoutExtension(input); // First get the archive type @@ -491,7 +491,7 @@ namespace SabreTools.Helper // If we got back GZip, try to get TGZ info first else if (at == ArchiveType.GZip) { - File possibleTgz = GetTorrentGZFileInfo(input, logger); + Rom possibleTgz = GetTorrentGZFileInfo(input, logger); // If it was, then add it to the outputs and continue if (possibleTgz.Name != null) @@ -534,7 +534,7 @@ namespace SabreTools.Helper + (size == 0 ? reader.Entry.Size : size) + ", " + (crc == "" ? reader.Entry.Crc.ToString("X").ToLowerInvariant() : crc)); - roms.Add(new File + roms.Add(new Rom { Type = ItemType.Rom, Name = reader.Entry.Key, @@ -570,7 +570,7 @@ namespace SabreTools.Helper /// Filename to get information from /// Logger object for file and console output /// Populated RomData object if success, empty one on error - public static File GetTorrentGZFileInfo(string input, Logger logger) + public static Rom GetTorrentGZFileInfo(string input, Logger logger) { string datum = Path.GetFileName(input).ToLowerInvariant(); long filesize = new FileInfo(input).Length; @@ -579,14 +579,14 @@ namespace SabreTools.Helper if (!Regex.IsMatch(datum, @"^[0-9a-f]{40}\.gz")) { logger.Warning("Non SHA-1 filename found, skipping: '" + datum + "'"); - return new File(); + return new Rom(); } // Check if the file is at least the minimum length if (filesize < 40 /* bytes */) { logger.Warning("Possibly corrupt file '" + input + "' with size " + Style.GetBytesReadable(filesize)); - return new File(); + return new Rom(); } // Get the Romba-specific header data @@ -610,7 +610,7 @@ namespace SabreTools.Helper } if (!correct) { - return new File(); + return new Rom(); } // Now convert the data and get the right position @@ -618,7 +618,7 @@ namespace SabreTools.Helper string gzcrc = BitConverter.ToString(headercrc).Replace("-", string.Empty); long extractedsize = (long)BitConverter.ToUInt64(headersz.Reverse().ToArray(), 0); - File rom = new File + Rom rom = new Rom { Type = ItemType.Rom, Machine = new Machine @@ -665,7 +665,7 @@ namespace SabreTools.Helper outdir = Path.GetFullPath(outdir); // Now get the Rom info for the file so we have hashes and size - File rom = RomTools.GetSingleFileInfo(input); + Rom rom = RomTools.GetSingleFileInfo(input); // If it doesn't exist, create the output file and then write string outfile = Path.Combine(outdir, rom.HashData.SHA1 + ".gz"); diff --git a/SabreTools.Helper/Tools/DatTools.cs b/SabreTools.Helper/Tools/DatTools.cs index 3497fce4..8cb9ff26 100644 --- a/SabreTools.Helper/Tools/DatTools.cs +++ b/SabreTools.Helper/Tools/DatTools.cs @@ -95,7 +95,7 @@ namespace SabreTools.Helper // Make sure there's a dictionary to read to if (datdata.Files == null) { - datdata.Files = new Dictionary>(); + datdata.Files = new Dictionary>(); } // Now parse the correct type of DAT @@ -170,7 +170,7 @@ namespace SabreTools.Helper // If we're in cleaning mode, sanitize the game name gamename = (clean ? Style.CleanGameName(gamename) : gamename); - File rom = new File + Rom rom = new Rom { Machine = new Machine { @@ -328,7 +328,7 @@ namespace SabreTools.Helper } else { - List templist = new List(); + List templist = new List(); templist.Add(rom); datdata.Files.Add(key, templist); } @@ -566,7 +566,7 @@ namespace SabreTools.Helper // If we're in cleaning mode, sanitize the game name rominfo[3] = (clean ? Style.CleanGameName(rominfo[3]) : rominfo[3]); - File rom = new File + Rom rom = new Rom { Machine = new Machine { @@ -616,7 +616,7 @@ namespace SabreTools.Helper } else { - List templist = new List(); + List templist = new List(); templist.Add(rom); datdata.Files.Add(key, templist); } @@ -677,7 +677,7 @@ namespace SabreTools.Helper // If we're in cleaning mode, sanitize the game name tempgame = (clean ? Style.CleanGameName(tempgame) : tempgame); - File rom = new File + Rom rom = new Rom { Type = ItemType.Rom, Name = "null", @@ -702,7 +702,7 @@ namespace SabreTools.Helper } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdata.Files.Add(key, temp); } @@ -1081,7 +1081,7 @@ namespace SabreTools.Helper if (subreader.GetAttribute("loadflag") == "continue" || subreader.GetAttribute("loadflag") == "ignore") { int index = datdata.Files[key].Count() - 1; - File lastrom = datdata.Files[key][index]; + Rom lastrom = datdata.Files[key][index]; lastrom.HashData.Size += size; datdata.Files[key].RemoveAt(index); datdata.Files[key].Add(lastrom); @@ -1127,7 +1127,7 @@ namespace SabreTools.Helper // Get the new values to add key = size + "-" + crc; - File rom = new File + Rom rom = new Rom { Machine = new Machine { @@ -1154,7 +1154,7 @@ namespace SabreTools.Helper } else { - List newvalue = new List(); + List newvalue = new List(); newvalue.Add(rom); datdata.Files.Add(key, newvalue); } @@ -1186,7 +1186,7 @@ namespace SabreTools.Helper // If we're in cleaning mode, sanitize the game name tempname = (clean ? Style.CleanGameName(tempname.Split(Path.DirectorySeparatorChar)) : tempname); - File rom = new File + Rom rom = new Rom { Type = ItemType.Rom, Name = "null", @@ -1211,7 +1211,7 @@ namespace SabreTools.Helper } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdata.Files.Add(key, temp); } @@ -1312,7 +1312,7 @@ namespace SabreTools.Helper if (xtr.GetAttribute("loadflag") == "continue" || xtr.GetAttribute("loadflag") == "ignore") { int index = datdata.Files[key].Count() - 1; - File lastrom = datdata.Files[key][index]; + Rom lastrom = datdata.Files[key][index]; lastrom.HashData.Size += size; datdata.Files[key].RemoveAt(index); datdata.Files[key].Add(lastrom); @@ -1367,7 +1367,7 @@ namespace SabreTools.Helper // Get the new values to add key = size + "-" + crc; - File rom = new File + Rom rom = new Rom { Machine = new Machine { @@ -1393,7 +1393,7 @@ namespace SabreTools.Helper } else { - List newvalue = new List(); + List newvalue = new List(); newvalue.Add(rom); datdata.Files.Add(key, newvalue); } @@ -1431,9 +1431,9 @@ namespace SabreTools.Helper /// Logger object for file and console output /// True if the number of hashes counted is to be output (default), false otherwise /// SortedDictionary bucketed by game name - public static SortedDictionary> BucketByGame(List list, bool mergeroms, bool norename, Logger logger, bool output = true) + public static SortedDictionary> BucketByGame(List list, bool mergeroms, bool norename, Logger logger, bool output = true) { - Dictionary> dict = new Dictionary>(); + Dictionary> dict = new Dictionary>(); dict.Add("key", list); return BucketByGame(dict, mergeroms, norename, logger, output); } @@ -1447,9 +1447,9 @@ namespace SabreTools.Helper /// Logger object for file and console output /// True if the number of hashes counted is to be output (default), false otherwise /// SortedDictionary bucketed by game name - public static SortedDictionary> BucketByGame(IDictionary> dict, bool mergeroms, bool norename, Logger logger, bool output = true) + public static SortedDictionary> BucketByGame(IDictionary> dict, bool mergeroms, bool norename, Logger logger, bool output = true) { - SortedDictionary> sortable = new SortedDictionary>(); + SortedDictionary> sortable = new SortedDictionary>(); long count = 0; // If we have a null dict or an empty one, output a new dictionary @@ -1461,13 +1461,13 @@ namespace SabreTools.Helper // Process each all of the roms foreach (string key in dict.Keys) { - List roms = dict[key]; + List roms = dict[key]; if (mergeroms) { roms = RomTools.Merge(roms, logger); } - foreach (File rom in roms) + foreach (Rom rom in roms) { count++; string newkey = (norename ? "" @@ -1483,7 +1483,7 @@ namespace SabreTools.Helper } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); sortable.Add(newkey, temp); } @@ -1508,9 +1508,9 @@ namespace SabreTools.Helper /// Logger object for file and console output /// True if the number of hashes counted is to be output (default), false otherwise /// SortedDictionary bucketed by size and hash - public static SortedDictionary> BucketByHashSize(List list, bool mergeroms, bool norename, Logger logger, bool output = true) + public static SortedDictionary> BucketByHashSize(List list, bool mergeroms, bool norename, Logger logger, bool output = true) { - Dictionary> dict = new Dictionary>(); + Dictionary> dict = new Dictionary>(); dict.Add("key", list); return BucketByHashSize(dict, mergeroms, norename, logger, output); } @@ -1524,9 +1524,9 @@ namespace SabreTools.Helper /// Logger object for file and console output /// True if the number of hashes counted is to be output (default), false otherwise /// SortedDictionary bucketed by size and hash - public static SortedDictionary> BucketByHashSize(IDictionary> dict, bool mergeroms, bool norename, Logger logger, bool output = true) + public static SortedDictionary> BucketByHashSize(IDictionary> dict, bool mergeroms, bool norename, Logger logger, bool output = true) { - SortedDictionary> sortable = new SortedDictionary>(); + SortedDictionary> sortable = new SortedDictionary>(); long count = 0; // If we have a null dict or an empty one, output a new dictionary @@ -1536,15 +1536,15 @@ namespace SabreTools.Helper } // Process each all of the roms - foreach (List roms in dict.Values) + foreach (List roms in dict.Values) { - List newroms = roms; + List newroms = roms; if (mergeroms) { newroms = RomTools.Merge(newroms, logger); } - foreach (File rom in newroms) + foreach (Rom rom in newroms) { count++; string key = rom.HashData.Size + "-" + rom.HashData.CRC; @@ -1554,7 +1554,7 @@ namespace SabreTools.Helper } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); sortable.Add(key, temp); } @@ -1756,7 +1756,7 @@ namespace SabreTools.Helper int i = 0; userData = new Dat { - Files = new Dictionary>(), + Files = new Dictionary>(), MergeRoms = inputDat.MergeRoms, }; foreach (string input in inputs) @@ -1771,14 +1771,14 @@ namespace SabreTools.Helper datHeaders.Add((Dat)userData.CloneHeader()); // Reset the header values so the next can be captured - Dictionary> temp = userData.Files; + Dictionary> temp = userData.Files; userData = new Dat(); userData.Files = temp; } } // Set the output values - Dictionary> roms = userData.Files; + Dictionary> roms = userData.Files; userData = (Dat)inputDat.CloneHeader(); userData.Files = roms; @@ -1810,14 +1810,14 @@ namespace SabreTools.Helper long slt, long seq, string crc, string md5, string sha1, bool? nodump, bool trim, bool single, string root, Logger logger) { // Now loop through and create a new Rom dictionary using filtered values - Dictionary> dict = new Dictionary>(); + Dictionary> dict = new Dictionary>(); List keys = datdata.Files.Keys.ToList(); foreach (string key in keys) { - List roms = datdata.Files[key]; + List roms = datdata.Files[key]; for (int i = 0; i < roms.Count; i++) { - File rom = roms[i]; + Rom rom = roms[i]; // Filter on nodump status if (nodump == true && !rom.Nodump) @@ -1963,7 +1963,7 @@ namespace SabreTools.Helper } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); dict.Add(key, temp); } @@ -2041,11 +2041,11 @@ namespace SabreTools.Helper List keys = userData.Files.Keys.ToList(); foreach (string key in keys) { - List roms = RomTools.Merge(userData.Files[key], logger); + List roms = RomTools.Merge(userData.Files[key], logger); if (roms != null && roms.Count > 0) { - foreach (File rom in roms) + foreach (Rom rom in roms) { // No duplicates if ((diff & DiffMode.NoDupes) != 0 || (diff & DiffMode.Individuals) != 0) @@ -2061,7 +2061,7 @@ namespace SabreTools.Helper } else { - List tl = new List(); + List tl = new List(); tl.Add(rom); outDats[rom.Metadata.SystemID].Files.Add(key, tl); } @@ -2070,7 +2070,7 @@ namespace SabreTools.Helper // Merged no-duplicates DAT if ((diff & DiffMode.NoDupes) != 0) { - File newrom = rom; + Rom newrom = rom; newrom.Machine.Name += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")"; if (outerDiffData.Files.ContainsKey(key)) @@ -2079,7 +2079,7 @@ namespace SabreTools.Helper } else { - List tl = new List(); + List tl = new List(); tl.Add(rom); outerDiffData.Files.Add(key, tl); } @@ -2092,7 +2092,7 @@ namespace SabreTools.Helper { if (rom.Dupe >= DupeType.ExternalHash) { - File newrom = rom; + Rom newrom = rom; newrom.Machine.Name += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")"; if (dupeData.Files.ContainsKey(key)) @@ -2101,7 +2101,7 @@ namespace SabreTools.Helper } else { - List tl = new List(); + List tl = new List(); tl.Add(rom); dupeData.Files.Add(key, tl); } @@ -2194,11 +2194,11 @@ namespace SabreTools.Helper foreach (string key in keys) { - List roms = RomTools.Merge(userData.Files[key], logger); + List roms = RomTools.Merge(userData.Files[key], logger); if (roms != null && roms.Count > 0) { - foreach (File rom in roms) + foreach (Rom rom in roms) { if (outDats[rom.Metadata.SystemID].Files.ContainsKey(key)) { @@ -2206,7 +2206,7 @@ namespace SabreTools.Helper } else { - List tl = new List(); + List tl = new List(); tl.Add(rom); outDats[rom.Metadata.SystemID].Files.Add(key, tl); } @@ -2256,10 +2256,10 @@ namespace SabreTools.Helper List keys = userData.Files.Keys.ToList(); foreach (string key in keys) { - List newroms = new List(); - foreach (File rom in userData.Files[key]) + List newroms = new List(); + foreach (Rom rom in userData.Files[key]) { - File newrom = rom; + Rom newrom = rom; string filename = inputs[newrom.Metadata.SystemID].Split('¬')[0]; string rootpath = inputs[newrom.Metadata.SystemID].Split('¬')[1]; diff --git a/SabreTools.Helper/Tools/Output.cs b/SabreTools.Helper/Tools/Output.cs index 74c8517a..67cba923 100644 --- a/SabreTools.Helper/Tools/Output.cs +++ b/SabreTools.Helper/Tools/Output.cs @@ -32,7 +32,7 @@ namespace SabreTools.Helper } // Bucket roms by game name and optionally dedupe - SortedDictionary> sortable = DatTools.BucketByGame(datdata.Files, datdata.MergeRoms, norename, logger); + SortedDictionary> sortable = DatTools.BucketByGame(datdata.Files, datdata.MergeRoms, norename, logger); // Now write out to file // If it's empty, use the current folder @@ -95,11 +95,11 @@ namespace SabreTools.Helper int depth = 2, last = -1; string lastgame = null; List splitpath = new List(); - foreach (List roms in sortable.Values) + foreach (List roms in sortable.Values) { for (int index = 0; index < roms.Count; index++) { - File rom = roms[index]; + Rom rom = roms[index]; List newsplit = rom.Machine.Name.Split('\\').ToList(); // If we have a different game and we're not at the start of the list, output the end of last item @@ -285,7 +285,7 @@ namespace SabreTools.Helper /// Last known depth to cycle back from (SabreDAT only) /// Logger object for file and console output /// The new depth of the tag - public static int WriteStartGame(StreamWriter sw, File rom, List newsplit, string lastgame, Dat datdata, int depth, int last, Logger logger) + public static int WriteStartGame(StreamWriter sw, Rom rom, List newsplit, string lastgame, Dat datdata, int depth, int last, Logger logger) { try { @@ -344,7 +344,7 @@ namespace SabreTools.Helper /// Last known depth to cycle back from (SabreDAT only) /// Logger object for file and console output /// The new depth of the tag - public static int WriteEndGame(StreamWriter sw, File rom, List splitpath, List newsplit, string lastgame, Dat datdata, int depth, out int last, Logger logger) + public static int WriteEndGame(StreamWriter sw, Rom rom, List splitpath, List newsplit, string lastgame, Dat datdata, int depth, out int last, Logger logger) { last = 0; @@ -413,7 +413,7 @@ namespace SabreTools.Helper /// Current depth to output file at (SabreDAT only) /// Logger object for file and console output /// True if the data was written, false on error - public static bool WriteRomData(StreamWriter sw, File rom, string lastgame, Dat datdata, int depth, Logger logger) + public static bool WriteRomData(StreamWriter sw, Rom rom, string lastgame, Dat datdata, int depth, Logger logger) { try { diff --git a/SabreTools.Helper/Tools/RomTools.cs b/SabreTools.Helper/Tools/RomTools.cs index 3a201f37..fe0b760f 100644 --- a/SabreTools.Helper/Tools/RomTools.cs +++ b/SabreTools.Helper/Tools/RomTools.cs @@ -18,15 +18,15 @@ namespace SabreTools.Helper /// True if SHA-1 hashes should not be calcluated, false otherwise /// Populated RomData object if success, empty one on error /// Add read-offset for hash info - public static File GetSingleFileInfo(string input, bool noMD5 = false, bool noSHA1 = false, long offset = 0) + public static Rom GetSingleFileInfo(string input, bool noMD5 = false, bool noSHA1 = false, long offset = 0) { // Add safeguard if file doesn't exist if (!System.IO.File.Exists(input)) { - return new File(); + return new Rom(); } - File rom = new File + Rom rom = new Rom { Name = Path.GetFileName(input), Type = ItemType.Rom, @@ -84,7 +84,7 @@ namespace SabreTools.Helper } catch (IOException) { - return new File(); + return new Rom(); } return rom; @@ -96,19 +96,19 @@ namespace SabreTools.Helper /// List of RomData objects representing the roms to be merged /// Logger object for console and/or file output /// A List of RomData objects representing the merged roms - public static List Merge(List inroms, Logger logger) + public static List Merge(List inroms, Logger logger) { // Check for null or blank roms first if (inroms == null || inroms.Count == 0) { - return new List(); + return new List(); } // Create output list - List outroms = new List(); + List outroms = new List(); // Then deduplicate them by checking to see if data matches previous saved roms - foreach (File rom in inroms) + foreach (Rom rom in inroms) { // If it's a nodump, add and skip if (rom.Nodump) @@ -122,11 +122,11 @@ namespace SabreTools.Helper { // Check if the rom is a duplicate DupeType dupetype = DupeType.None; - File savedrom = new File(); + Rom savedrom = new Rom(); int pos = -1; for (int i = 0; i < outroms.Count; i++) { - File lastrom = outroms[i]; + Rom lastrom = outroms[i]; // Get the duplicate status dupetype = GetDuplicateStatus(rom, lastrom, logger); @@ -194,9 +194,9 @@ namespace SabreTools.Helper /// Logger object for console and/or file output /// True to remove matched roms from the input, false otherwise (default) /// List of matched RomData objects - public static List GetDuplicates(File lastrom, Dat datdata, Logger logger, bool remove = false) + public static List GetDuplicates(Rom lastrom, Dat datdata, Logger logger, bool remove = false) { - List output = new List(); + List output = new List(); // Check for an empty rom list first if (datdata.Files == null || datdata.Files.Count == 0) @@ -208,9 +208,9 @@ namespace SabreTools.Helper List keys = datdata.Files.Keys.ToList(); foreach (string key in keys) { - List roms = datdata.Files[key]; - List left = new List(); - foreach (File rom in roms) + List roms = datdata.Files[key]; + List left = new List(); + foreach (Rom rom in roms) { if (IsDuplicate(rom, lastrom, logger)) { @@ -239,7 +239,7 @@ namespace SabreTools.Helper /// Rom to use as a baseline /// Logger object for console and/or file output /// True if the roms are duplicates, false otherwise - public static bool IsDuplicate(File rom, File lastrom, Logger logger) + public static bool IsDuplicate(Rom rom, Rom lastrom, Logger logger) { bool dupefound = false; @@ -274,7 +274,7 @@ namespace SabreTools.Helper /// Last rom to check against /// Logger object for console and/or file output /// The DupeType corresponding to the relationship between the two - public static DupeType GetDuplicateStatus(File rom, File lastrom, Logger logger) + public static DupeType GetDuplicateStatus(Rom rom, Rom lastrom, Logger logger) { DupeType output = DupeType.None; @@ -319,9 +319,9 @@ namespace SabreTools.Helper /// List of RomData objects representing the roms to be sorted /// True if files are not renamed, false otherwise /// True if it sorted correctly, false otherwise - public static bool Sort(List roms, bool norename) + public static bool Sort(List roms, bool norename) { - roms.Sort(delegate (File x, File y) + roms.Sort(delegate (Rom x, Rom y) { if (x.Metadata.SystemID == y.Metadata.SystemID) { diff --git a/SabreTools.Helper/Tools/Stats.cs b/SabreTools.Helper/Tools/Stats.cs index e96069c8..0f1e8602 100644 --- a/SabreTools.Helper/Tools/Stats.cs +++ b/SabreTools.Helper/Tools/Stats.cs @@ -49,7 +49,7 @@ namespace SabreTools.Helper List games = new List(); Dat datdata = new Dat(); datdata = DatTools.Parse(filename, 0, 0, datdata, _logger); - SortedDictionary> newroms = DatTools.BucketByGame(datdata.Files, false, true, _logger, false); + SortedDictionary> newroms = DatTools.BucketByGame(datdata.Files, false, true, _logger, false); // Output single DAT stats (if asked) if (_single) @@ -116,9 +116,9 @@ Please check the log folder if the stats scrolled offscreen"); datdata.NodumpCount = 0; // Loop through and add - foreach (List roms in datdata.Files.Values) + foreach (List roms in datdata.Files.Values) { - foreach (File rom in roms) + foreach (Rom rom in roms) { datdata.RomCount += (rom.Type == ItemType.Rom ? 1 : 0); datdata.DiskCount += (rom.Type == ItemType.Disk ? 1 : 0); @@ -131,7 +131,7 @@ Please check the log folder if the stats scrolled offscreen"); } } - SortedDictionary> newroms = DatTools.BucketByGame(datdata.Files, false, true, logger, false); + SortedDictionary> newroms = DatTools.BucketByGame(datdata.Files, false, true, logger, false); if (datdata.TotalSize < 0) { datdata.TotalSize = Int64.MaxValue + datdata.TotalSize; diff --git a/SabreTools/DATFromDir.cs b/SabreTools/DATFromDir.cs index a49b3996..9feafab8 100644 --- a/SabreTools/DATFromDir.cs +++ b/SabreTools/DATFromDir.cs @@ -170,7 +170,7 @@ namespace SabreTools if (!items) { string actualroot = item.Remove(0, basePathBackup.Length); - Helper.File rom = new Helper.File + Helper.Rom rom = new Helper.Rom { Name = "null", Machine = new Machine @@ -197,7 +197,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _datdata.Files.Add(key, temp); } @@ -209,7 +209,7 @@ namespace SabreTools if (Directory.EnumerateFiles(subdir, "*", SearchOption.AllDirectories).Count() == 0) { string actualroot = subdir.Remove(0, basePathBackup.Length); - Helper.File rom = new Helper.File + Helper.Rom rom = new Helper.Rom { Name = "null", Machine = new Machine @@ -236,7 +236,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _datdata.Files.Add(key, temp); } @@ -259,10 +259,10 @@ namespace SabreTools List keys = _datdata.Files.Keys.ToList(); foreach (string key in keys) { - List roms = _datdata.Files[key]; + List roms = _datdata.Files[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; // If we're in a mode that doesn't allow for actual empty folders, add the blank info if (_datdata.OutputFormat != OutputFormat.SabreDat && _datdata.OutputFormat != OutputFormat.MissFile) @@ -284,7 +284,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _datdata.Files.Add(inkey, temp); } @@ -318,7 +318,7 @@ namespace SabreTools // If we had roms but not blanks (and not in Romba mode), create an artifical rom for the purposes of outputting if (lastparent != null && _datdata.Files.Count == 0) { - _datdata.Files.Add("temp", new List()); + _datdata.Files.Add("temp", new List()); } } @@ -346,7 +346,7 @@ namespace SabreTools // Special case for if we are in Romba mode (all names are supposed to be SHA-1 hashes) if (_datdata.Romba) { - Helper.File rom = ArchiveTools.GetTorrentGZFileInfo(item, _logger); + Helper.Rom rom = ArchiveTools.GetTorrentGZFileInfo(item, _logger); // If the rom is valid, write it out if (rom.Name != null) @@ -362,7 +362,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _datdata.Files.Add(key, temp); } @@ -391,8 +391,8 @@ namespace SabreTools // If we have an archive, scan it if (type != null) { - List extracted = ArchiveTools.GetArchiveFileInfo(item, _logger); - foreach (Helper.File rom in extracted) + List extracted = ArchiveTools.GetArchiveFileInfo(item, _logger); + foreach (Helper.Rom rom in extracted) { lastparent = ProcessFileHelper(item, rom, sw, _basePath, Path.Combine((Path.GetDirectoryName(Path.GetFullPath(item)) + Path.DirectorySeparatorChar).Remove(0, _basePath.Length) + @@ -462,7 +462,7 @@ namespace SabreTools private string ProcessFile(string item, StreamWriter sw, string basepath, string parent, Dat datdata, string lastparent) { _logger.Log(Path.GetFileName(item) + " treated like a file"); - Helper.File rom = RomTools.GetSingleFileInfo(item, _noMD5, _noSHA1); + Helper.Rom rom = RomTools.GetSingleFileInfo(item, _noMD5, _noSHA1); return ProcessFileHelper(item, rom, sw, basepath, parent, datdata, lastparent); } @@ -478,7 +478,7 @@ namespace SabreTools /// DatData object with output information /// Last known parent game name /// New last known parent game name - private string ProcessFileHelper(string item, Helper.File rom, StreamWriter sw, string basepath, string parent, Dat datdata, string lastparent) + private string ProcessFileHelper(string item, Helper.Rom rom, StreamWriter sw, string basepath, string parent, Dat datdata, string lastparent) { try { @@ -537,7 +537,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _datdata.Files.Add(key, temp); } diff --git a/SabreTools/ImportExport/GenerateTwo.cs b/SabreTools/ImportExport/GenerateTwo.cs index 08aaadb0..4a157fe0 100644 --- a/SabreTools/ImportExport/GenerateTwo.cs +++ b/SabreTools/ImportExport/GenerateTwo.cs @@ -188,11 +188,11 @@ namespace SabreTools List keys = datdata.Files.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List newroms = datdata.Files[key]; + List temp = new List(); + List newroms = datdata.Files[key]; for (int i = 0; i < newroms.Count; i++) { - Helper.File rom = newroms[i]; + Helper.Rom rom = newroms[i]; // In the case that the RomData is incomplete, skip it if (rom.Name == null || rom.Machine.Name == null) diff --git a/SabreTools/OfflineMerge.cs b/SabreTools/OfflineMerge.cs index 58d0ad84..bae715d8 100644 --- a/SabreTools/OfflineMerge.cs +++ b/SabreTools/OfflineMerge.cs @@ -63,11 +63,11 @@ namespace SabreTools // Now get Net New output dictionary [(currentNewMerged)-(currentAllMerged)] _logger.User("Creating and populating Net New dictionary"); - Dictionary> netNew = new Dictionary>(); + Dictionary> netNew = new Dictionary>(); foreach (string key in completeDats.Files.Keys) { - List templist = RomTools.Merge(completeDats.Files[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(completeDats.Files[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentNewMerged) { @@ -77,7 +77,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); netNew.Add(key, temp); } @@ -87,11 +87,11 @@ namespace SabreTools // Now create the Unneeded dictionary [(currentAllMerged)-(currentNewMerged)] _logger.User("Creating and populating Uneeded dictionary"); - Dictionary> unneeded = new Dictionary>(); + Dictionary> unneeded = new Dictionary>(); foreach (string key in completeDats.Files.Keys) { - List templist = RomTools.Merge(completeDats.Files[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(completeDats.Files[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentAllMerged) { @@ -101,7 +101,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); unneeded.Add(key, temp); } @@ -124,11 +124,11 @@ namespace SabreTools midMissing.Files.Add(key, unneeded[key]); } } - Dictionary> newMissing = new Dictionary>(); + Dictionary> newMissing = new Dictionary>(); foreach (string key in midMissing.Files.Keys) { - List templist = RomTools.Merge(midMissing.Files[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(midMissing.Files[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentMissingMerged) { @@ -138,7 +138,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); newMissing.Add(key, temp); } @@ -159,7 +159,7 @@ namespace SabreTools // Now create the Have dictionary [(currentNewMerged)-(c)] _logger.User("Creating and populating Have dictionary"); - Dictionary> midHave = new Dictionary>(); + Dictionary> midHave = new Dictionary>(); foreach (string key in newMissing.Keys) { if (midHave.ContainsKey(key)) @@ -175,7 +175,7 @@ namespace SabreTools { if (midHave.ContainsKey(key)) { - foreach (Helper.File rom in completeDats.Files[key]) + foreach (Helper.Rom rom in completeDats.Files[key]) { if (rom.Metadata.System == _currentNewMerged) { @@ -185,8 +185,8 @@ namespace SabreTools } else { - List roms = new List(); - foreach (Helper.File rom in completeDats.Files[key]) + List roms = new List(); + foreach (Helper.Rom rom in completeDats.Files[key]) { if (rom.Metadata.System == _currentNewMerged) { @@ -196,11 +196,11 @@ namespace SabreTools midHave.Add(key, roms); } } - Dictionary> have = new Dictionary>(); + Dictionary> have = new Dictionary>(); foreach (string key in midHave.Keys) { - List templist = RomTools.Merge(midHave[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(midHave[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentNewMerged) { @@ -210,7 +210,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); have.Add(key, temp); } @@ -225,11 +225,11 @@ namespace SabreTools List keys = netNew.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = netNew[key]; + List temp = new List(); + List roms = netNew[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; @@ -243,11 +243,11 @@ namespace SabreTools keys = unneeded.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = unneeded[key]; + List temp = new List(); + List roms = unneeded[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; @@ -261,11 +261,11 @@ namespace SabreTools keys = newMissing.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = newMissing[key]; + List temp = new List(); + List roms = newMissing[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; @@ -279,11 +279,11 @@ namespace SabreTools keys = have.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = have[key]; + List temp = new List(); + List roms = have[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; @@ -364,11 +364,11 @@ namespace SabreTools Dat midHave = new Dat(); midHave = DatTools.Parse(_currentMissingMerged, 0, 0, midHave, _logger); midHave = DatTools.Parse(_currentAllMerged, 0, 0, midHave, _logger); - Dictionary> have = new Dictionary>(); + Dictionary> have = new Dictionary>(); foreach (string key in midHave.Files.Keys) { - List templist = RomTools.Merge(midHave.Files[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(midHave.Files[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentAllMerged) { @@ -378,7 +378,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); have.Add(key, temp); } @@ -393,11 +393,11 @@ namespace SabreTools List keys = have.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = have[key]; + List temp = new List(); + List roms = have[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; @@ -434,11 +434,11 @@ namespace SabreTools Dat midHave = new Dat(); midHave = DatTools.Parse(_currentMissingMerged, 0, 0, midHave, _logger); midHave = DatTools.Parse(_currentNewMerged, 0, 0, midHave, _logger); - Dictionary> have = new Dictionary>(); + Dictionary> have = new Dictionary>(); foreach (string key in midHave.Files.Keys) { - List templist = RomTools.Merge(midHave.Files[key], _logger); - foreach (Helper.File rom in templist) + List templist = RomTools.Merge(midHave.Files[key], _logger); + foreach (Helper.Rom rom in templist) { if (rom.Dupe == DupeType.None && rom.Metadata.System == _currentNewMerged) { @@ -448,7 +448,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); have.Add(key, temp); } @@ -463,11 +463,11 @@ namespace SabreTools List keys = have.Keys.ToList(); foreach (string key in keys) { - List temp = new List(); - List roms = have[key]; + List temp = new List(); + List roms = have[key]; for (int i = 0; i < roms.Count; i++) { - Helper.File rom = roms[i]; + Helper.Rom rom = roms[i]; rom.HashData.Size = Constants.SizeZero; rom.HashData.CRC = Constants.CRCZero; rom.HashData.MD5 = Constants.MD5Zero; diff --git a/SabreTools/Partials/SabreTools_Inits.cs b/SabreTools/Partials/SabreTools_Inits.cs index 3e33583f..91f6c4e7 100644 --- a/SabreTools/Partials/SabreTools_Inits.cs +++ b/SabreTools/Partials/SabreTools_Inits.cs @@ -411,7 +411,7 @@ namespace SabreTools OutputFormat = (old ? OutputFormat.ClrMamePro : OutputFormat.Xml), Romba = romba, Type = (superdat ? "SuperDAT" : ""), - Files = new Dictionary>(), + Files = new Dictionary>(), }; DATFromDir dfd = new DATFromDir(inputs, datdata, noMD5, noSHA1, bare, archivesAsFiles, enableGzip, tempDir, _logger); bool success = dfd.Start(); diff --git a/SabreTools/Split.cs b/SabreTools/Split.cs index da9b3880..08bd3989 100644 --- a/SabreTools/Split.cs +++ b/SabreTools/Split.cs @@ -155,7 +155,7 @@ namespace SabreTools ForcePacking = datdata.ForcePacking, OutputFormat = outputFormat, MergeRoms = datdata.MergeRoms, - Files = new Dictionary>(), + Files = new Dictionary>(), }; Dat sha1 = new Dat { @@ -177,7 +177,7 @@ namespace SabreTools ForcePacking = datdata.ForcePacking, OutputFormat = outputFormat, MergeRoms = datdata.MergeRoms, - Files = new Dictionary>(), + Files = new Dictionary>(), }; Dat md5 = new Dat { @@ -199,7 +199,7 @@ namespace SabreTools ForcePacking = datdata.ForcePacking, OutputFormat = outputFormat, MergeRoms = datdata.MergeRoms, - Files = new Dictionary>(), + Files = new Dictionary>(), }; Dat crc = new Dat { @@ -221,15 +221,15 @@ namespace SabreTools ForcePacking = datdata.ForcePacking, OutputFormat = outputFormat, MergeRoms = datdata.MergeRoms, - Files = new Dictionary>(), + Files = new Dictionary>(), }; // Now populate each of the DAT objects in turn List keys = datdata.Files.Keys.ToList(); foreach (string key in keys) { - List roms = datdata.Files[key]; - foreach (Helper.File rom in roms) + List roms = datdata.Files[key]; + foreach (Helper.Rom rom in roms) { // If the file is a nodump if (rom.Nodump) @@ -240,7 +240,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); nodump.Files.Add(key, temp); } @@ -254,7 +254,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); sha1.Files.Add(key, temp); } @@ -268,7 +268,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); md5.Files.Add(key, temp); } @@ -282,7 +282,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); crc.Files.Add(key, temp); } @@ -351,7 +351,7 @@ namespace SabreTools Homepage = datdata.Homepage, Url = datdata.Url, Comment = datdata.Comment, - Files = new Dictionary>(), + Files = new Dictionary>(), OutputFormat = outputFormat, }; Dat datdataB = new Dat @@ -367,7 +367,7 @@ namespace SabreTools Homepage = datdata.Homepage, Url = datdata.Url, Comment = datdata.Comment, - Files = new Dictionary>(), + Files = new Dictionary>(), OutputFormat = outputFormat, }; @@ -380,7 +380,7 @@ namespace SabreTools // Now separate the roms accordingly foreach (string key in datdata.Files.Keys) { - foreach (Helper.File rom in datdata.Files[key]) + foreach (Helper.Rom rom in datdata.Files[key]) { if (_extA.Contains(Path.GetExtension(rom.Name.ToUpperInvariant()))) { @@ -390,7 +390,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdataA.Files.Add(key, temp); } @@ -403,7 +403,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdataB.Files.Add(key, temp); } @@ -416,7 +416,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdataA.Files.Add(key, temp); } @@ -426,7 +426,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); datdataB.Files.Add(key, temp); } diff --git a/SimpleSort/SimpleSort.cs b/SimpleSort/SimpleSort.cs index 884ffbd9..afe0a18a 100644 --- a/SimpleSort/SimpleSort.cs +++ b/SimpleSort/SimpleSort.cs @@ -69,7 +69,7 @@ namespace SabreTools _cursorLeft = Console.CursorLeft; _matched = new Dat { - Files = new Dictionary>(), + Files = new Dictionary>(), }; } @@ -358,7 +358,7 @@ namespace SabreTools // Setup the fixdat _matched = (Dat)_datdata.CloneHeader(); - _matched.Files = new Dictionary>(); + _matched.Files = new Dictionary>(); _matched.FileName = "fixDat_" + _matched.FileName; _matched.Name = "fixDat_" + _matched.Name; _matched.Description = "fixDat_" + _matched.Description; @@ -366,10 +366,10 @@ namespace SabreTools // Now that all files are parsed, get only files found in directory bool found = false; - foreach (List roms in _datdata.Files.Values) + foreach (List roms in _datdata.Files.Values) { - List newroms = RomTools.Merge(roms, _logger); - foreach (Helper.File rom in newroms) + List newroms = RomTools.Merge(roms, _logger); + foreach (Helper.Rom rom in newroms) { if (rom.Metadata.SourceID == 99) { @@ -381,7 +381,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); _matched.Files.Add(key, temp); } @@ -492,7 +492,7 @@ namespace SabreTools // Hash and match the external files if (shouldExternalScan) { - Helper.File rom = RomTools.GetSingleFileInfo(input); + Helper.Rom rom = RomTools.GetSingleFileInfo(input); // If we have a blank RomData, it's an error if (rom.Name == null) @@ -501,9 +501,9 @@ namespace SabreTools } // Try to find the matches to the file that was found - List foundroms = RomTools.GetDuplicates(rom, _datdata, _logger, true); + List foundroms = RomTools.GetDuplicates(rom, _datdata, _logger, true); _logger.Log("File '" + input + "' had " + foundroms.Count + " matches in the DAT!"); - foreach (Helper.File found in foundroms) + foreach (Helper.Rom found in foundroms) { _logger.Log("Matched name: " + found.Name); @@ -515,7 +515,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(found); _matched.Files.Add(key, temp); } @@ -558,7 +558,7 @@ namespace SabreTools // Otherwise, apply the rule ot the file string newinput = input + ".new"; Skippers.TransformFile(input, newinput, rule, _logger); - Helper.File drom = RomTools.GetSingleFileInfo(newinput); + Helper.Rom drom = RomTools.GetSingleFileInfo(newinput); // If we have a blank RomData, it's an error if (drom.Name == null) @@ -567,9 +567,9 @@ namespace SabreTools } // Try to find the matches to the file that was found - List founddroms = RomTools.GetDuplicates(drom, _datdata, _logger, true); + List founddroms = RomTools.GetDuplicates(drom, _datdata, _logger, true); _logger.Log("File '" + newinput + "' had " + founddroms.Count + " matches in the DAT!"); - foreach (Helper.File found in founddroms) + foreach (Helper.Rom found in founddroms) { // Add rom to the matched list string key = found.HashData.Size + "-" + found.HashData.CRC; @@ -579,7 +579,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(found); _matched.Files.Add(key, temp); } @@ -616,7 +616,7 @@ namespace SabreTools } // Then output the headered rom (renamed) - Helper.File newfound = found; + Helper.Rom newfound = found; newfound.Name = Path.GetFileNameWithoutExtension(newfound.Name) + " (" + rom.HashData.CRC + ")" + Path.GetExtension(newfound.Name); // Add rom to the matched list @@ -627,7 +627,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(newfound); _matched.Files.Add(key, temp); } @@ -681,18 +681,18 @@ namespace SabreTools if (_quickScan) { _logger.Log("Beginning quick scan of contents from '" + input + "'"); - List internalRomData = ArchiveTools.GetArchiveFileInfo(input, _logger); + List internalRomData = ArchiveTools.GetArchiveFileInfo(input, _logger); _logger.Log(internalRomData.Count + " entries found in '" + input + "'"); // If the list is populated, then the file was a filled archive if (internalRomData.Count > 0) { - foreach (Helper.File rom in internalRomData) + foreach (Helper.Rom rom in internalRomData) { // Try to find the matches to the file that was found - List foundroms = RomTools.GetDuplicates(rom, _datdata, _logger, true); + List foundroms = RomTools.GetDuplicates(rom, _datdata, _logger, true); _logger.Log("File '" + rom.Name + "' had " + foundroms.Count + " matches in the DAT!"); - foreach (Helper.File found in foundroms) + foreach (Helper.Rom found in foundroms) { // Add rom to the matched list string key = found.HashData.Size + "-" + found.HashData.CRC; @@ -702,7 +702,7 @@ namespace SabreTools } else { - List temp = new List(); + List temp = new List(); temp.Add(found); _matched.Files.Add(key, temp); } @@ -825,11 +825,11 @@ namespace SabreTools } // Now process the inputs (assumed that it's archived sets as of right now - Dictionary> scanned = new Dictionary>(); + Dictionary> scanned = new Dictionary>(); foreach (string archive in Directory.EnumerateFiles(_outdir, "*", SearchOption.AllDirectories)) { // If we are in quickscan, get the list of roms that way - List roms = new List(); + List roms = new List(); if (_quickScan) { roms = ArchiveTools.GetArchiveFileInfo(Path.GetFullPath(archive), _logger); @@ -849,7 +849,7 @@ namespace SabreTools } // Then add each of the found files to the new dictionary - foreach (Helper.File rom in roms) + foreach (Helper.Rom rom in roms) { string key = rom.HashData.Size + "-" + rom.HashData.CRC; if (scanned.ContainsKey(key)) @@ -858,7 +858,7 @@ namespace SabreTools } else { - List templist = new List(); + List templist = new List(); templist.Add(rom); scanned.Add(key, templist); } @@ -872,7 +872,7 @@ namespace SabreTools } // Now that we have all of the from DAT and from folder roms, we try to match them, removing the perfect matches - Dictionary> remove = new Dictionary>(); + Dictionary> remove = new Dictionary>(); foreach (string key in scanned.Keys) { // If the key doesn't even exist in the DAT, then mark the entire key for removal @@ -890,9 +890,9 @@ namespace SabreTools // Otherwise check each of the values individually else { - List romsList = _datdata.Files[key]; - List scannedList = scanned[key]; - foreach (Helper.File rom in scannedList) + List romsList = _datdata.Files[key]; + List scannedList = scanned[key]; + foreach (Helper.Rom rom in scannedList) { if (!romsList.Contains(rom)) { @@ -902,7 +902,7 @@ namespace SabreTools } else { - List templist = new List(); + List templist = new List(); templist.Add(rom); remove.Add(key, templist); }