diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs index 6c043584..a3085432 100644 --- a/DATabase/DATabase.cs +++ b/DATabase/DATabase.cs @@ -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(); } /// diff --git a/DATabase/MergeDAT.cs b/DATabase/MergeDAT.cs index a5e91868..d2162112 100644 --- a/DATabase/MergeDAT.cs +++ b/DATabase/MergeDAT.cs @@ -5,7 +5,7 @@ using SabreTools.Helper; namespace SabreTools { - public class MergeDAT + public class MergeDiff { // Listing related variables private List _inputs; @@ -43,7 +43,7 @@ namespace SabreTools /// True if the forcepacking="unzip" tag is to be added, false otherwise /// True if a old-style DAT should be output, false otherwise /// Logger object for console and file output - public MergeDAT(List inputs, string name, string desc, string cat, string version, string author, + public MergeDiff(List 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. /// - public bool MergeDiff() + public bool Process() { // Check if there are enough inputs if (_inputs.Count < 0)