netbox-device-view 0.1.9__tar.gz → 0.1.11__tar.gz

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-device-view
-Version: 0.1.9
+Version: 0.1.11
 Summary: NetBox Device View plugin
 Home-page: https://github.com/peterbaumert/netbox-device-view
 Author: Peter Baumert

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/netbox_device_view/template_content.py

@@ -1,11 +1,16 @@
 from netbox.plugins import PluginTemplateExtension
 from .utils import prepare
 from django.conf import settings
+from dcim.models import Device
 
 
 class Ports(PluginTemplateExtension):
     def page(self):
         obj = self.context["object"]
+
+        if not isinstance(obj, Device):
+            return ""
+
         request = self.context["request"]
         url = request.build_absolute_uri(obj.get_absolute_url())
 
@@ -31,7 +36,7 @@ class DevicePorts(Ports):
     model = "dcim.device"
 
     def full_width_page(self):
-        if settings.PLUGINS_CONFIG["netbox_device_view"]["show_on_device_tab"] == False:
+        if not settings.PLUGINS_CONFIG["netbox_device_view"]["show_on_device_tab"]:
             return ""
         return self.page()
 

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/netbox_device_view/templates/netbox_device_view/deviceview.html

@@ -60,11 +60,7 @@
 					{% endfor %}
 				{% endif %}
 				"
-				style="grid-area: {{ int.stylename }};
-				{% if cable_colors == "on" and int.cable.color != "" %}
-				background-color: #{{ int.cable.color }}
-				{% endif %}
-				"
+				style="grid-area: {{ int.stylename }}{% if cable_colors == 'on' and int.cable.color != '' %}; background-color: #{{ int.cable.color }}{% endif %}"
 				data-bs-toggle="tooltip"
 				data-bs-html="true"
 				data-bs-custom-class="device-view-tooltip"

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/netbox_device_view/utils.py

@@ -10,19 +10,27 @@ def process_interfaces(interfaces, ports_chassis, dev):
         for itf in interfaces:
             if itf.type == "virtual" or itf.type == "lag":
                 continue
-            regex = r"^(?P<type>([a-zA-Z\-_]*))(\/|(?P<dev>[0-9]+).|\s)?((?P<module>[0-9]+).|\s)?((?P<port>[0-9]+))$"
-            matches = re.search(regex, itf.name.lower())
-            if matches:
-                itf.stylename = (
-                    (matches["type"] or "")
-                    + (matches["module"] or "")
-                    + "-"
-                    + matches["port"]
-                )
-            else:
-                itf.stylename = re.sub(r"[^.a-zA-Z\d]", "-", itf.name.lower())
-            if itf.stylename.isdigit():
+            # Convert to lowercase and replace common separators with hyphens
+            # This replaces the original regex matching and if/else block
+            stylename = re.sub(r"[/\.\s\+]+", "-", itf.name.lower())
+
+            # Clean up multiple hyphens and leading/trailing hyphens
+            stylename = re.sub(r"-+", "-", stylename).strip("-")
+
+            # If the name becomes empty after cleaning, use a fallback
+            if not stylename:
+                stylename = f"iface-{itf.pk}"  # Use a unique fallback
+
+            # Assign the generated stylename back to the object property
+            itf.stylename = stylename
+
+            # Check if the stylename exists and starts with a digit or a hyphen
+            # This replaces the original 'if itf.stylename.isdigit():' line
+            if itf.stylename and (
+                itf.stylename[0].isdigit() or itf.stylename[0] == "-"
+            ):
                 itf.stylename = f"p{itf.stylename}"
+
             if dev not in ports_chassis:
                 ports_chassis[dev] = []
             ports_chassis[dev].append(itf)
@@ -55,7 +63,9 @@ def prepare(obj):
                 device_type=obj.device_type
             ).grid_template_area
             modules[1] = obj.modules.all()
-            ports_chassis = process_interfaces(obj.interfaces.all(), ports_chassis, 1)
+            ports_chassis = process_interfaces(
+                obj.interfaces.all(), ports_chassis, obj.name
+            )
             ports_chassis = process_ports(obj.frontports.all(), ports_chassis, "Front")
             ports_chassis = process_ports(obj.rearports.all(), ports_chassis, "Rear")
             ports_chassis = process_ports(

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/netbox_device_view.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: netbox-device-view
-Version: 0.1.9
+Version: 0.1.11
 Summary: NetBox Device View plugin
 Home-page: https://github.com/peterbaumert/netbox-device-view
 Author: Peter Baumert

{netbox_device_view-0.1.9 → netbox_device_view-0.1.11}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="netbox-device-view",
-    version="0.1.9",
+    version="0.1.11",
     description="NetBox Device View plugin",
     packages=find_packages(),
     author="Peter Baumert",