[DatFile] Fix file output on inplace

This commit is contained in:
Matt Nadareski
2017-04-01 15:39:43 -07:00
parent 9befbfc1aa
commit 20ad33e69c

View File

@@ -483,14 +483,14 @@ namespace SabreTools.Helper.Dats
inputFileName = Path.GetFullPath(inputFileName); inputFileName = Path.GetFullPath(inputFileName);
} }
// If inplace is set, override the output dir
if (inplace)
{
outDir = Path.GetDirectoryName(inputFileName);
}
if (File.Exists(inputFileName)) if (File.Exists(inputFileName))
{ {
// If inplace is set, override the output dir
if (inplace)
{
outDir = Path.GetDirectoryName(inputFileName);
}
DatFile innerDatdata = new DatFile(this); DatFile innerDatdata = new DatFile(this);
Globals.Logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\""); Globals.Logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\"");
innerDatdata.Parse(inputFileName, 0, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName, innerDatdata.Parse(inputFileName, 0, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName,
@@ -507,6 +507,12 @@ namespace SabreTools.Helper.Dats
List<string> subFiles = Directory.EnumerateFiles(inputFileName, "*", SearchOption.AllDirectories).ToList(); List<string> subFiles = Directory.EnumerateFiles(inputFileName, "*", SearchOption.AllDirectories).ToList();
Parallel.ForEach(subFiles, Globals.ParallelOptions, file => Parallel.ForEach(subFiles, Globals.ParallelOptions, file =>
{ {
// If inplace is set, override the output dir
if (inplace)
{
outDir = Path.GetDirectoryName(file);
}
Globals.Logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\""); Globals.Logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\"");
DatFile innerDatdata = new DatFile(this); DatFile innerDatdata = new DatFile(this);
innerDatdata.Parse(file, 0, 0, splitType, true, clean, descAsName, innerDatdata.Parse(file, 0, 0, splitType, true, clean, descAsName,