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

[DatTools] Copy exact processing code

Browse Source
This commit is contained in:
Matt Nadareski
2016-06-20 17:19:37 -07:00
parent 7f1ad470aa
commit 854a3369a0
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
SabreTools.Helper/Tools/DatTools.cs
View File

@@ -1532,19 +1532,41 @@ namespace SabreTools.Helper
// If we're in merging or diffing mode, use the full list of inputs // If we're in merging or diffing mode, use the full list of inputs
if (merge || diff) if (merge || diff)
{ {
// Create a new list of inputs that are only files // Make sure there are no folders in inputs
List<string> newInputFileNames = new List<string>(); List<string> newInputFileNames = new List<string>();
foreach (string input in inputFileNames) foreach (string input in inputFileNames)
{ {
if (File.Exists(input)) if (Directory.Exists(input))
{
newInputFileNames.Add(Path.GetFullPath(input));
}
else if (Directory.Exists(input))
{ {
foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(input, "*", SearchOption.AllDirectories))
{ {
newInputFileNames.Add(Path.GetFullPath(file)); try
{
newInputFileNames.Add(Path.GetFullPath(file) + "¬" + Path.GetFullPath(input));
}
catch (PathTooLongException)
{
logger.Warning("The path for " + file + " was too long");
}
catch (Exception ex)
{
logger.Error(ex.ToString());
}
}
}
else if (File.Exists(input))
{
try
{
newInputFileNames.Add(Path.GetFullPath(input) + "¬" + Path.GetDirectoryName(Path.GetFullPath(input)));
}
catch (PathTooLongException)
{
logger.Warning("The path for " + input + " was too long");
}
catch (Exception ex)
{
logger.Error(ex.ToString());
} }
} }
} }