Fix expected DATFromDir behavior

This commit is contained in:
Matt Nadareski
2016-05-12 11:23:11 -07:00
parent 56c4a4b47c
commit 81e5d90dd1
2 changed files with 18 additions and 1 deletions

View File

@@ -252,10 +252,27 @@ namespace SabreTools
else if (Directory.Exists(_basePath))
{
_logger.Log("Folder found: " + _basePath);
foreach (string item in Directory.EnumerateFiles(_basePath, "*", SearchOption.AllDirectories))
// Process the files in the base folder first
foreach (string item in Directory.EnumerateFiles(_basePath, "*", SearchOption.TopDirectoryOnly))
{
ProcessFile(item);
}
// Then process each of the subfolders themselves
string basePathBackup = _basePath;
foreach (string item in Directory.EnumerateDirectories(_basePath))
{
_basePath = (File.Exists(item) ? item : item + Path.DirectorySeparatorChar);
_basePath = Path.GetFullPath(_basePath);
foreach (string subitem in Directory.EnumerateFiles(_basePath, "*", SearchOption.AllDirectories))
{
ProcessFile(subitem);
}
}
_basePath = basePathBackup;
}
// If this somehow skips past the original sensors
else