Adds include filtering support. (#60)

Author: gfs

Lib/Collectors/FileSystem/FileSystemMonitor.cs

@@ -207,7 +207,7 @@ public void WriteRename(RenamedEventArgs obj)
 
         private void OnChanged(object source, FileSystemEventArgs e)
         {
-            if (Filter.IsFiltered(Filter.RuntimeString(), "Monitor", "File", "Path", "Exclude", e.FullPath))
+            if (Filter.IsFiltered(Filter.RuntimeString(), "Monitor", "File", "Path", e.FullPath))
             {
                 return;
             }
@@ -238,7 +238,7 @@ private void OnChanged(object source, FileSystemEventArgs e)
 
         private void OnRenamed(object source, RenamedEventArgs e)
         {
-            if (Filter.IsFiltered(Filter.RuntimeString(), "Monitor", "File", "Path", "Exclude", e.FullPath))
+            if (Filter.IsFiltered(Filter.RuntimeString(), "Monitor", "File", "Path", e.FullPath))
             {
                 return;
             }

Lib/Collectors/Registry/RegistryCollector.cs

@@ -128,37 +128,40 @@ public override void Execute()
                 (hive =>
                 {
                     Logger.Instance.Debug("Starting " + hive.ToString());
-                    if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "Registry", "Hive", "Exclude", hive.ToString(), out Regex Capturer))
+                    if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "Registry", "Hive", "Include", hive.ToString()))
+                    {
+                    }
+                    else if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "Registry", "Hive", "Exclude", hive.ToString(), out Regex Capturer))
                     {
-                        Logger.Instance.Info("Hi mom");
                         Logger.Instance.Info("Excluding hive '{0}' due to filter '{1}'.", hive.ToString(), Capturer.ToString());
+
+                        return;
                     }
-                    else
+
+                    var registryInfoEnumerable = RegistryWalker.WalkHive(hive);
+                    try
                     {
-                        var registryInfoEnumerable = RegistryWalker.WalkHive(hive);
-                        try
-                        {
-                            Parallel.ForEach(registryInfoEnumerable,
-                                (registryObject =>
+                        Parallel.ForEach(registryInfoEnumerable,
+                            (registryObject =>
+                            {
+                                try
                                 {
-                                    try
-                                    {
-                                        Write(registryObject);
-                                    }
-                                    // Some registry keys don't get along
-                                    catch (InvalidOperationException e)
-                                    {
-                                        Logger.Instance.Debug(registryObject.Key + " " + e.GetType());
-                                    }
-                                }));
-                        }
-                        catch (Exception e)
-                        {
-                            Logger.Instance.Debug(e.GetType());
-                            Logger.Instance.Debug(e.Message);
-                            Logger.Instance.Debug(e.StackTrace);
-                        }
+                                    Write(registryObject);
+                                }
+                                // Some registry keys don't get along
+                                catch (InvalidOperationException e)
+                                {
+                                    Logger.Instance.Debug(registryObject.Key + " " + e.GetType());
+                                }
+                            }));
                     }
+                    catch (Exception e)
+                    {
+                        Logger.Instance.Debug(e.GetType());
+                        Logger.Instance.Debug(e.Message);
+                        Logger.Instance.Debug(e.StackTrace);
+                    }
+
                 }));
 
             DatabaseManager.Commit();

Lib/Utils/DirectoryWalker.cs

@@ -24,7 +24,7 @@ public static IEnumerable<FileSystemInfo> WalkDirectory(string root)
             {
                 string currentDir = dirs.Pop();
 
-                if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "File", "Path", "Exclude", currentDir))
+                if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "File", "Path", currentDir))
                 {
                     continue;
                 }
@@ -100,7 +100,7 @@ public static IEnumerable<FileSystemInfo> WalkDirectory(string root)
                         continue;
                     }
                     string FullPath = String.Format("{0}{1}{2}", currentDir, Path.PathSeparator, file);
-                    if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "File", "Path", "Exclude", FullPath))
+                    if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "File", "Path", FullPath))
                     {
                         continue;
                     }

Lib/Utils/Filter.cs

@@ -29,6 +29,15 @@ public static string RuntimeString()
             return "Unknown";
         }
 
+        public static bool IsFiltered(string Platform, string ScanType, string ItemType, string Property, string Target)
+        {
+            if (IsFiltered(Platform, ScanType, ItemType, Property, "include", Target))
+            {
+                return false;
+            }
+            return IsFiltered(Platform, ScanType, ItemType, Property, "exclude", Target);
+        }
+
         public static bool IsFiltered(string Platform, string ScanType, string ItemType, string Property, string FilterType, string Target) => IsFiltered(Platform, ScanType, ItemType, Property, FilterType, Target, out Regex dummy);
 
         public static bool IsFiltered(string Platform, string ScanType, string ItemType, string Property, string FilterType, string Target, out Regex regex)

Lib/Utils/RegistryWalker.cs

@@ -33,7 +33,7 @@ public static IEnumerable<RegistryObject> WalkHive(RegistryHive Hive)
                 {
                     continue;
                 }
-                if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "Registry", "Key", "Exclude", currentKey.Name))
+                if (Filter.IsFiltered(Filter.RuntimeString(), "Scan", "Registry", "Key", currentKey.Name))
                 {
                     continue;
                 }