Minor tidy-up

Author: dannyadair

src/pdfbaker/baker.py

@@ -20,6 +20,7 @@
 
 
 DEFAULT_CONFIG = {
+    # Default to directories relative to the config file
     "documents_dir": ".",
     "pages_dir": "pages",
     "templates_dir": "templates",
@@ -59,7 +60,7 @@ def __init__(
             self.baker = baker
             self.baker.log_debug_section("Loading main configuration: %s", config_file)
             super().__init__(base_config, config_file)
-            self.baker.log_trace(self.pprint())
+            self.baker.log_trace(self.pretty())
             if "documents" not in self:
                 raise ConfigurationError(
                     'Key "documents" missing - is this the main configuration file?'

src/pdfbaker/config.py

@@ -119,7 +119,7 @@ def render(self) -> dict[str, Any]:
             "Check for circular references in your configuration."
         )
 
-    def pprint(self, max_string=60) -> str:
+    def pretty(self, max_string=60) -> str:
         """Pretty print a configuration dictionary (for debugging)."""
         truncated = _truncate_strings(self, max_string)
         return pprint.pformat(truncated, indent=2)

src/pdfbaker/document.py

@@ -61,12 +61,12 @@ def __init__(
             else:
                 self.name = config.stem
             self.directory = config.parent
-            self.document.log_trace(self.pprint())
+            self.document.log_trace(self.pretty())
             self.document.log_debug_section(
                 'Merging document config for "%s"...', self.name
             )
             super().__init__(base_config, config)
-            self.document.log_trace(self.pprint())
+            self.document.log_trace(self.pretty())
             self.document.log_debug_subsection("Document config for %s:", self.name)
             if "pages" not in self:
                 raise ConfigurationError(
@@ -81,7 +81,7 @@ def __init__(
                 self.pages.append(page)
             self.build_dir = self.resolve_path(self["build_dir"])
             self.dist_dir = self.resolve_path(self["dist_dir"])
-            self.document.log_trace(self.pprint())
+            self.document.log_trace(self.pretty())
 
     def __init__(
         self,

src/pdfbaker/page.py

@@ -36,13 +36,13 @@ def __init__(
             """Initialize page configuration (needs a template)."""
             self.page = page
             self.page.log_debug_subsection("Loading page config: %s", config)
-            self.page.log_trace(self.pprint())
+            self.page.log_trace(self.pretty())
             # FIXME: config is usually pages/mypage.yaml
             self.name = "TBC"
             self.page.log_debug_section('Initializing document "%s"...', self.name)
             self.page.log_debug_subsection("Merging config for %s:", self.name)
             super().__init__(base_config, config)
-            self.page.log_trace(self.pprint())
+            self.page.log_trace(self.pretty())
             if "template" not in self:
                 raise ConfigurationError(
                     f'Page "{self.name}" in document '

src/pdfbaker/pdf.py

@@ -175,25 +175,27 @@ def convert_svg_to_pdf(
     Raises:
         SVGConversionError: If SVG conversion fails, includes the backend used and cause
     """
-    try:
-        if backend == "inkscape":
-            try:
-                _run_subprocess_logged(
-                    [
-                        "inkscape",
-                        f"--export-filename={pdf_path}",
-                        str(svg_path),
-                    ]
-                )
-            except subprocess.SubprocessError as exc:
-                raise SVGConversionError(svg_path, backend, str(exc)) from exc
-        else:
-            try:
-                with open(svg_path, "rb") as svg_file:
-                    svg2pdf(file_obj=svg_file, write_to=str(pdf_path))
-            except Exception as exc:
-                raise SVGConversionError(svg_path, backend, str(exc)) from exc
-
-        return pdf_path
-    except Exception as exc:
-        raise SVGConversionError(svg_path, backend, str(exc)) from exc
+    if backend == "inkscape":
+        try:
+            _run_subprocess_logged(
+                [
+                    "inkscape",
+                    f"--export-filename={pdf_path}",
+                    str(svg_path),
+                ]
+            )
+        except subprocess.SubprocessError as exc:
+            raise SVGConversionError(svg_path, backend, str(exc)) from exc
+    else:
+        if backend != "cairosvg":
+            logger.warning(
+                "Unknown svg2pdf backend: %s - falling back to cairosvg",
+                backend,
+            )
+        try:
+            with open(svg_path, "rb") as svg_file:
+                svg2pdf(file_obj=svg_file, write_to=str(pdf_path))
+        except Exception as exc:
+            raise SVGConversionError(svg_path, backend, str(exc)) from exc
+
+    return pdf_path