♻️ Factor out module-level boilerplate into make_module_api()

Author: frack113

sigma/validators/sigmahq/data/base.py

@@ -106,3 +106,13 @@ def set_cache_dir(self, cache_dir: str) -> None:
         if self._cache is not None:
             self._cache.close()
             self._cache = None
+
+
+def make_module_api(loader_cls: type) -> dict:
+    loader = loader_cls()
+    return {
+        "__getattr__": lambda name: loader.get_attr(name, loader_cls.__module__),
+        "clear_cache": loader.clear_cache,
+        "set_url": loader.set_url,
+        "set_cache_dir": loader.set_cache_dir,
+    }

sigma/validators/sigmahq/data/data_filename.py

@@ -2,7 +2,7 @@
 
 from sigma.rule import SigmaLogSource
 
-from .base import SigmahqDataLoader
+from .base import SigmahqDataLoader, make_module_api
 
 
 class _FilenameLoader(SigmahqDataLoader):
@@ -33,20 +33,4 @@ def _parse(self, json_data: Dict[str, Any]) -> Dict[str, Any]:
         }
 
 
-_loader = _FilenameLoader()
-
-
-def __getattr__(name: str) -> Any:
-    return _loader.get_attr(name, __name__)
-
-
-def clear_cache() -> None:
-    _loader.clear_cache()
-
-
-def set_url(url: str) -> None:
-    _loader.set_url(url)
-
-
-def set_cache_dir(cache_dir: str) -> None:
-    _loader.set_cache_dir(cache_dir)
+globals().update(make_module_api(_FilenameLoader))

sigma/validators/sigmahq/data/data_taxonomy.py

@@ -2,7 +2,7 @@
 
 from sigma.rule import SigmaLogSource
 
-from .base import SigmahqDataLoader
+from .base import SigmahqDataLoader, make_module_api
 
 
 class _TaxonomyLoader(SigmahqDataLoader):
@@ -44,20 +44,4 @@ def _parse(self, json_data: Dict[str, Any]) -> Dict[str, Any]:
         }
 
 
-_loader = _TaxonomyLoader()
-
-
-def __getattr__(name: str) -> Any:
-    return _loader.get_attr(name, __name__)
-
-
-def clear_cache() -> None:
-    _loader.clear_cache()
-
-
-def set_url(url: str) -> None:
-    _loader.set_url(url)
-
-
-def set_cache_dir(cache_dir: str) -> None:
-    _loader.set_cache_dir(cache_dir)
+globals().update(make_module_api(_TaxonomyLoader))

sigma/validators/sigmahq/data/data_windows_eventid.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 
-from .base import SigmahqDataLoader
+from .base import SigmahqDataLoader, make_module_api
 
 
 class _EventIdLoader(SigmahqDataLoader):
@@ -18,20 +18,4 @@ def _parse(self, json_data: Dict[str, Any]) -> Dict[str, Any]:
         }
 
 
-_loader = _EventIdLoader()
-
-
-def __getattr__(name: str) -> Any:
-    return _loader.get_attr(name, __name__)
-
-
-def clear_cache() -> None:
-    _loader.clear_cache()
-
-
-def set_url(url: str) -> None:
-    _loader.set_url(url)
-
-
-def set_cache_dir(cache_dir: str) -> None:
-    _loader.set_cache_dir(cache_dir)
+globals().update(make_module_api(_EventIdLoader))

sigma/validators/sigmahq/data/data_windows_provider.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 
-from .base import SigmahqDataLoader
+from .base import SigmahqDataLoader, make_module_api
 
 
 class _ProviderLoader(SigmahqDataLoader):
@@ -18,20 +18,4 @@ def _parse(self, json_data: Dict[str, Any]) -> Dict[str, Any]:
         }
 
 
-_loader = _ProviderLoader()
-
-
-def __getattr__(name: str) -> Any:
-    return _loader.get_attr(name, __name__)
-
-
-def clear_cache() -> None:
-    _loader.clear_cache()
-
-
-def set_url(url: str) -> None:
-    _loader.set_url(url)
-
-
-def set_cache_dir(cache_dir: str) -> None:
-    _loader.set_cache_dir(cache_dir)
+globals().update(make_module_api(_ProviderLoader))