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

[MergeDiff] Change code around so it can be invoked from library

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-20 14:26:45 -07:00
parent 39bc6307dd
commit 73cde6442f
1 changed files with 84 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
SabreTools/MergeDiff.cs
View File

@@ -120,17 +120,17 @@ namespace SabreTools
// Modify the Dictionary if necessary and output the results // Modify the Dictionary if necessary and output the results
if (_diff && !_cascade) if (_diff && !_cascade)
{ {
DiffNoCascade(userData, datHeaders); DiffNoCascade(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _dedup, _outdir, userData, _inputs, datHeaders, _logger);
} }
// If we're in cascade and diff, output only cascaded diffs // If we're in cascade and diff, output only cascaded diffs
else if (_diff && _cascade) else if (_diff && _cascade)
{ {
DiffCascade(userData, datHeaders); DiffCascade(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, _dedup, _outdir, _inplace, userData, _inputs, datHeaders, _logger);
} }
// Output all entries with user-defined merge // Output all entries with user-defined merge
else else
{ {
MergeNoDiff(userData, datHeaders); MergeNoDiff(_superdat, _outdir, userData, _inputs, datHeaders, _logger);
} }
return true; return true;
@@ -208,41 +208,42 @@ namespace SabreTools
/// </summary> /// </summary>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="datHeaders">Dat headers used optionally</param> /// <param name="datHeaders">Dat headers used optionally</param>
private void DiffNoCascade(Dat userData, List<Dat> datHeaders) public void DiffNoCascade(string name, string desc, string version, string date, string cat, string author, bool forceunpack,
bool old, bool dedup, string outdir, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger)
{ {
DateTime start = DateTime.Now; DateTime start = DateTime.Now;
_logger.User("Initializing all output DATs"); logger.User("Initializing all output DATs");
// Don't have External dupes // Don't have External dupes
string post = " (No Duplicates)"; string post = " (No Duplicates)";
Dat outerDiffData = new Dat Dat outerDiffData = new Dat
{ {
FileName = _desc + post, FileName = desc + post,
Name = _name + post, Name = name + post,
Description = _desc + post, Description = desc + post,
Version = _version, Version = version,
Date = _date, Date = date,
Category = _cat, Category = cat,
Author = _author, Author = author,
ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), ForcePacking = (forceunpack ? ForcePacking.Unzip : ForcePacking.None),
OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), OutputFormat = (old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
MergeRoms = _dedup, MergeRoms = dedup,
Roms = new Dictionary<string, List<Rom>>(), Roms = new Dictionary<string, List<Rom>>(),
}; };
// Have External dupes // Have External dupes
post = " (Duplicates)"; post = " (Duplicates)";
Dat dupeData = new Dat Dat dupeData = new Dat
{ {
FileName = _desc + post, FileName = desc + post,
Name = _name + post, Name = name + post,
Description = _desc + post, Description = desc + post,
Version = _version, Version = version,
Date = _date, Date = date,
Category = _cat, Category = cat,
Author = _author, Author = author,
ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), ForcePacking = (forceunpack ? ForcePacking.Unzip : ForcePacking.None),
OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), OutputFormat = (old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
MergeRoms = _dedup, MergeRoms = dedup,
Roms = new Dictionary<string, List<Rom>>(), Roms = new Dictionary<string, List<Rom>>(),
}; };
@@ -250,34 +251,34 @@ namespace SabreTools
List<Dat> outDats = new List<Dat>(); List<Dat> outDats = new List<Dat>();
// Loop through each of the inputs and get or create a new DatData object // Loop through each of the inputs and get or create a new DatData object
for (int j = 0; j < _inputs.Count; j++) for (int j = 0; j < inputs.Count; j++)
{ {
post = " (" + Path.GetFileNameWithoutExtension(_inputs[j].Split('¬')[0]) + " Only)"; post = " (" + Path.GetFileNameWithoutExtension(inputs[j].Split('¬')[0]) + " Only)";
Dat diffData = new Dat Dat diffData = new Dat
{ {
FileName = _desc + post, FileName = desc + post,
Name = _name + post, Name = name + post,
Description = _desc + post, Description = desc + post,
Version = _version, Version = version,
Date = _date, Date = date,
Category = _cat, Category = cat,
Author = _author, Author = author,
ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), ForcePacking = (forceunpack ? ForcePacking.Unzip : ForcePacking.None),
OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), OutputFormat = (old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
MergeRoms = _dedup, MergeRoms = dedup,
Roms = new Dictionary<string, List<Rom>>(), Roms = new Dictionary<string, List<Rom>>(),
}; };
outDats.Add(diffData); outDats.Add(diffData);
} }
_logger.User("Initializing complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Initializing complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
// Now, loop through the dictionary and populate the correct DATs // Now, loop through the dictionary and populate the correct DATs
start = DateTime.Now; start = DateTime.Now;
_logger.User("Populating all output DATs"); logger.User("Populating all output DATs");
List<string> keys = userData.Roms.Keys.ToList(); List<string> keys = userData.Roms.Keys.ToList();
foreach (string key in keys) foreach (string key in keys)
{ {
List<Rom> roms = RomTools.Merge(userData.Roms[key], _logger); List<Rom> roms = RomTools.Merge(userData.Roms[key], logger);
if (roms != null && roms.Count > 0) if (roms != null && roms.Count > 0)
{ {
@@ -300,7 +301,7 @@ namespace SabreTools
// Merged no-duplicates DAT // Merged no-duplicates DAT
Rom newrom = rom; Rom newrom = rom;
newrom.Game += " (" + Path.GetFileNameWithoutExtension(_inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")"; newrom.Game += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")";
if (outerDiffData.Roms.ContainsKey(key)) if (outerDiffData.Roms.ContainsKey(key))
{ {
@@ -318,7 +319,7 @@ namespace SabreTools
if (rom.Dupe >= DupeType.ExternalHash) if (rom.Dupe >= DupeType.ExternalHash)
{ {
Rom newrom = rom; Rom newrom = rom;
newrom.Game += " (" + Path.GetFileNameWithoutExtension(_inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")"; newrom.Game += " (" + Path.GetFileNameWithoutExtension(inputs[newrom.Metadata.SystemID].Split('¬')[0]) + ")";
if (dupeData.Roms.ContainsKey(key)) if (dupeData.Roms.ContainsKey(key))
{ {
@@ -334,31 +335,31 @@ namespace SabreTools
} }
} }
} }
_logger.User("Populating complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Populating complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
// Finally, loop through and output each of the DATs // Finally, loop through and output each of the DATs
start = DateTime.Now; start = DateTime.Now;
_logger.User("Outputting all created DATs"); logger.User("Outputting all created DATs");
// Output the difflist (a-b)+(b-a) diff // Output the difflist (a-b)+(b-a) diff
Output.WriteDatfile(outerDiffData, _outdir, _logger); Output.WriteDatfile(outerDiffData, outdir, logger);
// Output the (ab) diff // Output the (ab) diff
Output.WriteDatfile(dupeData, _outdir, _logger); Output.WriteDatfile(dupeData, outdir, logger);
// Output the individual (a-b) DATs // Output the individual (a-b) DATs
for (int j = 0; j < _inputs.Count; j++) for (int j = 0; j < inputs.Count; j++)
{ {
// If we have an output directory set, replace the path // If we have an output directory set, replace the path
string path = _outdir + (Path.GetDirectoryName(_inputs[j].Split('¬')[0]).Remove(0, _inputs[j].Split('¬')[1].Length)); string path = outdir + (Path.GetDirectoryName(inputs[j].Split('¬')[0]).Remove(0, inputs[j].Split('¬')[1].Length));
// If we have more than 0 roms, output // If we have more than 0 roms, output
if (outDats[j].Roms.Count > 0) if (outDats[j].Roms.Count > 0)
{ {
Output.WriteDatfile(outDats[j], path, _logger); Output.WriteDatfile(outDats[j], path, logger);
} }
} }
_logger.User("Outputting complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Outputting complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
} }
/// <summary> /// <summary>
@@ -366,7 +367,8 @@ namespace SabreTools
/// </summary> /// </summary>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="datHeaders">Dat headers used optionally</param> /// <param name="datHeaders">Dat headers used optionally</param>
private void DiffCascade(Dat userData, List<Dat> datHeaders) private void DiffCascade(string name, string desc, string version, string date, string cat, string author, bool forceunpack,
bool old, bool dedup, string outdir, bool inplace, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger)
{ {
string post = ""; string post = "";
@@ -375,14 +377,14 @@ namespace SabreTools
// Loop through each of the inputs and get or create a new DatData object // Loop through each of the inputs and get or create a new DatData object
DateTime start = DateTime.Now; DateTime start = DateTime.Now;
_logger.User("Initializing all output DATs"); logger.User("Initializing all output DATs");
for (int j = 0; j < _inputs.Count; j++) for (int j = 0; j < inputs.Count; j++)
{ {
post = " (" + Path.GetFileNameWithoutExtension(_inputs[j].Split('¬')[0]) + " Only)"; post = " (" + Path.GetFileNameWithoutExtension(inputs[j].Split('¬')[0]) + " Only)";
Dat diffData; Dat diffData;
// If we're in inplace mode, take the appropriate DatData object already stored // If we're in inplace mode, take the appropriate DatData object already stored
if (_inplace || !String.IsNullOrEmpty(_outdir)) if (inplace || !String.IsNullOrEmpty(outdir))
{ {
diffData = datHeaders[j]; diffData = datHeaders[j];
} }
@@ -390,31 +392,31 @@ namespace SabreTools
{ {
diffData = new Dat diffData = new Dat
{ {
FileName = _desc + post, FileName = desc + post,
Name = _name + post, Name = name + post,
Description = _desc + post, Description = desc + post,
Version = _version, Version = version,
Date = _date, Date = date,
Category = _cat, Category = cat,
Author = _author, Author = author,
ForcePacking = (_forceunpack ? ForcePacking.Unzip : ForcePacking.None), ForcePacking = (forceunpack ? ForcePacking.Unzip : ForcePacking.None),
OutputFormat = (_old ? OutputFormat.ClrMamePro : OutputFormat.Xml), OutputFormat = (old ? OutputFormat.ClrMamePro : OutputFormat.Xml),
MergeRoms = _dedup, MergeRoms = dedup,
}; };
} }
diffData.Roms = new Dictionary<string, List<Rom>>(); diffData.Roms = new Dictionary<string, List<Rom>>();
outDats.Add(diffData); outDats.Add(diffData);
} }
_logger.User("Initializing complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Initializing complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
// Now, loop through the dictionary and populate the correct DATs // Now, loop through the dictionary and populate the correct DATs
start = DateTime.Now; start = DateTime.Now;
_logger.User("Populating all output DATs"); logger.User("Populating all output DATs");
List<string> keys = userData.Roms.Keys.ToList(); List<string> keys = userData.Roms.Keys.ToList();
foreach (string key in keys) foreach (string key in keys)
{ {
List<Rom> roms = RomTools.Merge(userData.Roms[key], _logger); List<Rom> roms = RomTools.Merge(userData.Roms[key], logger);
if (roms != null && roms.Count > 0) if (roms != null && roms.Count > 0)
{ {
@@ -433,31 +435,31 @@ namespace SabreTools
} }
} }
} }
_logger.User("Populating complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Populating complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
// Finally, loop through and output each of the DATs // Finally, loop through and output each of the DATs
start = DateTime.Now; start = DateTime.Now;
_logger.User("Outputting all created DATs"); logger.User("Outputting all created DATs");
for (int j = 0; j < _inputs.Count; j++) for (int j = 0; j < inputs.Count; j++)
{ {
// If we have an output directory set, replace the path // If we have an output directory set, replace the path
string path = ""; string path = "";
if (_inplace) if (inplace)
{ {
path = Path.GetDirectoryName(_inputs[j].Split('¬')[0]); path = Path.GetDirectoryName(inputs[j].Split('¬')[0]);
} }
else if (!String.IsNullOrEmpty(_outdir)) else if (!String.IsNullOrEmpty(outdir))
{ {
path = _outdir + (Path.GetDirectoryName(_inputs[j].Split('¬')[0]).Remove(0, _inputs[j].Split('¬')[1].Length)); path = outdir + (Path.GetDirectoryName(inputs[j].Split('¬')[0]).Remove(0, inputs[j].Split('¬')[1].Length));
} }
// If we have more than 0 roms, output // If we have more than 0 roms, output
if (outDats[j].Roms.Count > 0) if (outDats[j].Roms.Count > 0)
{ {
Output.WriteDatfile(outDats[j], path, _logger); Output.WriteDatfile(outDats[j], path, logger);
} }
} }
_logger.User("Outputting complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff")); logger.User("Outputting complete in " + DateTime.Now.Subtract(start).ToString(@"hh\:mm\:ss\.fffff"));
} }
/// <summary> /// <summary>
@@ -465,10 +467,10 @@ namespace SabreTools
/// </summary> /// </summary>
/// <param name="userData">Main DatData to draw information from</param> /// <param name="userData">Main DatData to draw information from</param>
/// <param name="datHeaders">Dat headers used optionally</param> /// <param name="datHeaders">Dat headers used optionally</param>
private void MergeNoDiff(Dat userData, List<Dat> datHeaders) private void MergeNoDiff(bool superdat, string outdir, Dat userData, List<string> inputs, List<Dat> datHeaders, Logger logger)
{ {
// If we're in SuperDAT mode, prefix all games with their respective DATs // If we're in SuperDAT mode, prefix all games with their respective DATs
if (_superdat) if (superdat)
{ {
List<string> keys = userData.Roms.Keys.ToList(); List<string> keys = userData.Roms.Keys.ToList();
foreach (string key in keys) foreach (string key in keys)
@@ -477,8 +479,8 @@ namespace SabreTools
foreach (Rom rom in userData.Roms[key]) foreach (Rom rom in userData.Roms[key])
{ {
Rom newrom = rom; Rom newrom = rom;
string filename = _inputs[newrom.Metadata.SystemID].Split('¬')[0]; string filename = inputs[newrom.Metadata.SystemID].Split('¬')[0];
string rootpath = _inputs[newrom.Metadata.SystemID].Split('¬')[1]; string rootpath = inputs[newrom.Metadata.SystemID].Split('¬')[1];
rootpath += (rootpath == "" ? "" : Path.DirectorySeparatorChar.ToString()); rootpath += (rootpath == "" ? "" : Path.DirectorySeparatorChar.ToString());
filename = filename.Remove(0, rootpath.Length); filename = filename.Remove(0, rootpath.Length);
@@ -489,7 +491,7 @@ namespace SabreTools
} }
} }
Output.WriteDatfile(userData, _outdir, _logger); Output.WriteDatfile(userData, outdir, logger);
} }
} }
} }