pyDiffTools 0.1.23__tar.gz → 0.1.24__tar.gz

{pydifftools-0.1.23/pyDiffTools.egg-info → pydifftools-0.1.24}/PKG-INFO

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

{pydifftools-0.1.23 → pydifftools-0.1.24/pyDiffTools.egg-info}/PKG-INFO

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

{pydifftools-0.1.23 → pydifftools-0.1.24}/pydifftools/command_line.py

@@ -796,8 +796,35 @@ def pmd(arguments):
     p1.wait()
 
 
+def _subcommand_help_hint(prog):
+    return (
+        f"*** Run '{prog} --help <subcommand>' to learn about "
+        "subcommand options. ***"
+    )
+
+
+class PyDiffArgumentParser(argparse.ArgumentParser):
+    """ArgumentParser with a clearer root-level missing-subcommand hint."""
+
+    def __init__(self, *args, is_root_parser=False, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._pydifft_is_root_parser = is_root_parser
+
+    def error(self, message):
+        if self._pydifft_is_root_parser:
+            self.print_usage(sys.stderr)
+            hint = _subcommand_help_hint(self.prog)
+            self.exit(2, f"{self.prog}: error: {message}\n{hint}\n")
+        super().error(message)
+
+
 def build_parser():
-    parser = argparse.ArgumentParser()
+    parser = PyDiffArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        is_root_parser=True,
+    )
+    parser.epilog = _subcommand_help_hint(parser.prog)
+    parser._pydifft_subparsers = {}
     subparsers = parser.add_subparsers(dest="command")
     subparsers.required = True
     for name, spec in _COMMAND_SPECS.items():
@@ -823,10 +850,18 @@ def build_parser():
                 action.completer = FilesCompleter(
                     allowednames=["*.yaml", "*.yml"]
                 )
+            if (
+                FilesCompleter is not None
+                and name == "cpb"
+                and action.dest == "filename"
+            ):
+                # Provide Markdown-only completions for continuous pandoc build.
+                action.completer = FilesCompleter(allowednames=["*.md"])
             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"])
+        parser._pydifft_subparsers[name] = subparser
     return parser
 
 
@@ -859,6 +894,11 @@ def main(argv=None):
     if not argv:
         parser.print_help()
         return
+    if argv[0] in ("-h", "--help") and len(argv) > 1:
+        subcommand = argv[1]
+        if subcommand in parser._pydifft_subparsers:
+            parser._pydifft_subparsers[subcommand].print_help()
+            return
     namespace = parser.parse_args(argv)
     handler = namespace._handler
     handler_kwargs = dict(vars(namespace))

{pydifftools-0.1.23 → pydifftools-0.1.24}/pydifftools/flowchart/watch_graph.py

@@ -185,6 +185,48 @@ def _svg_shape_bounds(shape, namespace):
     return None
 
 
+def _svg_parse_viewbox(svg_root):
+    viewbox = svg_root.attrib.get("viewBox")
+    if viewbox is None:
+        return None
+    parts = viewbox.replace(",", " ").split()
+    if len(parts) != 4:
+        return None
+    try:
+        return tuple(float(part) for part in parts)
+    except ValueError:
+        return None
+
+
+def _svg_add_canvas_padding(svg_root, padding=8.0):
+    # Graphviz emits a tight canvas; add small fixed padding so post-processed
+    # outlines and anti-aliased strokes are never clipped at edges.
+    viewbox = _svg_parse_viewbox(svg_root)
+    if viewbox is None:
+        return
+
+    view_x, view_y, view_w, view_h = viewbox
+    if view_w <= 0.0 or view_h <= 0.0:
+        return
+
+    new_view_x = view_x - padding
+    new_view_y = view_y - padding
+    new_view_w = view_w + 2.0 * padding
+    new_view_h = view_h + 2.0 * padding
+    svg_root.set(
+        "viewBox",
+        f"{new_view_x:.2f} {new_view_y:.2f} {new_view_w:.2f} {new_view_h:.2f}",
+    )
+
+
+def _watch_html(svg_file):
+    return (
+        "<html><body style='margin:0'><embed id='svg-view'"
+        " style='display:block;' type='image/svg+xml'"
+        f" src='{svg_file.name}?t={time.time()}'/></body></html>"
+    )
+
+
 def _svg_expanded_outline(
     shape, namespace, expand, stroke_color, stroke_width
 ):
@@ -249,6 +291,12 @@ def build_graph(
         ["dot", "-Tsvg", str(dot_file), "-o", str(svg_file)],
         check=True,
     )
+    svg_tree = ET.parse(str(svg_file))
+    svg_root = svg_tree.getroot()
+    namespace = ""
+    if svg_root.tag.startswith("{"):
+        namespace = svg_root.tag[: svg_root.tag.find("}") + 1]
+
     if not order_by_date:
         # In dependency view mode, each node explicitly tagged with
         # ``style: endpoint`` defines a project color. A project includes the
@@ -282,12 +330,6 @@ def build_graph(
                     for parent in data["nodes"][ancestor]["parents"]:
                         ancestors_to_visit.append(parent)
 
-        svg_tree = ET.parse(str(svg_file))
-        svg_root = svg_tree.getroot()
-        namespace = ""
-        if svg_root.tag.startswith("{"):
-            namespace = svg_root.tag[: svg_root.tag.find("}") + 1]
-
         title_to_group = {}
         node_title_to_group = {}
         for group in svg_root.iter(f"{namespace}g"):
@@ -449,7 +491,8 @@ def build_graph(
             for insert_index, outline in reversed(inserts):
                 group.insert(insert_index, outline)
 
-        svg_tree.write(str(svg_file), encoding="utf-8", xml_declaration=True)
+    _svg_add_canvas_padding(svg_root, padding=24.0)
+    svg_tree.write(str(svg_file), encoding="utf-8", xml_declaration=True)
     return data
 
 
@@ -565,11 +608,7 @@ def wgrph(yaml, wrap_width=55, d=False, t=None):
     # 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>"
-    )
+    html_file.write_text(_watch_html(svg_file))
     options = Options()
     driver = start_chrome(webdriver, options, html_file)
     event_handler = GraphEventHandler(

{pydifftools-0.1.23 → pydifftools-0.1.24}/pyproject.toml

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