omdev 0.0.0.dev164__py3-none-any.whl → 0.0.0.dev165__py3-none-any.whl

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/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.dist-info → omdev-0.0.0.dev165.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev164
+Version: 0.0.0.dev165
 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.dev165
 Provides-Extra: all
 Requires-Dist: black~=24.10; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev164.dist-info → omdev-0.0.0.dev165.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=Dm-Nd3V7Ry9d3-tO5OnUM7IYT2_ldruPEjxcSr4BA1U,8306
+omdev/.manifests.json,sha256=tF8O0ywJseQMbbhT2b67QAvjuAaHXLY1MyjeMrDObos,8306
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -142,7 +142,7 @@ omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/toml/parser.py,sha256=ojhCYIk23ELRx2f9xUCwLTRq13UM6wrYGWoyxZBurlo,29327
 omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
-omdev/tools/cloc.py,sha256=13lUsYLyn1LoelhsCeKrRkIwwPE0x54JmdhXJ_lvWh0,3811
+omdev/tools/cloc.py,sha256=r5HkvaLoGw8djgvGdt_W_CjfSklW585dar9bDhDFeF8,5098
 omdev/tools/doc.py,sha256=iblgUq9_7JZN2i8qmvewrz4OX0paObscBaCj8u77WqI,2555
 omdev/tools/docker.py,sha256=mu0sWnH_L1JjScfWCXXYaux03mcotCS03SD65I93qHI,7384
 omdev/tools/git.py,sha256=zfdPnN-9WSeOQlLoTw5aqAX-UWvz-2p330dx_zaU0WQ,7014
@@ -164,9 +164,9 @@ omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev164.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev164.dist-info/METADATA,sha256=83Zwo5XiW3PNQLrwzB3Kdi4NKBsU1LXpTyZ2sd1HaR4,1760
-omdev-0.0.0.dev164.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev164.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev164.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev164.dist-info/RECORD,,
+omdev-0.0.0.dev165.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev165.dist-info/METADATA,sha256=djJeiQrUAVjts2OjpttnE69PQiKuV_wm3QIHBEWaS8A,1760
+omdev-0.0.0.dev165.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev165.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev165.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev165.dist-info/RECORD,,