From 92240acb5cc600eec60624ece9ed4b9ec43b386f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 23 May 2024 07:06:46 +0200
Subject: Adding upstream version 0.15.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 docs/scripts/generate_svg.py | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'docs/scripts')

diff --git a/docs/scripts/generate_svg.py b/docs/scripts/generate_svg.py
index 426a785..0048160 100644
--- a/docs/scripts/generate_svg.py
+++ b/docs/scripts/generate_svg.py
@@ -13,6 +13,7 @@ python generate_svg.py anta ...
 # ruff: noqa: T201
 
 import io
+import logging
 import os
 import pathlib
 import sys
@@ -22,10 +23,17 @@ from importlib.metadata import entry_points
 from unittest.mock import patch
 
 from rich.console import Console
+from rich.logging import RichHandler
 
 from anta.cli.console import console
 from anta.cli.nrfu.utils import anta_progress_bar
 
+root = logging.getLogger()
+
+r = RichHandler(console=console)
+root.addHandler(r)
+
+
 OUTPUT_DIR = pathlib.Path(__file__).parent.parent / "imgs"
 
 
@@ -43,7 +51,7 @@ def custom_progress_bar() -> None:
 
 if __name__ == "__main__":
     # Sane rich size
-    os.environ["COLUMNS"] = "165"
+    os.environ["COLUMNS"] = "120"
 
     # stolen from https://github.com/ewels/rich-click/blob/main/src/rich_click/cli.py
     args = sys.argv[1:]
@@ -64,6 +72,8 @@ if __name__ == "__main__":
         print("Usage: python generate_svg.py anta <options>")
         sys.exit(1)
 
+    # possibly-used-before-assignment - prog / function_name -> not understanding sys.exit here...
+    # pylint: disable=E0606
     sys.argv = [prog, *args[1:]]
     module = import_module(module_path)
     function = getattr(module, function_name)
@@ -71,22 +81,24 @@ if __name__ == "__main__":
     # Console to captur everything
     new_console = Console(record=True)
 
-    # tweaks to record and redirect to a dummy file
     pipe = io.StringIO()
     console.record = True
     console.file = pipe
+    with redirect_stdout(io.StringIO()) as f:
+        # tweaks to record and redirect to a dummy file
+
+        console.print(f"ant@anthill$ {' '.join(sys.argv)}")
+
+        # Redirect stdout of the program towards another StringIO to capture help
+        # that is not part or anta rich console
+        # redirect potential progress bar output to console by patching
+        with patch("anta.cli.nrfu.anta_progress_bar", custom_progress_bar), suppress(SystemExit):
+            function()
 
-    # Redirect stdout of the program towards another StringIO to capture help
-    # that is not part or anta rich console
-    # redirect potential progress bar output to console by patching
-    with redirect_stdout(io.StringIO()) as f, patch("anta.cli.nrfu.commands.anta_progress_bar", custom_progress_bar), suppress(SystemExit):
-        function()
-    # print to our new console the output of anta console
-    new_console.print(console.export_text())
-    # print the content of the stdout to our new_console
-    new_console.print(f.getvalue())
+    if "--help" in args:
+        console.print(f.getvalue())
 
     filename = f"{'_'.join(x.replace('/', '_').replace('-', '_').replace('.', '_') for x in args)}.svg"
     filename = f"{OUTPUT_DIR}/{filename}"
     print(f"File saved at {filename}")
-    new_console.save_svg(filename, title=" ".join(args))
+    console.save_svg(filename, title=" ".join(args))
-- 
cgit v1.2.3