refactor: reduce cognitive complexity in core modules

Author: nikolay-e

src/treemapper/cli.py

@@ -34,7 +34,7 @@ def _validate_budget(budget: int | None) -> None:
 
 
 def _validate_alpha(alpha: float) -> None:
-    if not 0 < alpha < 1:
+    if alpha <= 0 or alpha >= 1:
         _exit_error(f"--alpha must be between 0 and 1 (exclusive), got {alpha}")
 
 

src/treemapper/treemapper.py

@@ -1,83 +1,114 @@
+from __future__ import annotations
+
 import logging
 import sys
+from typing import TYPE_CHECKING, Any
 
+if TYPE_CHECKING:
+    from .cli import ParsedArgs
 
-def main() -> None:
-    # Force UTF-8 for stdout on Windows (default cp1252 can't handle Unicode)
+
+def _configure_windows_utf8() -> None:
     if sys.platform == "win32" and hasattr(sys.stdout, "reconfigure"):
         sys.stdout.reconfigure(encoding="utf-8")
-    from .cli import parse_args
-    from .clipboard import ClipboardError, copy_to_clipboard
+
+
+def _build_diff_tree(args: ParsedArgs) -> dict[str, Any]:
+    from .diffctx import GitError, build_diff_context
+
+    assert args.diff_range is not None
+    try:
+        return build_diff_context(
+            root_dir=args.root_dir,
+            diff_range=args.diff_range,
+            budget_tokens=args.budget,
+            alpha=args.alpha,
+            tau=args.tau,
+            no_content=args.no_content,
+            ignore_file=args.ignore_file,
+            no_default_ignores=args.no_default_ignores,
+            full=args.full_diff,
+        )
+    except GitError as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+def _build_standard_tree(args: ParsedArgs) -> dict[str, Any]:
     from .ignore import get_ignore_specs
-    from .logger import setup_logging
-    from .tokens import print_token_summary
     from .tree import TreeBuildContext, build_tree
-    from .writer import tree_to_string, write_string_to_file
 
+    ctx = TreeBuildContext(
+        base_dir=args.root_dir,
+        combined_spec=get_ignore_specs(args.root_dir, args.ignore_file, args.no_default_ignores, args.output_file),
+        output_file=args.output_file,
+        max_depth=args.max_depth,
+        no_content=args.no_content,
+        max_file_bytes=args.max_file_bytes,
+    )
+    return {
+        "name": args.root_dir.name,
+        "type": "directory",
+        "children": build_tree(args.root_dir, ctx),
+    }
+
+
+def _handle_clipboard(output_content: str, args: ParsedArgs) -> bool:
+    from .clipboard import ClipboardError, copy_to_clipboard
+
+    if not args.copy:
+        return False
     try:
-        args = parse_args()
-        setup_logging(args.verbosity)
-
-        if args.diff_range:
-            from .diffctx import GitError, build_diff_context
-
-            try:
-                directory_tree = build_diff_context(
-                    root_dir=args.root_dir,
-                    diff_range=args.diff_range,
-                    budget_tokens=args.budget,
-                    alpha=args.alpha,
-                    tau=args.tau,
-                    no_content=args.no_content,
-                    ignore_file=args.ignore_file,
-                    no_default_ignores=args.no_default_ignores,
-                    full=args.full_diff,
-                )
-            except GitError as e:
-                print(f"Error: {e}", file=sys.stderr)
-                sys.exit(1)
-        else:
-            ctx = TreeBuildContext(
-                base_dir=args.root_dir,
-                combined_spec=get_ignore_specs(args.root_dir, args.ignore_file, args.no_default_ignores, args.output_file),
-                output_file=args.output_file,
-                max_depth=args.max_depth,
-                no_content=args.no_content,
-                max_file_bytes=args.max_file_bytes,
-            )
-
-            directory_tree = {
-                "name": args.root_dir.name,
-                "type": "directory",
-                "children": build_tree(args.root_dir, ctx),
-            }
-
-        output_content = tree_to_string(directory_tree, args.output_format)
-        print_token_summary(output_content)
-
-        clipboard_ok = False
-        if args.copy:
-            try:
-                copy_to_clipboard(output_content)
-                print("Copied to clipboard", file=sys.stderr)
-                clipboard_ok = True
-            except ClipboardError as e:
-                print(f"Clipboard unavailable: {e}", file=sys.stderr)
-
-        if args.output_file:
-            try:
-                write_string_to_file(output_content, args.output_file, args.output_format)
-                print(f"Saved to {args.output_file}", file=sys.stderr)
-            except IsADirectoryError:
-                print(f"Error: {args.output_file} is a directory", file=sys.stderr)
-                sys.exit(1)
-            except OSError:
-                sys.exit(1)
-        elif args.force_stdout or not args.copy or not clipboard_ok:
-            # force_stdout: -o - was explicitly passed (forces stdout even with --copy)
-            sys.stdout.write(output_content)
-            logging.info(f"Directory tree written to stdout in {args.output_format} format")
+        copy_to_clipboard(output_content)
+        print("Copied to clipboard", file=sys.stderr)
+        return True
+    except ClipboardError as e:
+        print(f"Clipboard unavailable: {e}", file=sys.stderr)
+        return False
 
+
+def _handle_output_file(output_content: str, args: ParsedArgs) -> None:
+    from .writer import write_string_to_file
+
+    if not args.output_file:
+        return
+    try:
+        write_string_to_file(output_content, args.output_file, args.output_format)
+        print(f"Saved to {args.output_file}", file=sys.stderr)
+    except IsADirectoryError:
+        print(f"Error: {args.output_file} is a directory", file=sys.stderr)
+        sys.exit(1)
+    except OSError:
+        sys.exit(1)
+
+
+def _run() -> None:
+    from .cli import parse_args
+    from .logger import setup_logging
+    from .tokens import print_token_summary
+    from .writer import tree_to_string
+
+    args = parse_args()
+    setup_logging(args.verbosity)
+
+    directory_tree = _build_diff_tree(args) if args.diff_range else _build_standard_tree(args)
+
+    output_content = tree_to_string(directory_tree, args.output_format)
+    print_token_summary(output_content)
+
+    clipboard_ok = _handle_clipboard(output_content, args)
+    _handle_output_file(output_content, args)
+
+    should_write_stdout = args.force_stdout or not args.copy or not clipboard_ok
+    if not args.output_file and should_write_stdout:
+        sys.stdout.write(output_content)
+        logging.info(f"Directory tree written to stdout in {args.output_format} format")
+
+
+def main() -> None:
+    _configure_windows_utf8()
+    try:
+        _run()
     except KeyboardInterrupt:
         print("\nInterrupted", file=sys.stderr)
         sys.exit(130)

tests/conftest.py

@@ -115,13 +115,8 @@ def _run(args):
                 main()
                 return True
             except SystemExit as e:
-                if e.code != 0:
-                    print(f"SystemExit caught with code: {e.code}")
-                    return False
-                return True
-            except Exception as e:
-                print(f"Caught unexpected exception in run_mapper: {e}")
-                raise
+                # Intentional: CLI uses sys.exit() for normal termination
+                return e.code == 0
 
     return _run
 
@@ -165,30 +160,39 @@ def run_treemapper_subprocess(args, cwd=None, **kwargs):
     return subprocess.run(command, cwd=cwd, **kwargs)
 
 
-# ---> НАЧАЛО: Перенесенная фикстура set_perms <---
+def _check_wsl_windows_path(path: Path) -> bool:
+    if not IS_WSL:
+        return False
+    return "/mnt/" in str(path)
+
+
+def _restore_permissions(paths_changed: list[Path], original_perms: dict[Path, int]) -> None:
+    logging.debug(f"Cleaning up permissions for: {paths_changed}")
+    for path in paths_changed:
+        if not path.exists() or path not in original_perms:
+            continue
+        orig = original_perms[path]
+        if orig is None:
+            logging.warning(f"Original permissions for {path} were None, not restoring.")
+            continue
+        try:
+            os.chmod(path, orig)
+            logging.debug(f"Restored permissions for {path}")
+        except OSError as e:
+            logging.warning(f"Could not restore permissions for {path}: {e}")
+
+
 @pytest.fixture
-def set_perms(request):
+def set_perms():
     """Fixture to temporarily set file/directory permissions (non-Windows)."""
-    original_perms = {}
-    paths_changed = []
+    original_perms: dict[Path, int] = {}
+    paths_changed: list[Path] = []
 
     def _set_perms(path: Path, perms: int):
         if sys.platform == "win32":
             pytest.skip("Permission tests skipped on Windows.")
-
-        # Check if running in WSL environment
-        is_wsl = False
-        try:
-            with open("/proc/version") as f:
-                if "microsoft" in f.read().lower():
-                    is_wsl = True
-        except FileNotFoundError:
-            pass
-
-        # Skip tests on Windows paths in WSL
-        if is_wsl and "/mnt/" in str(path):
+        if _check_wsl_windows_path(path):
             pytest.skip(f"Permission tests skipped on Windows-mounted paths in WSL: {path}")
-
         if not path.exists():
             pytest.skip(f"Path does not exist, cannot set permissions: {path}")
         try:
@@ -201,20 +205,7 @@ def _set_perms(path: Path, perms: int):
 
     yield _set_perms
 
-    logging.debug(f"Cleaning up permissions for: {paths_changed}")
-    for path in paths_changed:
-        if path.exists() and path in original_perms:
-            try:
-                if original_perms[path] is not None:
-                    os.chmod(path, original_perms[path])
-                    logging.debug(f"Restored permissions for {path}")
-                else:
-                    logging.warning(f"Original permissions for {path} were None, not restoring.")
-            except OSError as e:
-                logging.warning(f"Could not restore permissions for {path}: {e}")
-
-
-# ---> КОНЕЦ: Перенесенная фикстура set_perms <---
+    _restore_permissions(paths_changed, original_perms)
 
 
 # --- New fixtures for test modernization ---