diff --git a/netbox_utilities/__init__.py b/netbox_utilities/__init__.py
index 96dc203..6a625e6 100644
--- a/netbox_utilities/__init__.py
+++ b/netbox_utilities/__init__.py
@@ -1,6 +1,6 @@
from netbox.plugins import PluginConfig, get_plugin_config
-__version__ = "0.11.2"
+__version__ = "0.11.3"
class NetBoxUtilitiesConfig(PluginConfig):
diff --git a/netbox_utilities/svg_export.py b/netbox_utilities/svg_export.py
index c9bacf0..aad2aaf 100644
--- a/netbox_utilities/svg_export.py
+++ b/netbox_utilities/svg_export.py
@@ -7,20 +7,27 @@ ET.register_namespace("", SVG_NS)
ET.register_namespace("xlink", XLINK_NS)
_ANCHOR_TAGS = (f"{{{SVG_NS}}}a", "a")
+_IMAGE_TAGS = (f"{{{SVG_NS}}}image", "image")
_HREF_ATTRS = ("href", f"{{{XLINK_NS}}}href")
-def strip_svg_hyperlinks(svg_source):
- """Return svg_source with every wrapper unwrapped and href/xlink:href removed.
+def strip_svg_hyperlinks(svg_source, image_loader=None):
+ """Return svg_source with every wrapper unwrapped and dead links removed.
NetBox wraps rack elevation devices in hyperlinks pointing at internal,
relative object URLs. Those links are dead weight (and broken paths) once
- the SVG is saved and opened outside of a NetBox session, so this produces
- a self-contained file with the same visuals but no link markup.
+ the SVG is saved and opened outside of a NetBox session, so this unwraps
+ them while keeping their contents.
+
+ elements reference device photos by the same kind of internal,
+ relative URL. Simply stripping their href would leave the device blank,
+ so image_loader (href -> "data:...;base64,..." or None) is used to embed
+ the image data directly instead. Without an image_loader, image hrefs are
+ left untouched.
"""
root = ET.fromstring(svg_source)
_unwrap_anchors(root)
- _strip_href_attributes(root)
+ _resolve_hrefs(root, image_loader)
return ET.tostring(root, encoding="unicode")
@@ -41,8 +48,20 @@ def _unwrap_anchors(parent):
parent.append(child)
-def _strip_href_attributes(element):
- for attr in _HREF_ATTRS:
- element.attrib.pop(attr, None)
+def _resolve_hrefs(element, image_loader):
+ if element.tag in _IMAGE_TAGS:
+ if image_loader is not None:
+ for attr in _HREF_ATTRS:
+ href = element.attrib.get(attr)
+ if not href:
+ continue
+ data_uri = image_loader(href)
+ if data_uri:
+ element.attrib[attr] = data_uri
+ else:
+ element.attrib.pop(attr, None)
+ else:
+ for attr in _HREF_ATTRS:
+ element.attrib.pop(attr, None)
for child in element:
- _strip_href_attributes(child)
+ _resolve_hrefs(child, image_loader)
diff --git a/netbox_utilities/tests/test_svg_export.py b/netbox_utilities/tests/test_svg_export.py
index 24e9e5a..24e8592 100644
--- a/netbox_utilities/tests/test_svg_export.py
+++ b/netbox_utilities/tests/test_svg_export.py
@@ -19,16 +19,54 @@ class StripSvgHyperlinksTest(SimpleTestCase):
self.assertNotIn("href", result)
self.assertIn("'
- ''
+ ''
""
)
result = strip_svg_hyperlinks(svg)
+ self.assertNotIn("href", result)
+ self.assertIn("