Apply Include-Dir filter only on sub directories

arthurzaczek · Nov 16, 2015 · f047b2b · f047b2b
1 parent 89a74b9
commit f047b2b
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/OSPC/Program.cs b/OSPC/Program.cs
@@ -162,10 +162,7 @@ private static Submission[] CollectFiles(Configuration cfg, Tokenizer.ITokenizer
             var includeDir = cfg.IncludeDir.Select(i => new Regex(i)).ToList();
             var excludeDir = cfg.ExcludeDir.Select(i => new Regex(i)).ToList();
 
-            foreach (var dir in cfg.Dirs)
-            {
-                CollectFilesRecurse(files, Directory.GetDirectories(dir), include, exclude, includeDir, excludeDir, cfg);
-            }
+            CollectFilesRecurse(files, cfg.Dirs, true, include, exclude, includeDir, excludeDir, cfg);
 
             files.AddRange(cfg.ExtraFiles);
 
@@ -189,13 +186,16 @@ private static Submission[] CollectFiles(Configuration cfg, Tokenizer.ITokenizer
                     .ToArray();
         }
 
-        private static void CollectFilesRecurse(List<string> files, IEnumerable<string> directories, IEnumerable<Regex> include, IEnumerable<Regex> exclude, IEnumerable<Regex> includeDir, IEnumerable<Regex> excludeDir, Configuration cfg)
+        private static void CollectFilesRecurse(List<string> files, IEnumerable<string> directories, bool isFirstLevel, IEnumerable<Regex> include, IEnumerable<Regex> exclude, IEnumerable<Regex> includeDir, IEnumerable<Regex> excludeDir, Configuration cfg)
         {
             foreach (var dir in directories)
             {
                 if (cfg.Verbose) Console.WriteLine("D: {0}", dir);
-                if (includeDir.Any() && !includeDir.Any(r => r.Match(dir).Success)) continue;
-                if (excludeDir.Any() && excludeDir.Any(r => r.Match(dir).Success)) continue;
+                if (!isFirstLevel)
+                {
+                    if (includeDir.Any() && !includeDir.Any(r => r.Match(dir).Success)) continue;
+                    if (excludeDir.Any() && excludeDir.Any(r => r.Match(dir).Success)) continue;
+                }
 
                 foreach (var pattern in cfg.Filter)
                 {
@@ -212,7 +212,7 @@ private static void CollectFilesRecurse(List<string> files, IEnumerable<string>
 
                 if (cfg.Recurse)
                 {
-                    CollectFilesRecurse(files, Directory.GetDirectories(dir), include, exclude, includeDir, excludeDir, cfg);
+                    CollectFilesRecurse(files, Directory.GetDirectories(dir), false, include, exclude, includeDir, excludeDir, cfg);
                 }
             }
         }