maketool 0.8.14__py3-none-any.whl → 0.8.15__py3-none-any.whl

maketool/refscan.py

@@ -7,17 +7,15 @@ Usage:
 
 Reports:
   1) UNUSED files: filename/path tokens not found in scanned text sources
-     - Printed as plain relative paths, grouped by extension (no headers, no blank lines)
   2) MISSING imports: imports used by entry (and local-resolved siblings) but not installed
-     - Printed as plain module names (no headers). Prints nothing if none missing.
 """
 
 from __future__ import annotations
 
 import ast
 import sys
-from dataclasses import dataclass
 from pathlib import Path
+from dataclasses import dataclass
 from typing import Dict, Iterable, List, Optional, Set
 
 try:
@@ -25,7 +23,6 @@ try:
 except Exception:
     packages_distributions = None  # type: ignore
 
-
 # ----------------------------
 # Refscan settings
 # ----------------------------
@@ -83,7 +80,6 @@ def safe_read_text(p: Path) -> Optional[str]:
     except Exception:
         return None
 
-
 def norm(s: str) -> str:
     return s.replace("\\", "/").lower()
 
@@ -97,10 +93,10 @@ def build_candidates(root: Path, files: list[Path]) -> list[Candidate]:
         stem = p.stem.lower()
 
         tokens = {
-            base,                         # rat.ico
-            stem,                         # common
-            rel_norm,                     # icons/rat.ico
-            rel_norm.replace("/", "\\"),  # icons\rat.ico
+            base,                          # rat.ico
+            stem,                          # common
+            rel_norm,                      # icons/rat.ico
+            rel_norm.replace("/", "\\"),   # icons\rat.ico
         }
         out.append(Candidate(p, rel, tuple(t for t in tokens if t)))
     return out
@@ -113,17 +109,36 @@ def is_text_source(p: Path) -> bool:
     return ext in DEFAULT_SCAN_EXTS
 
 
-def print_unused_grouped_by_ext(unused_rels: list[str]) -> None:
-    # Sort by: extension (lower), then full relative path (lower)
-    def key(rel: str):
-        return (Path(rel).suffix.lower(), rel.lower())
+def print_group(title: str, rows: list[tuple[str, list[str]]]) -> None:
+    print(title)
+    print("-" * len(title))
+    for rel, refs in rows:
+        is_py = rel.lower().endswith(".py")
+        name = f"[PY] {rel}" if is_py else rel
+
+        if refs:
+            preview = ", ".join(refs[:3]) + (" ..." if len(refs) > 3 else "")
+            print(f"{name}   <-- {preview}")
+        else:
+            print(name)
+    print()
 
-    for rel in sorted(unused_rels, key=key):
-        print(rel)
+
+def print_group(title: str, rows: list[tuple[str, list[str]]]) -> None:
+    print(title)
+    print("-" * len(title))
+    for rel, refs in rows:
+        # no markers; print plain filename/path
+        if refs:
+            preview = ", ".join(refs[:3]) + (" ..." if len(refs) > 3 else "")
+            print(f"{rel}   <-- {preview}")
+        else:
+            print(rel)
+    print()
 
 
 # ----------------------------
-# Missing-import report
+# Missing-import report (merged from report.py)
 # ----------------------------
 
 def stdlib_names() -> Set[str]:
@@ -207,6 +222,7 @@ def _index_local_modules_under(root: Path) -> Set[str]:
 def index_local_modules(project_root: Path) -> Set[str]:
     roots: List[Path] = [project_root]
 
+    # common extra roots (optional)
     for name in ["src", "lib", "app", "python", "package", "packages"]:
         p = project_root / name
         if p.exists() and p.is_dir():
@@ -262,10 +278,21 @@ def compute_missing_used_imports(
             missing.add(name)
     return missing
 
+def print_unused_grouped_by_ext(unused_rels: list[str]) -> None:
+    # Sort by: extension (lower), then full path (lower)
+    def key(rel: str):
+        ext = Path(rel).suffix.lower()
+        return (ext, rel.lower())
+
+    for rel in sorted(unused_rels, key=key):
+        print(rel)
 
 def run_missing_imports_report(entry: Path, project_root: Path) -> None:
-    # Print nothing if we cannot compute or if there are none missing
+    print("MISSING (used but not installed):")
+    print("------------------------------")
+
     if packages_distributions is None:
+        print("(skipped: Python 3.8+ required for importlib.metadata.packages_distributions())\n")
         return
 
     std = stdlib_names()
@@ -281,8 +308,11 @@ def run_missing_imports_report(entry: Path, project_root: Path) -> None:
         project_root=project_root,
     )
 
+    if not missing: return
+
     for m in sorted(missing):
         print(m)
+    print()
 
 
 # ----------------------------
@@ -323,12 +353,21 @@ def main() -> int:
             if any(tok in hay for tok in c.tokens):
                 references[c.rel].append(src_rel)
 
-    unused_rels = [c.rel for c in candidates if not references[c.rel]]
-    print_unused_grouped_by_ext(unused_rels)
+    unused_rows: list[tuple[str, List[str]]] = []
+    for c in candidates:
+        refs = references[c.rel]
+        if not refs:
+            unused_rows.append((c.rel, refs))
+
+    print_group("UNUSED files (no filename/path tokens found)", unused_rows)
 
-    # Second report: missing imports (only if entry is .py)
+    # Second report: missing imports (based on entry .py)
     if entry.suffix.lower() == ".py":
         run_missing_imports_report(entry=entry, project_root=root)
+    else:
+        print("MISSING (used but not installed):")
+        print("------------------------------")
+        print("(skipped: entry is not a .py file)\n")
 
     return 0
 

{maketool-0.8.14.dist-info → maketool-0.8.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maketool
-Version: 0.8.14
+Version: 0.8.15
 Summary: Python Automation tool for building PySide6 UI and PyInstaller EXE.
 Author-email: Alan Lilly <panofish@gmail.com>
 Requires-Python: >=3.7

{maketool-0.8.14.dist-info → maketool-0.8.15.dist-info}/RECORD

@@ -2,11 +2,11 @@ maketool/__init__.py,sha256=in3uaJRClTGaMIQ6sg725m8so86U7gBr1QfCErxuLAk,172
 maketool/build.py,sha256=-x45Nq-FZyemyAmh1gZlZ0c_JcSUePsbViLCeZezb4o,3921
 maketool/clean.py,sha256=pJYb-kt23_HaOrckv8Kft09HKl9m4_Lt1Tf15HQCmvE,3245
 maketool/compile.py,sha256=n1mzoyU5hlOjHVn2ytCsZVEvN6hta8-VHyR25UGc1CQ,14496
-maketool/refscan.py,sha256=NXR2pb_uiJ5AYsNSBW9pNJBtaTlZ7e5kavVXUYXnzso,9305
+maketool/refscan.py,sha256=gym_Cdatvz63KOAvOLm6V1ksC42cnuFKsRSqXv5JoJI,10470
 maketool/run.py,sha256=UO6O7IaSl8XBqPEsC0CaTt65Or0m3_wQFvWZUnY4J00,2399
 maketool/sublime.py,sha256=Ah_Y3tT7ifpUh_pGugY7hqM4SQ0UE-OPLam2hZZtar0,9116
-maketool-0.8.14.dist-info/METADATA,sha256=ndEMje_eZHe_jFMIba_xg1HsVMvN0w0lAqAkrLnLC3c,4845
-maketool-0.8.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-maketool-0.8.14.dist-info/entry_points.txt,sha256=hYswW0t7b9YacCLg0-4zAI1CKKjeOH1LJfi34Z8lAPc,248
-maketool-0.8.14.dist-info/top_level.txt,sha256=e7JbT3AdVc2AJstJ1xW1hcwhwfFQ6U8QRdFzaFQe6sQ,9
-maketool-0.8.14.dist-info/RECORD,,
+maketool-0.8.15.dist-info/METADATA,sha256=CkSjPtk7JBS4jQhy1ZQX-alAznM4sOmDIZwcK-A4z90,4845
+maketool-0.8.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+maketool-0.8.15.dist-info/entry_points.txt,sha256=hYswW0t7b9YacCLg0-4zAI1CKKjeOH1LJfi34Z8lAPc,248
+maketool-0.8.15.dist-info/top_level.txt,sha256=e7JbT3AdVc2AJstJ1xW1hcwhwfFQ6U8QRdFzaFQe6sQ,9
+maketool-0.8.15.dist-info/RECORD,,