Output filename fixes

This commit is contained in:
Matt Nadareski
2016-05-25 11:35:34 -07:00
parent fa7c2e69eb
commit 0cdc4f3363

View File

@@ -1425,11 +1425,11 @@ Make a selection:
} }
else if (Directory.Exists(filename)) else if (Directory.Exists(filename))
{ {
filename = Path.GetFullPath(filename); filename = Path.GetFullPath(filename) + Path.DirectorySeparatorChar;
foreach (string file in Directory.EnumerateFiles(filename, "*", SearchOption.AllDirectories)) foreach (string file in Directory.EnumerateFiles(filename, "*", SearchOption.AllDirectories))
{ {
logger.User("Converting \"" + Path.GetFullPath(file).Remove(0, filename.Length + 1) + "\""); logger.User("Converting \"" + Path.GetFullPath(file).Remove(0, filename.Length) + "\"");
DatData datdata = new DatData DatData datdata = new DatData
{ {
OutputFormat = outputFormat, OutputFormat = outputFormat,
@@ -1444,7 +1444,7 @@ Make a selection:
datdata.FileName += ".new"; datdata.FileName += ".new";
} }
Output.WriteDatfile(datdata, (outdir == "" ? Path.GetDirectoryName(file) : outdir + Path.GetDirectoryName(file).Remove(0, filename.Length + 1)), logger); Output.WriteDatfile(datdata, (outdir == "" ? Path.GetDirectoryName(file) : outdir + Path.GetDirectoryName(file).Remove(0, filename.Length)), logger);
} }
} }
else else