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

Possibly allow for output redirection on mergediff

Browse Source 
I'm making the executive decision to NOT include this in the menu for now because it's too cramped
This commit is contained in:
Matt Nadareski
2016-05-27 11:57:00 -07:00
parent 44fdcc3b16
commit 61bc2984ad
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DATabase/DATabase.cs
View File

@@ -494,7 +494,7 @@ namespace SabreTools
// Merge, diff, and dedupe at least 2 DATs
else if (merge || diff)
{
InitMergeDiff(inputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, inplace);
InitMergeDiff(inputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, inplace, outdir);
}
// Split a DAT by available hashes
@@ -1627,7 +1627,7 @@ Make a selection:
/// <param name="cascade">True if the outputted diffs should be cascaded, false otherwise</param>
/// <param name="inplace">True if cascaded diffs overwrite the source files, false otherwise</param>
private static void InitMergeDiff(List<string> inputs, string name, string desc, string cat, string version, string author,
bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, bool inplace)
bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, bool inplace, string outdir = "")
{
// Make sure there are no folders in inputs
List<string> newInputs = new List<string>();
@@ -1639,7 +1639,7 @@ Make a selection:
{
try
{
newInputs.Add(Path.GetFullPath(file) + "¬" + Path.GetFullPath(file.Replace("\"", "")));
newInputs.Add(Path.GetFullPath(file) + "¬" + Path.GetFullPath(input.Replace("\"", "")));
}
catch (PathTooLongException)
{
@@ -1660,7 +1660,7 @@ Make a selection:
}
}
MergeDiff md = new MergeDiff(newInputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, inplace, logger);
MergeDiff md = new MergeDiff(newInputs, name, desc, cat, version, author, diff, dedup, bare, forceunpack, old, superdat, cascade, inplace, outdir, logger);
md.Process();
}

26
DATabase/MergeDiff.cs
View File

@@ -28,6 +28,7 @@ namespace SabreTools
private string _cat;
private string _version;
private string _author;
private string _outdir;
// Other required variables
private string _date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -51,9 +52,10 @@ namespace SabreTools
/// <param name="superdat">True if DATs should be parsed into SuperDAT format, false otherwise</param>
/// <param name="cascade">True if the outputted diffs should be cascaded, false otherwise</param>
/// <param name="inplace">True if cascaded diffs overwrite the source files, false otherwise</param>
/// <param name="outdir">New output directory for outputted DATs (blank means default)</param>
/// <param name="logger">Logger object for console and file output</param>
public MergeDiff(List<String> inputs, string name, string desc, string cat, string version, string author,
bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, bool inplace, Logger logger)
bool diff, bool dedup, bool bare, bool forceunpack, bool old, bool superdat, bool cascade, bool inplace, string outdir, Logger logger)
{
_inputs = inputs;
_name = name;
@@ -69,6 +71,7 @@ namespace SabreTools
_superdat = superdat;
_cascade = cascade;
_inplace = inplace;
_outdir = outdir.Replace("\"", "");
_logger = logger;
}
@@ -211,7 +214,7 @@ namespace SabreTools
}
// Output the difflist (a-b)+(b-a) diff
Output.WriteDatfile(outerDiffData, "", _logger);
Output.WriteDatfile(outerDiffData, _outdir, _logger);
// For the AB mode-style diffs, get all required dictionaries and output with a new name
// Loop through _inputs first and filter from all diffed roms to find the ones that have the same "System"
@@ -253,7 +256,7 @@ namespace SabreTools
}
}
Output.WriteDatfile(diffData, "", _logger);
Output.WriteDatfile(diffData, _outdir, _logger);
}
// Get all entries that have External dupes
@@ -295,7 +298,7 @@ namespace SabreTools
}
}
Output.WriteDatfile(dupeData, "", _logger);
Output.WriteDatfile(dupeData, _outdir, _logger);
}
// If we're in cascade and diff, output only cascaded diffs
else if (_diff && _cascade)
@@ -359,7 +362,18 @@ namespace SabreTools
userData.Roms[key] = newroms;
}
Output.WriteDatfile(diffData, (_inplace ? _inputs[j].Split('¬')[1] : ""), _logger);
// If we have an output directory set, replace the path
string path = "";
if (_inplace)
{
path = Path.GetDirectoryName(_inputs[j].Split('¬')[0]);
}
else if (!String.IsNullOrEmpty(_outdir))
{
path = _outdir + (_inputs[j].Split('¬')[0].Remove(0, _inputs[j].Split('¬')[1].Length));
}
Output.WriteDatfile(diffData, path, _logger);
}
}
// Output all entries with user-defined merge
@@ -388,7 +402,7 @@ namespace SabreTools
}
}
Output.WriteDatfile(userData, "", _logger);
Output.WriteDatfile(userData, _outdir, _logger);
}
return true;

1
SabreHelper/Build.cs
View File

@@ -123,6 +123,7 @@ Options:
-b, --bare Don't include date in file name
-u, --unzip Force unzipping in created DAT
-o, --old Output DAT in CMP format instead of XML
-out= Output directory (overridden by --cascade)
-sd, --superdat Enable SuperDAT creation
-n=, --name= Set the internal name of the DAT
-d=, --desc= Set the filename and description of the DAT