netbox-device-view 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

netbox_device_view/utils.py

@@ -10,25 +10,18 @@ def process_interfaces(interfaces, ports_chassis, dev):
         for itf in interfaces:
             if itf.type == "virtual" or itf.type == "lag":
                 continue
-            # 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] == "-"
-            ):
+            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():
                 itf.stylename = f"p{itf.stylename}"
 
             if dev not in ports_chassis:

{netbox_device_view-0.1.11.dist-info → netbox_device_view-0.1.13.dist-info}/METADATA

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

{netbox_device_view-0.1.11.dist-info → netbox_device_view-0.1.13.dist-info}/RECORD

@@ -6,7 +6,7 @@ netbox_device_view/navigation.py,sha256=EbmAxA0a8y47jbf8XjRQvz_xAvoTwTHI9ljvC6oa
 netbox_device_view/tables.py,sha256=ejhKjD5fGo_tLUhTExqBhDL_TbYVe9TPnzF-ZWHqujY,351
 netbox_device_view/template_content.py,sha256=k9spY-bv_ArmRUYqyhpKtOv-MvU3NtFXVN7eWNdU0dg,1162
 netbox_device_view/urls.py,sha256=DtdIPVagp1KHwPDSlBsV_rJ16pGNi8l661RkXTq32HU,971
-netbox_device_view/utils.py,sha256=pgqBmH_9AZLjlRXJS9yHazcb2KrPGM-m3fF7Z_IgWjc,3582
+netbox_device_view/utils.py,sha256=yD91QIXvNlUBA4lV7Q_qqAoTpF69nIRf4YVZu8Iw4ac,3208
 netbox_device_view/views.py,sha256=hyz6xOt0l3l2Kh0cf-TTG84JfF810ts9_SL3SsRpbGM,2020
 netbox_device_view/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 netbox_device_view/api/serializers.py,sha256=IQEFuIh7X22MWO4jxv4MctZQxln-DgH2eo-0IbdvBl4,456
@@ -17,7 +17,7 @@ netbox_device_view/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 netbox_device_view/static/netbox_device_view/css/device_view.css,sha256=VnvjTMPrEnUkpb_odDe6-VJKhBXZ6RuII4Ce3EnPDCc,833
 netbox_device_view/templates/netbox_device_view/deviceview.html,sha256=gnHwrEhsIHQ5Mv8KjIgUVa65rmfMy7_hLx-wgjHV6-c,2874
 netbox_device_view/templates/netbox_device_view/ports.html,sha256=H-OVDZfpa-s3NB5a3ZJmrNbir001wfYfKJss8bppBgk,1716
-netbox_device_view-0.1.11.dist-info/METADATA,sha256=b-UIBr-1Jr6QdSU0cz1rzTo_eBPAUGSFp5MaykSdNtU,3899
-netbox_device_view-0.1.11.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-netbox_device_view-0.1.11.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
-netbox_device_view-0.1.11.dist-info/RECORD,,
+netbox_device_view-0.1.13.dist-info/METADATA,sha256=qGL4ONJMnKgNNV0bBFcelLUxzyIhe5ba-Y8JjlaH8Do,3899
+netbox_device_view-0.1.13.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+netbox_device_view-0.1.13.dist-info/top_level.txt,sha256=Cj7X6_XpLT0jnyTyX5DMqttqc8_z3uhRYCmvnXLfWOs,19
+netbox_device_view-0.1.13.dist-info/RECORD,,