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

[DatFile] More inplace shenannigans

Browse Source
This commit is contained in:
Matt Nadareski
2017-04-01 15:42:39 -07:00
parent 20ad33e69c
commit 1415d5dd96
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SabreTools.Helper/Dats/Partials/DatFile.ConvertUpdate.cs
View File

@@ -486,9 +486,10 @@ namespace SabreTools.Helper.Dats
if (File.Exists(inputFileName)) if (File.Exists(inputFileName))
{ {
// If inplace is set, override the output dir // If inplace is set, override the output dir
string realOutDir = outDir;
if (inplace) if (inplace)
{ {
outDir = Path.GetDirectoryName(inputFileName); realOutDir = Path.GetDirectoryName(inputFileName);
} }
DatFile innerDatdata = new DatFile(this); DatFile innerDatdata = new DatFile(this);
@@ -498,21 +499,22 @@ namespace SabreTools.Helper.Dats
innerDatdata.Filter(filter, trim, single, root); innerDatdata.Filter(filter, trim, single, root);
// Try to output the file // Try to output the file
innerDatdata.WriteToFile((outDir == "" ? Path.GetDirectoryName(inputFileName) : outDir), overwrite: (outDir != "")); innerDatdata.WriteToFile((realOutDir == "" ? Path.GetDirectoryName(inputFileName) : realOutDir), overwrite: (realOutDir != ""));
} }
else if (Directory.Exists(inputFileName)) else if (Directory.Exists(inputFileName))
{ {
inputFileName = Path.GetFullPath(inputFileName) + Path.DirectorySeparatorChar; inputFileName = Path.GetFullPath(inputFileName) + Path.DirectorySeparatorChar;
// If inplace is set, override the output dir
string realOutDir = outDir;
if (inplace)
{
realOutDir = Path.GetDirectoryName(inputFileName);
}
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,
@@ -520,8 +522,8 @@ namespace SabreTools.Helper.Dats
innerDatdata.Filter(filter, trim, single, root); innerDatdata.Filter(filter, trim, single, root);
// Try to output the file // Try to output the file
innerDatdata.WriteToFile((outDir == "" ? Path.GetDirectoryName(file) : outDir + Path.GetDirectoryName(file).Remove(0, inputFileName.Length - 1)), innerDatdata.WriteToFile((realOutDir == "" ? Path.GetDirectoryName(file) : realOutDir + Path.GetDirectoryName(file).Remove(0, inputFileName.Length - 1)),
overwrite: (outDir != "")); overwrite: (realOutDir != ""));
}); });
} }
else else