Enable multiple URLs in extension views

Author: jtc42

src/labthings/server/extensions.py

@@ -52,37 +52,35 @@ def __init__(
 
         self.static_view_class = static_from(static_folder)
         self.add_view(
-            self.static_view_class, f"{static_url_path}/<path:path>", endpoint="static"
-        )
-        self.add_view(
-            self.static_view_class, f"{static_url_path}", endpoint="static_root"
+            self.static_view_class, f"{static_url_path}", f"{static_url_path}/<path:path>", endpoint="static"
         )
 
     @property
     def views(self):
         return self._views
 
-    def add_view(self, view_class, rule, endpoint=None, **kwargs):
+    def add_view(self, view_class, *urls, endpoint=None, **kwargs):
         # Remove all leading slashes from view route
-        cleaned_rule = rule
-        while cleaned_rule and cleaned_rule[0] == "/":
-            cleaned_rule = cleaned_rule[1:]
+        cleaned_urls = list(urls)
+        for i, cleaned_url in enumerate(cleaned_urls):
+            while cleaned_url and cleaned_urls[i][0] == "/":
+                cleaned_urls[i] = cleaned_urls[i][1:]
 
         # Expand the rule to include extension name
-        full_rule = "/{}/{}".format(self._name_uri_safe, cleaned_rule)
+        full_urls = ["/{}/{}".format(self._name_uri_safe, cleaned_url) for cleaned_url in cleaned_urls]
 
         # Build endpoint if none given
         if not endpoint:
             endpoint = camel_to_snake(view_class.__name__)
 
         # Store route information in a dictionary
-        d = {"rule": full_rule, "view": view_class, "kwargs": kwargs}
+        d = {"urls": full_urls, "view": view_class, "kwargs": kwargs}
 
         # Add view to private views dictionary
         self._views[endpoint] = d
-        print(self._views)
         # Store the rule expansion information
-        self._rules[rule] = self._views[endpoint]
+        for url in urls:
+            self._rules[url] = self._views[endpoint]
 
     def on_register(self, function, args=None, kwargs=None):
         if not callable(function):

src/labthings/server/labthing.py

@@ -226,7 +226,7 @@ def register_extension(self, extension_object):
             # Add route to the extensions blueprint
             self.add_view(
                 tag("extensions")(extension_view["view"]),
-                "/extensions" + extension_view["rule"],
+                *("/extensions" + url for url in extension_view["urls"]),
                 endpoint=endpoint,
                 **extension_view["kwargs"],
             )

src/labthings/server/schema.py

@@ -147,15 +147,20 @@ class ExtensionSchema(Schema):
     def generate_links(self, data, **kwargs):
         d = {}
         for view_id, view_data in data.views.items():
-            view_cls = view_data["view"]
-            view_rule = view_data["rule"]
+            view_cls = view_data.get("view")
+            view_urls = view_data.get("urls")
             # Try to build a URL
             try:
-                url = url_for(EXTENSION_LIST_ENDPOINT, _external=True) + view_rule
+                urls = [url_for(EXTENSION_LIST_ENDPOINT, _external=True) + url for url in view_urls]
             except BuildError:
-                url = None
+                urls = []
+            # TODO: Tidy up this nasty jazz
+            if len(urls) == 0:
+                urls = None
+            elif len(urls) == 1:
+                urls = urls[0]
             # Make links dictionary if it doesn't yet exist
-            d[view_id] = {"href": url, **description_from_view(view_cls)}
+            d[view_id] = {"href": urls, **description_from_view(view_cls)}
 
         data.links = d