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

Fixed new download redirect route

parent fbe17cc1

openflexure_microscope/api/v1.py

+2 −2
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ app.add_url_rule( 




class CaptureDownloadRedirectAPI(MicroscopeView):

    def get(self, capture_id, filename):

    def get(self, capture_id):

        """

        Redirect to download the capture under it's currently set filename. 

        I.e., `/(capture_id)/download` will
@@ -511,7 +511,7 @@ class CaptureDownloadRedirectAPI(MicroscopeView): 


# Route for shortcut where no filename is specified

app.add_url_rule(

    uri('/capture/<capture_id>/download/'),

    uri('/capture/<capture_id>/download'),

    view_func=CaptureDownloadRedirectAPI.as_view('capture_download_redirect', microscope=api_microscope))

openflexure_microscope/camera/capture.py

+3 −3
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ class StreamObject(object): 
        # Store file format

        self.format = fmt



        # Keep on disk after close by default

        self.keep_on_disk = keep_on_disk



        # Create file name. Default to UUID

        if not filename:

            filename = self.id
@@ -46,9 +49,6 @@ class StreamObject(object): 
            logging.debug("Target for {} set to 'file'".format(self.id))

            self.target = self.file



        # Keep on disk after close by default

        self.keep_on_disk = keep_on_disk



        # Log if created by context manager

        self.context_manager = False