From 61c79b6b59cba7d8013c243db8d50e60e3047c48 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Thu, 1 Sep 2016 23:41:19 -0700 Subject: [PATCH] [ALL] Move object classes to DLL --- .../Objects}/DATFromDir.cs | 0 .../Objects}/DATFromDirParallel.cs | 0 .../Objects}/Generate.cs | 72 +++++++------ .../Objects}/GenerateTwo.cs | 0 .../Objects}/Import.cs | 102 +++++++++--------- .../Objects}/ImportTwo.cs | 0 .../Objects}/OfflineMerge.cs | 0 .../Objects}/Split.cs | 0 SabreTools.Helper/{Tools => Objects}/Stats.cs | 0 SabreTools.Helper/SabreTools.Helper.csproj | 11 +- SabreTools/SabreTools.csproj | 6 -- 11 files changed, 101 insertions(+), 90 deletions(-) rename {SabreTools => SabreTools.Helper/Objects}/DATFromDir.cs (100%) rename {SabreTools => SabreTools.Helper/Objects}/DATFromDirParallel.cs (100%) rename {SabreTools/ImportExport => SabreTools.Helper/Objects}/Generate.cs (88%) rename {SabreTools/ImportExport => SabreTools.Helper/Objects}/GenerateTwo.cs (100%) rename {SabreTools/ImportExport => SabreTools.Helper/Objects}/Import.cs (83%) rename {SabreTools/ImportExport => SabreTools.Helper/Objects}/ImportTwo.cs (100%) rename {SabreTools => SabreTools.Helper/Objects}/OfflineMerge.cs (100%) rename {SabreTools => SabreTools.Helper/Objects}/Split.cs (100%) rename SabreTools.Helper/{Tools => Objects}/Stats.cs (100%) diff --git a/SabreTools/DATFromDir.cs b/SabreTools.Helper/Objects/DATFromDir.cs similarity index 100% rename from SabreTools/DATFromDir.cs rename to SabreTools.Helper/Objects/DATFromDir.cs diff --git a/SabreTools/DATFromDirParallel.cs b/SabreTools.Helper/Objects/DATFromDirParallel.cs similarity index 100% rename from SabreTools/DATFromDirParallel.cs rename to SabreTools.Helper/Objects/DATFromDirParallel.cs diff --git a/SabreTools/ImportExport/Generate.cs b/SabreTools.Helper/Objects/Generate.cs similarity index 88% rename from SabreTools/ImportExport/Generate.cs rename to SabreTools.Helper/Objects/Generate.cs index 42ea4f19..803a5510 100644 --- a/SabreTools/ImportExport/Generate.cs +++ b/SabreTools.Helper/Objects/Generate.cs @@ -153,7 +153,7 @@ namespace SabreTools } // Retrieve the list of processed roms - Dictionary> dict = ProcessRoms(); + Dictionary> dict = ProcessRoms(); // If the output is null, nothing was found so return false if (dict.Count == 0) @@ -166,7 +166,7 @@ namespace SabreTools string intname = systemname + " (" + sourcename + ")"; string datname = systemname + " (" + sourcename + " " + version + ")"; - DatData datdata = new DatData + Dat datdata = new Dat { Name = intname, Description = datname, @@ -176,19 +176,19 @@ namespace SabreTools Author = "The Wizard of DATz", ForcePacking = ForcePacking.None, OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), - Roms = dict, + Files = dict, }; - return Output.WriteDatfile(datdata, _outdir, _logger); + return DatTools.WriteDatfile(datdata, _outdir, _logger); } /// /// Preprocess the rom data that is to be included in the outputted DAT /// - /// A List of RomData objects containing all information about the files - public Dictionary> ProcessRoms() + /// A List of Rom objects containing all information about the files + public Dictionary> ProcessRoms() { - Dictionary> roms = new Dictionary>(); + Dictionary> roms = new Dictionary>(); // Check if we have listed sources or systems bool sysmerged = (_systems == "" || _systems.Split(',').Length > 1); @@ -236,39 +236,47 @@ JOIN checksums // Retrieve and process the roms for merging while (sldr.Read()) { - RomData temp = new RomData + Rom temp = new Rom { - Manufacturer = sldr.GetString(0), - System = sldr.GetString(1), - SystemID = sldr.GetInt32(2), - Source = sldr.GetString(3), - URL = sldr.GetString(4), - SourceID = sldr.GetInt32(5), - Game = sldr.GetString(6), Name = sldr.GetString(7), - Type = sldr.GetString(8), - Size = sldr.GetInt64(9), - CRC = sldr.GetString(10), - MD5 = sldr.GetString(11), - SHA1 = sldr.GetString(12), + Type = (sldr.GetString(8) == "disk" ? ItemType.Disk : ItemType.Rom), + Machine = new Machine + { + Name = sldr.GetString(6), + Manufacturer = sldr.GetString(0), + }, + Metadata = new SourceMetadata + { + System = sldr.GetString(1), + SystemID = sldr.GetInt32(2), + Source = sldr.GetString(3), + SourceID = sldr.GetInt32(5), + }, + HashData = new Hash + { + Size = sldr.GetInt64(9), + CRC = sldr.GetString(10), + MD5 = sldr.GetString(11), + SHA1 = sldr.GetString(12), + }, }; // Rename the game associated if it's still valid and we allow renames if (merged && !_norename) { - temp.Game = temp.Game + - (sysmerged ? " [" + temp.Manufacturer + " - " + temp.System + "]" : "") + - (srcmerged ? " [" + temp.Source + "]" : ""); + temp.Machine.Name = temp.Machine.Name + + (sysmerged ? " [" + temp.Machine.Manufacturer + " - " + temp.Metadata.System + "]" : "") + + (srcmerged ? " [" + temp.Metadata.Source + "]" : ""); } - string key = temp.Size + "-" + temp.CRC; + string key = temp.HashData.Size + "-" + temp.HashData.CRC; if (roms.ContainsKey(key)) { roms[key].Add(temp); } else { - List templist = new List(); + List templist = new List(); templist.Add(temp); roms.Add(key, templist); } @@ -336,7 +344,7 @@ JOIN source // If the hash is different than the last if (lastid != -1 && sldr.GetInt64(0) != lastid) { - RomData temp = new RomData + Rom temp = new Rom { Manufacturer = manufacturer, System = system, @@ -356,7 +364,7 @@ JOIN source // Rename the game associated if it's still valid and we allow renames if (merged && !_norename) { - temp.Game = temp.Game + + temp.Machine = temp.Machine + (sysmerged ? " [" + temp.Manufacturer + " - " + temp.System + "]" : "") + (srcmerged ? " [" + temp.Source + "]" : ""); } @@ -368,7 +376,7 @@ JOIN source } else { - List templist = new List(); + List templist = new List(); templist.Add(temp); roms.Add(key, templist); } @@ -427,7 +435,7 @@ JOIN source string lastname = "", lastgame = ""; for (int i = 0; i < roms.Count; i++) { - RomData rom = roms[i]; + Rom rom = roms[i]; // Now relable any roms that have the same name inside of the same game bool samename = false, samegame = false; @@ -435,13 +443,13 @@ JOIN source { samename = (lastname == rom.Name); } - if (rom.Game != "") + if (rom.Machine != "") { - samegame = (lastgame == rom.Game); + samegame = (lastgame == rom.Machine); } lastname = rom.Name; - lastgame = rom.Game; + lastgame = rom.Machine; // If the name and set are the same, rename it with whatever is different if (samename && samegame) diff --git a/SabreTools/ImportExport/GenerateTwo.cs b/SabreTools.Helper/Objects/GenerateTwo.cs similarity index 100% rename from SabreTools/ImportExport/GenerateTwo.cs rename to SabreTools.Helper/Objects/GenerateTwo.cs diff --git a/SabreTools/ImportExport/Import.cs b/SabreTools.Helper/Objects/Import.cs similarity index 83% rename from SabreTools/ImportExport/Import.cs rename to SabreTools.Helper/Objects/Import.cs index 73207ecb..ccf30502 100644 --- a/SabreTools/ImportExport/Import.cs +++ b/SabreTools.Helper/Objects/Import.cs @@ -150,12 +150,12 @@ namespace SabreTools switch (type) { case DatType.Good: - if (!Remapping.DatMaps["Good"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["Good"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection goodInfo = Regex.Match(Remapping.DatMaps["Good"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection goodInfo = Regex.Match(Mappings.DatMaps["Good"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = goodInfo[1].Value; system = goodInfo[2].Value; @@ -163,12 +163,12 @@ namespace SabreTools date = File.GetLastWriteTime(_filepath).ToString("yyyy-MM-dd HH:mm:ss"); break; case DatType.MAME: - if (!Remapping.DatMaps["MAME"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["MAME"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection mameInfo = Regex.Match(Remapping.DatMaps["MAME"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection mameInfo = Regex.Match(Mappings.DatMaps["MAME"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = mameInfo[1].Value; system = mameInfo[2].Value; @@ -176,12 +176,12 @@ namespace SabreTools date = File.GetLastWriteTime(_filepath).ToString("yyyy-MM-dd HH:mm:ss"); break; case DatType.MaybeIntro: - if (!Remapping.DatMaps["MaybeIntro"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["MaybeIntro"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection maybeIntroInfo = Regex.Match(Remapping.DatMaps["MaybeIntro"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection maybeIntroInfo = Regex.Match(Mappings.DatMaps["MaybeIntro"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = maybeIntroInfo[1].Value; system = maybeIntroInfo[2].Value; @@ -191,12 +191,12 @@ namespace SabreTools date = miDateInfo[1].Value + "-" + miDateInfo[2].Value + "-" + miDateInfo[3].Value + " 00:00:00"; break; case DatType.NoIntro: - if (!Remapping.DatMaps["NoIntro"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["NoIntro"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection nointroInfo = Regex.Match(Remapping.DatMaps["NoIntro"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection nointroInfo = Regex.Match(Mappings.DatMaps["NoIntro"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = nointroInfo[1].Value; system = nointroInfo[2].Value; @@ -220,12 +220,12 @@ namespace SabreTools } break; case DatType.NonGood: - if (!Remapping.DatMaps["NonGood"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["NonGood"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection nonGoodInfo = Regex.Match(Remapping.DatMaps["NonGood"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection nonGoodInfo = Regex.Match(Mappings.DatMaps["NonGood"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = nonGoodInfo[1].Value; system = nonGoodInfo[2].Value; @@ -233,18 +233,18 @@ namespace SabreTools date = File.GetLastWriteTime(_filepath).ToString("yyyy-MM-dd HH:mm:ss"); break; case DatType.Redump: - if (!Remapping.DatMaps["Redump"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["Redump"].ContainsKey(fileinfo[1].Value)) { // Handle special case mappings found only in Redump fileinfo = Regex.Match(filename, Constants.RedumpBiosPattern).Groups; - if (!Remapping.DatMaps["Redump"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["Redump"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } } - GroupCollection redumpInfo = Regex.Match(Remapping.DatMaps["Redump"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection redumpInfo = Regex.Match(Mappings.DatMaps["Redump"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = redumpInfo[1].Value; system = redumpInfo[2].Value; @@ -264,23 +264,23 @@ namespace SabreTools break; case DatType.TOSEC: - if (!Remapping.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) { // Handle special case mappings found only in TOSEC fileinfo = Regex.Match(filename, Constants.TosecSpecialPatternA).Groups; - if (!Remapping.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) { fileinfo = Regex.Match(filename, Constants.TosecSpecialPatternB).Groups; - if (!Remapping.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["TOSEC"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } } } - GroupCollection tosecInfo = Regex.Match(Remapping.DatMaps["TOSEC"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection tosecInfo = Regex.Match(Mappings.DatMaps["TOSEC"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = tosecInfo[1].Value; system = tosecInfo[2].Value; @@ -290,12 +290,12 @@ namespace SabreTools date = toDateInfo[1].Value + "-" + toDateInfo[2].Value + "-" + toDateInfo[3].Value + " 00:00:00"; break; case DatType.TruRip: - if (!Remapping.DatMaps["TruRip"].ContainsKey(fileinfo[1].Value)) + if (!Mappings.DatMaps["TruRip"].ContainsKey(fileinfo[1].Value)) { _logger.Warning("The filename " + fileinfo[1].Value + " could not be mapped! Please check the mappings and try again"); return false; } - GroupCollection truripInfo = Regex.Match(Remapping.DatMaps["TruRip"][fileinfo[1].Value], Constants.RemappedPattern).Groups; + GroupCollection truripInfo = Regex.Match(Mappings.DatMaps["TruRip"][fileinfo[1].Value], Constants.RemappedPattern).Groups; manufacturer = truripInfo[1].Value; system = truripInfo[2].Value; @@ -366,31 +366,31 @@ namespace SabreTools } // Get all roms that are found in the DAT to see what needs to be added - DatData datdata = new DatData(); + Dat datdata = new Dat(); datdata = DatTools.Parse(_filepath, sysid, srcid, datdata, _logger); // Sort inputted roms into games - SortedDictionary> sortable = new SortedDictionary>(); + SortedDictionary> sortable = new SortedDictionary>(); long count = 0; - foreach (List roms in datdata.Roms.Values) + foreach (List roms in datdata.Files.Values) { - List newroms = roms; + List newroms = roms; if (datdata.MergeRoms) { newroms = RomTools.Merge(newroms, _logger); } - foreach (RomData rom in newroms) + foreach (Rom rom in newroms) { count++; - string key = rom.SystemID.ToString().PadLeft(10, '0') + "-" + rom.SourceID.ToString().PadLeft(10, '0') + "-" + rom.Game.ToLowerInvariant(); + string key = rom.Metadata.SystemID.ToString().PadLeft(10, '0') + "-" + rom.Metadata.SourceID.ToString().PadLeft(10, '0') + "-" + rom.Machine.Name.ToLowerInvariant(); if (sortable.ContainsKey(key)) { sortable[key].Add(rom); } else { - List temp = new List(); + List temp = new List(); temp.Add(rom); sortable.Add(key, temp); } @@ -400,7 +400,7 @@ namespace SabreTools // Loop over all roms, checking for adds foreach (string key in sortable.Keys) { - List roms = sortable[key]; + List roms = sortable[key]; RomTools.Sort(roms, true); long gameid = -1; @@ -409,9 +409,9 @@ namespace SabreTools dbc.Open(); // For each game, check for a new ID - gameid = AddGame(sysid, roms[0].Game, srcid, dbc); + gameid = AddGame(sysid, roms[0].Machine.Name, srcid, dbc); - foreach (RomData rom in roms) + foreach (Rom rom in roms) { // BEGIN COMMENT // Try to add the rom with the game information @@ -492,12 +492,12 @@ namespace SabreTools /// /// Add a file to the database if it doesn't already exist /// - /// RomData object representing the rom + /// Rom object representing the rom /// ID of the parent game to be mapped to /// Last updated date /// SQLite database connection to use /// True if the file exists or could be added, false on error - private bool AddRom(RomData rom, long gameid, string date, SqliteConnection dbc) + private bool AddRom(Rom rom, long gameid, string date, SqliteConnection dbc) { // WOD origninally stripped out any subdirs from the imported files, we do the same rom.Name = Path.GetFileName(rom.Name); @@ -507,9 +507,9 @@ namespace SabreTools rom.Name = Style.RussianToLatin(rom.Name); rom.Name = Regex.Replace(rom.Name, @"(.*) \.(.*)", "$1.$2"); - if (rom.Type != "rom" && rom.Type != "disk") + if (rom.Type != ItemType.Rom && rom.Type != ItemType.Disk) { - rom.Type = "rom"; + rom.Type = ItemType.Rom; } // Check to see if this exact file is in the database already @@ -520,10 +520,10 @@ SELECT files.id FROM files WHERE files.name='" + rom.Name.Replace("'", "''") + @"' AND files.type='" + rom.Type + @"' AND files.setid=" + gameid + - " AND checksums.size=" + rom.Size + - " AND checksums.crc='" + rom.CRC + "'" + - " AND checksums.md5='" + rom.MD5 + "'" + - " AND checksums.sha1='" + rom.SHA1 + "'"; + " AND checksums.size=" + rom.HashData.Size + + " AND checksums.crc='" + rom.HashData.CRC + "'" + + " AND checksums.md5='" + rom.HashData.MD5 + "'" + + " AND checksums.sha1='" + rom.HashData.SHA1 + "'"; using (SqliteCommand slc = new SqliteCommand(query, dbc)) { @@ -536,7 +536,7 @@ SELECT files.id FROM files INSERT INTO files (setid, name, type, lastupdated) VALUES (" + gameid + ", '" + rom.Name.Replace("'", "''") + "', '" + rom.Type + "', '" + date + @"'); INSERT INTO checksums (file, size, crc, md5, sha1) -VALUES ((SELECT last_insertConstants.Rowid()), " + rom.Size + ", '" + rom.CRC + "'" + ", '" + rom.MD5 + "'" + ", '" + rom.SHA1 + @"'); +VALUES ((SELECT last_insertConstants.Rowid()), " + rom.HashData.Size + ", '" + rom.HashData.CRC + "'" + ", '" + rom.HashData.MD5 + "'" + ", '" + rom.HashData.SHA1 + @"'); COMMIT;"; using (SqliteCommand slc2 = new SqliteCommand(query, dbc)) { @@ -559,28 +559,28 @@ COMMIT;"; /// /// Add a hash to the database if it doesn't exist already /// - /// RomData object representing the rom + /// Rom object representing the rom /// System ID for the game to be added with /// Source ID for the game to be added with /// Last updated date /// SQLite database connection to use /// True if the hash exists or could be added, false on error /// This is currently unused. It is a test method for the new SabreTools DB schema - private bool AddHash(RomData rom, int sysid, int srcid, string date, SqliteConnection dbc) + private bool AddHash(Rom rom, int sysid, int srcid, string date, SqliteConnection dbc) { // Process the game name // WoD gets rid of anything past the first "(" or "[" as the name, we will do the same string stripPattern = @"(([[(].*[\)\]] )?([^([]+))"; Regex stripRegex = new Regex(stripPattern); - Match stripMatch = stripRegex.Match(rom.Game); - rom.Game = stripMatch.Groups[1].Value; + Match stripMatch = stripRegex.Match(rom.Machine.Name); + rom.Machine.Name = stripMatch.Groups[1].Value; // Run the name through the filters to make sure that it's correct - rom.Game = Style.NormalizeChars(rom.Game); - rom.Game = Style.RussianToLatin(rom.Game); - rom.Game = Style.SearchPattern(rom.Game); - rom.Game = rom.Game.Trim(); + rom.Machine.Name = Style.NormalizeChars(rom.Machine.Name); + rom.Machine.Name = Style.RussianToLatin(rom.Machine.Name); + rom.Machine.Name = Style.SearchPattern(rom.Machine.Name); + rom.Machine.Name = rom.Machine.Name.Trim(); // Process the rom name @@ -594,7 +594,7 @@ COMMIT;"; // Retrieve or insert the hash long hashid = -1; - string query = "SELECT id FROM hash WHERE size=" + rom.Size + " AND crc='" + rom.CRC + "' AND md5='" + rom.MD5 + "' AND sha1='" + rom.SHA1 + "'"; + string query = "SELECT id FROM hash WHERE size=" + rom.HashData.Size + " AND crc='" + rom.HashData.CRC + "' AND md5='" + rom.HashData.MD5 + "' AND sha1='" + rom.HashData.SHA1 + "'"; using (SqliteCommand slc = new SqliteCommand(query, dbc)) { using (SqliteDataReader sldr = slc.ExecuteReader()) @@ -603,7 +603,7 @@ COMMIT;"; if (!sldr.HasRows) { query = "INSERT INTO hash (size, crc, md5, sha1)" + - " VALUES (" + rom.Size + ", '" + rom.CRC + "', '" + rom.MD5 + "', '" + rom.SHA1 + "')"; + " VALUES (" + rom.HashData.Size + ", '" + rom.HashData.CRC + "', '" + rom.HashData.MD5 + "', '" + rom.HashData.SHA1 + "')"; using (SqliteCommand slc2 = new SqliteCommand(query, dbc)) { @@ -629,11 +629,11 @@ COMMIT;"; query = @"BEGIN; INSERT OR IGNORE INTO hashdata (hashid, key, value) VALUES " + "(" + hashid + ", 'name', '" + rom.Name.Replace("'", "''") + "'), " + - "(" + hashid + ", 'game', '" + rom.Game.Replace("'", "''") + "'), " + + "(" + hashid + ", 'game', '" + rom.Machine.Name.Replace("'", "''") + "'), " + "(" + hashid + ", 'type', '" + rom.Type + "'), " + "(" + hashid + ", 'lastupdated', '" + date + @"'); -INSERT OR IGNORE INTO gamesystem (game, systemid) VALUES ('" + rom.Game.Replace("'", "''") + "', " + sysid + @"); -INSERT OR IGNORE INTO gamesource (game, sourceid) VALUES ('" + rom.Game.Replace("'", "''") + "', " + srcid + @"); +INSERT OR IGNORE INTO gamesystem (game, systemid) VALUES ('" + rom.Machine.Name.Replace("'", "''") + "', " + sysid + @"); +INSERT OR IGNORE INTO gamesource (game, sourceid) VALUES ('" + rom.Machine.Name.Replace("'", "''") + "', " + srcid + @"); COMMIT;"; using (SqliteCommand slc = new SqliteCommand(query, dbc)) diff --git a/SabreTools/ImportExport/ImportTwo.cs b/SabreTools.Helper/Objects/ImportTwo.cs similarity index 100% rename from SabreTools/ImportExport/ImportTwo.cs rename to SabreTools.Helper/Objects/ImportTwo.cs diff --git a/SabreTools/OfflineMerge.cs b/SabreTools.Helper/Objects/OfflineMerge.cs similarity index 100% rename from SabreTools/OfflineMerge.cs rename to SabreTools.Helper/Objects/OfflineMerge.cs diff --git a/SabreTools/Split.cs b/SabreTools.Helper/Objects/Split.cs similarity index 100% rename from SabreTools/Split.cs rename to SabreTools.Helper/Objects/Split.cs diff --git a/SabreTools.Helper/Tools/Stats.cs b/SabreTools.Helper/Objects/Stats.cs similarity index 100% rename from SabreTools.Helper/Tools/Stats.cs rename to SabreTools.Helper/Objects/Stats.cs diff --git a/SabreTools.Helper/SabreTools.Helper.csproj b/SabreTools.Helper/SabreTools.Helper.csproj index ab31812a..9c990340 100644 --- a/SabreTools.Helper/SabreTools.Helper.csproj +++ b/SabreTools.Helper/SabreTools.Helper.csproj @@ -86,6 +86,14 @@ + + + + + + + + True True @@ -121,7 +129,7 @@ - + @@ -164,6 +172,7 @@ Designer + diff --git a/SabreTools/SabreTools.csproj b/SabreTools/SabreTools.csproj index d9efb479..cff4dee7 100644 --- a/SabreTools/SabreTools.csproj +++ b/SabreTools/SabreTools.csproj @@ -100,13 +100,7 @@ - - - - - -