[DatFile] Use new blank folder code for standard as well

This commit is contained in:
Matt Nadareski
2017-03-14 19:59:19 -07:00
parent 57ff8a59a9
commit 33f777f8aa

View File

@@ -92,12 +92,14 @@ namespace SabreTools.Helper.Dats
// Now find all folders that are empty, if we are supposed to // Now find all folders that are empty, if we are supposed to
if (!Romba && addBlanks) if (!Romba && addBlanks)
{ {
List<string> empties = Directory.EnumerateDirectories(basePath, "*", SearchOption.AllDirectories).ToList(); List<string> empties = Directory
.EnumerateDirectories(basePath, "*", SearchOption.AllDirectories)
.Where(dir => Directory.EnumerateFileSystemEntries(dir, "*", SearchOption.AllDirectories).Count() == 0)
.ToList();
Parallel.ForEach(empties, Parallel.ForEach(empties,
new ParallelOptions { MaxDegreeOfParallelism = Globals.MaxDegreeOfParallelism }, new ParallelOptions { MaxDegreeOfParallelism = Globals.MaxDegreeOfParallelism },
dir => dir =>
{
if (Directory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly).Count() == 0)
{ {
// Get the full path for the directory // Get the full path for the directory
string fulldir = Path.GetFullPath(dir); string fulldir = Path.GetFullPath(dir);
@@ -139,8 +141,7 @@ namespace SabreTools.Helper.Dats
} }
Globals.Logger.Verbose("Adding blank empty folder: " + gamename); Globals.Logger.Verbose("Adding blank empty folder: " + gamename);
this["null"].Add(new Rom(romname, gamename)); this["null"].Add(new Rom(romname, gamename, omitFromScan));
}
}); });
} }
} }