Commit c9ac940a authored by Joel Collins's avatar Joel Collins
Browse files

Fixed URL prefix

parent 2b5b0b87

openflexure_microscope/api/app.py

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ CORS(app, resources=r"*") 
handler = JSONExceptionHandler(app)



# Attach lab devices

labthing = LabThing(app)

labthing.url_prefix = "/api/v2b"

labthing = LabThing(app, prefix="/api/v2b")

labthing.description = "Test LabThing-based API for OpenFlexure Microscope"



labthing.register_device(api_microscope, "openflexure_microscope")

openflexure_microscope/common/labthings/labthing.py

+4 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ from . import EXTENSION_NAME 




class LabThing(object):

    def __init__(self, app=None, url_prefix="", description=""):

    def __init__(self, app=None, prefix="", description=""):

        self.app = app



        self.devices = {}
@@ -17,7 +17,7 @@ class LabThing(object): 
        self.resources = []

        self.endpoints = set()



        self.url_prefix = url_prefix

        self.url_prefix = prefix

        self.description = description



        if app is not None:
@@ -51,6 +51,8 @@ class LabThing(object): 
        else:

            raise TypeError("Plugin object must be an instance of BasePlugin")



        # TODO: Add plugin routes



    ### Resource stuff



    def _complete_url(self, url_part, registration_prefix):