pyDiffTools 0.1.8__tar.gz → 0.1.11__tar.gz

{pydifftools-0.1.8/pyDiffTools.egg-info → pydifftools-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.8
+Version: 0.1.11
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.8 → pydifftools-0.1.11/pyDiffTools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyDiffTools
-Version: 0.1.8
+Version: 0.1.11
 Summary: Diff tools
 Author: J M Franck
 License: Copyright (c) 2015, jmfranck

{pydifftools-0.1.8 → pydifftools-0.1.11}/pydifftools/command_line.py

@@ -10,6 +10,7 @@ import re
 import nbformat
 import difflib
 import shutil
+import importlib.util
 from pathlib import Path
 from . import (
     match_spaces,
@@ -26,11 +27,31 @@ from .copy_files import copy_image_files
 from .searchacro import replace_acros
 from .rearrange_tex import run as rearrange_tex_run
 from .flowchart.watch_graph import wgrph
+from .flowchart.graph import load_graph_yaml
 from .notebook.tex_to_qmd import tex2qmd
 from .notebook.fast_build import qmdb, qmdinit
 
 from .command_registry import _COMMAND_SPECS, register_command
 
+_ARGCOMPLETE_SPEC = importlib.util.find_spec("argcomplete")
+if (
+    _ARGCOMPLETE_SPEC is not None
+    and _ARGCOMPLETE_SPEC.submodule_search_locations is not None
+):
+    _ARGCOMPLETE_COMPLETERS_SPEC = importlib.util.find_spec(
+        "argcomplete.completers"
+    )
+else:
+    _ARGCOMPLETE_COMPLETERS_SPEC = None
+if _ARGCOMPLETE_SPEC is not None:
+    import argcomplete
+else:
+    argcomplete = None
+if _ARGCOMPLETE_COMPLETERS_SPEC is not None:
+    from argcomplete.completers import FilesCompleter
+else:
+    FilesCompleter = None
+
 
 def printed_exec(cmd):
     print("about to execute:\n", cmd)
@@ -57,6 +78,37 @@ def get_data(path):
     return os.path.join(_ROOT, path)
 
 
+def wgrph_task_completer(prefix, parsed_args, **kwargs):
+    # Provide case-insensitive task name completions for wgrph -t.
+    if parsed_args is None or not hasattr(parsed_args, "yaml"):
+        return []
+    yaml_path = Path(parsed_args.yaml)
+    if not yaml_path.exists():
+        return []
+    try:
+        data = load_graph_yaml(str(yaml_path))
+    except Exception:
+        return []
+    if "nodes" not in data:
+        return []
+    prefix_lower = prefix.lower()
+    matches = []
+    for name in data["nodes"]:
+        if (
+            "style" in data["nodes"][name]
+            and data["nodes"][name]["style"] == "completed"
+        ):
+            continue
+        if name.lower().startswith(prefix_lower):
+            # Preserve case-insensitive matches even when the typed prefix
+            # doesn't match case so argcomplete still accepts the suggestion.
+            if name.startswith(prefix):
+                matches.append(name)
+            else:
+                matches.append(prefix + name[len(prefix) :])
+    return matches
+
+
 def recursive_include_search(directory, basename, does_it_input):
     with open(
         os.path.join(directory, basename + ".tex"), "r", encoding="utf-8"
@@ -704,7 +756,19 @@ def build_parser():
         for argument in arguments:
             flags = argument["flags"]
             kwargs = dict(argument["kwargs"])
-            subparser.add_argument(*flags, **kwargs)
+            action = subparser.add_argument(*flags, **kwargs)
+            if (
+                FilesCompleter is not None
+                and name == "wgrph"
+                and action.dest == "yaml"
+            ):
+                # Provide YAML-only completions for the flowchart watcher.
+                action.completer = FilesCompleter(
+                    allowednames=["*.yaml", "*.yml"]
+                )
+            if name == "wgrph" and action.dest == "t":
+                # Offer case-insensitive completions for incomplete task names.
+                action.completer = wgrph_task_completer
         subparser.set_defaults(_handler=spec["handler"])
     return parser
 
@@ -732,6 +796,9 @@ def main(argv=None):
                 file=sys.stderr,
             )
     parser = build_parser()
+    if argcomplete is not None:
+        # Enable argcomplete integration when the dependency is available.
+        argcomplete.autocomplete(parser)
     if not argv:
         parser.print_help()
         return

{pydifftools-0.1.8 → pydifftools-0.1.11}/pydifftools/flowchart/graph.py

@@ -324,7 +324,7 @@ def _node_text_with_due(node):
     # same visual emphasis used for overdue dates.
     if is_completed:
         due_color = "green"
-    elif due_date > today_date and (due_date - today_date).days <= 7:
+    elif (due_date - today_date).days <= 7:
         due_color = "red"
     else:
         due_color = "orange"
@@ -565,6 +565,7 @@ def write_dot_from_yaml(
     order_by_date=False,
     old_data=None,
     validate_due_dates=False,
+    filter_task=None,
 ):
     data = load_graph_yaml(str(yaml_path), old_data=old_data)
     _normalize_graph_dates(data)
@@ -611,8 +612,71 @@ def write_dot_from_yaml(
                         parents_to_check.append(
                             (grandparent, path + [grandparent])
                         )
+    data_for_dot = data
+    if filter_task is not None:
+        # Limit the rendered graph to incomplete ancestors of the target task.
+        if "nodes" not in data or filter_task not in data["nodes"]:
+            # Allow case-insensitive task lookup to align with CLI completion.
+            matches = [
+                name
+                for name in data["nodes"]
+                if name.lower() == filter_task.lower()
+            ]
+            if len(matches) == 1:
+                filter_task = matches[0]
+            elif len(matches) > 1:
+                raise ValueError(
+                    "Task name is ambiguous when compared case-insensitively: "
+                    f"'{filter_task}' matches {matches}."
+                )
+            else:
+                raise ValueError(
+                    f"Task '{filter_task}' not found in flowchart YAML."
+                )
+        # Include the target task alongside its ancestors in the filtered view.
+        ancestors = set([filter_task])
+        parents_to_check = list(data["nodes"][filter_task]["parents"])
+        while parents_to_check:
+            parent = parents_to_check.pop()
+            if parent in ancestors:
+                continue
+            ancestors.add(parent)
+            if (
+                parent in data["nodes"]
+                and "parents" in data["nodes"][parent]
+            ):
+                for grandparent in data["nodes"][parent]["parents"]:
+                    parents_to_check.append(grandparent)
+        incomplete_ancestors = set()
+        for name in ancestors:
+            if name not in data["nodes"]:
+                continue
+            if (
+                "style" in data["nodes"][name]
+                and data["nodes"][name]["style"] == "completed"
+            ):
+                continue
+            incomplete_ancestors.add(name)
+        data_for_dot = {"nodes": {}, "styles": {}}
+        if "styles" in data:
+            data_for_dot["styles"] = data["styles"]
+        for name in incomplete_ancestors:
+            data_for_dot["nodes"][name] = dict(data["nodes"][name])
+        for name in data_for_dot["nodes"]:
+            if "children" in data_for_dot["nodes"][name]:
+                data_for_dot["nodes"][name]["children"] = [
+                    child
+                    for child in data_for_dot["nodes"][name]["children"]
+                    if child in incomplete_ancestors
+                ]
+            if "parents" in data_for_dot["nodes"][name]:
+                data_for_dot["nodes"][name]["parents"] = [
+                    parent
+                    for parent in data_for_dot["nodes"][name]["parents"]
+                    if parent in incomplete_ancestors
+                ]
     dot_str = yaml_to_dot(
-        data, wrap_width=wrap_width, order_by_date=order_by_date
+        data_for_dot, wrap_width=wrap_width, order_by_date=order_by_date
     )
     Path(dot_path).write_text(dot_str)
     if update_yaml:

{pydifftools-0.1.8 → pydifftools-0.1.11}/pydifftools/flowchart/watch_graph.py

@@ -26,6 +26,23 @@ def _reload_svg(driver, svg_file: Path) -> None:
     )
 
 
+def start_chrome(webdriver, options, html_file):
+    # Launch Chrome and display the local SVG preview HTML file.
+    driver = webdriver.Chrome(options=options)
+    driver.get(html_file.resolve().as_uri())
+    return driver
+
+
+def close_chrome(driver):
+    # Close the Chrome window if it is still running.
+    if driver is None:
+        return
+    try:
+        driver.quit()
+    except Exception:
+        pass
+
+
 def build_graph(
     yaml_file,
     dot_file,
@@ -33,6 +50,7 @@ def build_graph(
     wrap_width,
     order_by_date=False,
     prev_data=None,
+    target_task=None,
 ):
     # Graphviz is required for dot -> svg rendering.
     if shutil.which("dot") is None:
@@ -47,6 +65,7 @@ def build_graph(
         order_by_date=order_by_date,
         old_data=prev_data,
         validate_due_dates=True,
+        filter_task=target_task,
     )
     subprocess.run(
         ["dot", "-Tsvg", str(dot_file), "-o", str(svg_file)],
@@ -61,19 +80,27 @@ class GraphEventHandler(FileSystemEventHandler):
         yaml_file,
         dot_file,
         svg_file,
-        driver,
-        wrap_width,
-        data,
+        html_file=None,
+        driver=None,
+        options=None,
+        webdriver=None,
+        wrap_width=55,
+        data=None,
         order_by_date=False,
+        target_task=None,
         debounce=0.25,
     ):
         self.yaml_file = Path(yaml_file)
         self.dot_file = Path(dot_file)
         self.svg_file = Path(svg_file)
+        self.html_file = None if html_file is None else Path(html_file)
         self.driver = driver
+        self.options = options
+        self.webdriver = webdriver
         self.wrap_width = wrap_width
         self.data = data
         self.order_by_date = order_by_date
+        self.target_task = target_task
         self.debounce = debounce
         self._last_handled = 0.0
         self._last_mtime = None
@@ -87,15 +114,40 @@ class GraphEventHandler(FileSystemEventHandler):
             if now - self._last_handled < self.debounce:
                 return
             self._last_handled = now
-            self.data = build_graph(
-                self.yaml_file,
-                self.dot_file,
-                self.svg_file,
-                self.wrap_width,
-                self.order_by_date,
-                self.data,
-            )
-            _reload_svg(self.driver, self.svg_file)
+            try:
+                self.data = build_graph(
+                    self.yaml_file,
+                    self.dot_file,
+                    self.svg_file,
+                    self.wrap_width,
+                    self.order_by_date,
+                    self.data,
+                    self.target_task,
+                )
+            except Exception:
+                # If the graph fails to build (e.g. invalid date), close the
+                # preview window until a clean rebuild occurs.
+                close_chrome(self.driver)
+                self.driver = None
+                self._last_mtime = self.yaml_file.stat().st_mtime
+                return
+            if self.driver is None:
+                # Restart the preview once the SVG successfully builds again.
+                if (
+                    self.webdriver is not None
+                    and self.options is not None
+                    and self.html_file is not None
+                ):
+                    self.driver = start_chrome(
+                        self.webdriver, self.options, self.html_file
+                    )
+                else:
+                    # Allow legacy/test usage without a live driver.
+                    _reload_svg(self.driver, self.svg_file)
+                    self._last_mtime = self.yaml_file.stat().st_mtime
+                    return
+            else:
+                _reload_svg(self.driver, self.svg_file)
             self._last_mtime = self.yaml_file.stat().st_mtime
 
 
@@ -106,9 +158,12 @@ class GraphEventHandler(FileSystemEventHandler):
         "yaml": "Path to the flowchart YAML file",
         "wrap_width": "Line wrap width used when generating node labels",
         "d": "Render nodes by date without showing connections",
+        "t": (
+            "Task name to focus on (show incomplete ancestor tasks only)"
+        ),
     },
 )
-def wgrph(yaml, wrap_width=55, d=False):
+def wgrph(yaml, wrap_width=55, d=False, t=None):
     # Selenium is only required when actually launching the watcher, so it is
     # imported here to avoid breaking the command-line tools when the optional
     # dependency is not installed.
@@ -134,35 +189,47 @@ def wgrph(yaml, wrap_width=55, d=False):
     html_file = yaml_file.with_suffix(".html")
 
     # Use date ordering when requested so boxes appear in calendar order.
-    data = build_graph(yaml_file, dot_file, svg_file, wrap_width, d)
+    # Render the initial graph, optionally restricting to incomplete ancestors
+    # of a target task.
+    data = build_graph(yaml_file, dot_file, svg_file, wrap_width, d, None, t)
     html_file.write_text(
         "<html><body style='margin:0'><embed id='svg-view'"
         " type='image/svg+xml'"
         f" src='{svg_file.name}?t={time.time()}'/></body></html>"
     )
     options = Options()
-    driver = webdriver.Chrome(options=options)
-    driver.get(html_file.resolve().as_uri())
+    driver = start_chrome(webdriver, options, html_file)
     event_handler = GraphEventHandler(
-        yaml_file, dot_file, svg_file, driver, wrap_width, data, d
+        yaml_file,
+        dot_file,
+        svg_file,
+        html_file,
+        driver,
+        options,
+        webdriver,
+        wrap_width,
+        data,
+        d,
+        t,
     )
     observer = Observer()
     observer.schedule(event_handler, yaml_file.parent, recursive=False)
     observer.start()
     try:
         while True:
+            if event_handler.driver is None:
+                time.sleep(1)
+                continue
             try:
-                _ = driver.window_handles
-                driver.execute_script("return 1")
+                _ = event_handler.driver.window_handles
+                event_handler.driver.execute_script("return 1")
             except (NoSuchWindowException, WebDriverException):
-                break
+                close_chrome(event_handler.driver)
+                event_handler.driver = None
             time.sleep(1)
     except KeyboardInterrupt:
         pass
     finally:
         observer.stop()
         observer.join()
-        try:
-            driver.quit()
-        except Exception:
-            pass
+        close_chrome(event_handler.driver)

{pydifftools-0.1.8 → pydifftools-0.1.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyDiffTools"
-version = "0.1.8"
+version = "0.1.11"
 authors = [{ name = "J M Franck" }]
 description = "Diff tools"
 readme = "README.rst"