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

Merge MergeDAT, part 5

Browse Source
This commit is contained in:
Matt Nadareski
2016-04-21 14:10:59 -07:00
parent 7f24f015c2
commit 6483fd4772
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DATabase/DATabase.cs
View File

@@ -1404,14 +1404,14 @@ Make a selection:
newInputs.Add(Path.GetFullPath(file));
}
}
else
else if (File.Exists(input.Replace("\"", "")))
{
newInputs.Add(input.Replace("\"", ""));
newInputs.Add(Path.GetFullPath(input.Replace("\"", "")));
}
}
MergeDAT md = new MergeDAT(newInputs, name, desc, cat, version, author, diff, dedup, noDate, forceunpack, old, logger);
md.MergeDiff();
MergeDiff md = new MergeDiff(newInputs, name, desc, cat, version, author, diff, dedup, noDate, forceunpack, old, logger);
md.Process();
}
/// <summary>

6
DATabase/MergeDAT.cs
View File

@@ -5,7 +5,7 @@ using SabreTools.Helper;
namespace SabreTools
{
public class MergeDAT
public class MergeDiff
{
// Listing related variables
private List<String> _inputs;
@@ -43,7 +43,7 @@ namespace SabreTools
/// <param name="forceunpack">True if the forcepacking="unzip" tag is to be added, false otherwise</param>
/// <param name="old">True if a old-style DAT should be output, false otherwise</param>
/// <param name="logger">Logger object for console and file output</param>
public MergeDAT(List<String> inputs, string name, string desc, string cat, string version, string author,
public MergeDiff(List<String> inputs, string name, string desc, string cat, string version, string author,
bool diff, bool dedup, bool noDate, bool forceunpack, bool old, Logger logger)
{
_inputs = inputs;
@@ -68,7 +68,7 @@ namespace SabreTools
/// TODO: @tractivo -for the A and B and AB output you could let this be determined by comparing the hashes.
/// when a hash is present in both dats then this entry goes to AB, if its only in A then it stay in A if in B then in B.
/// </remarks>
public bool MergeDiff()
public bool Process()
{
// Check if there are enough inputs
if (_inputs.Count < 0)