omdev 0.0.0.dev164__tar.gz → 0.0.0.dev166__tar.gz

{omdev-0.0.0.dev164/omdev.egg-info → omdev-0.0.0.dev166}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev164
+Version: 0.0.0.dev166
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev164
+Requires-Dist: omlish==0.0.0.dev166
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev164 → omdev-0.0.0.dev166}/omdev/.manifests.json

@@ -231,7 +231,7 @@
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/cloc.py",
-    "line": 144,
+    "line": 194,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cloc",

{omdev-0.0.0.dev164 → omdev-0.0.0.dev166}/omdev/tools/cloc.py

@@ -71,15 +71,29 @@ def count_lines(file_path: str, language: str) -> FileLineCount:
     )
 
 
-def count_lines_in_directory(directory: str) -> ta.Mapping[str, FileLineCount]:
+def count_lines_in_directory(
+        directory: str,
+        *,
+        include: list[re.Pattern[str]] | None = None,
+        exclude: list[re.Pattern[str]] | None = None,
+) -> ta.Mapping[str, FileLineCount]:
     results: dict[str, FileLineCount] = {}
     for root, _, files in os.walk(directory):
         for file in files:
             ext = os.path.splitext(file)[1]
-            if ext in SUPPORTED_EXTENSIONS:
-                language = SUPPORTED_EXTENSIONS[ext]
-                file_path = os.path.join(root, file)
-                results[file_path] = count_lines(file_path, language)
+            if ext not in SUPPORTED_EXTENSIONS:
+                continue
+
+            file_path = os.path.join(root, file)
+
+            if include and not any(p.fullmatch(file_path) for p in include):
+                continue
+            if exclude and any(p.fullmatch(file_path) for p in exclude):
+                continue
+
+            language = SUPPORTED_EXTENSIONS[ext]
+            results[file_path] = count_lines(file_path, language)
+
     return results
 
 
@@ -132,14 +146,50 @@ def _main() -> None:
     import argparse
 
     parser = argparse.ArgumentParser(description='Count lines of code in source files.')
+
     parser.add_argument('directory', help='The directory to analyze.', nargs='+')
+
+    parser.add_argument('-i,', '--include', action='append')
+    parser.add_argument('-e,', '--exclude', action='append')
+
     args = parser.parse_args()
 
+    #
+
+    include: list[re.Pattern[str]] | None = None
+    if args.include:
+        include = [re.compile(p) for p in args.include]
+
+    exclude: list[re.Pattern[str]] | None = None
+    if args.exclude:
+        exclude = [re.compile(p) for p in args.exclude]
+
+    #
+
+    results_by_directory: dict[str, FileLineCount] = {}
     for directory in args.directory:
-        results = count_lines_in_directory(directory)
+        results = count_lines_in_directory(
+            directory,
+            include=include,
+            exclude=exclude,
+        )
+
+        if not results:
+            continue
+
         display_results(results)
         print()
 
+        results_by_directory[directory] = FileLineCount(
+            loc=sum(flc.loc for flc in results.values()),
+            blanks=sum(flc.blanks for flc in results.values()),
+            comments=sum(flc.comments for flc in results.values()),
+        )
+
+    if len(results_by_directory) > 1:
+        display_results(results_by_directory)
+        print()
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('cloc', __name__)

{omdev-0.0.0.dev164 → omdev-0.0.0.dev166/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev164
+Version: 0.0.0.dev166
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev164
+Requires-Dist: omlish==0.0.0.dev166
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev164 → omdev-0.0.0.dev166}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev164
+omlish==0.0.0.dev166
 
 [all]
 black~=24.10

{omdev-0.0.0.dev164 → omdev-0.0.0.dev166}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev164'
+version = '0.0.0.dev166'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev164',
+    'omlish == 0.0.0.dev166',
 ]
 
 [project.optional-dependencies]