new method for getting download url

used in filedigest

Author: tcnichol

pyclowder/api/v1/files.py

@@ -23,6 +23,26 @@
 except:
     pass
 
+# pylint: disable=too-many-arguments
+def get_download_url(connector, client, fileid, intermediatefileid=None, ext=""):
+    """Download file to be processed from Clowder.
+
+    Keyword arguments:
+    connector -- connector information, used to get missing parameters and send status updates
+    client -- ClowderClient containing authentication credentials
+    fileid -- the file that is currently being processed
+    intermediatefileid -- either same as fileid, or the intermediate file to be used
+    ext -- the file extension, the downloaded file will end with this extension
+    """
+
+    connector.message_process({"type": "file", "id": fileid}, "Get download url for file.")
+
+    # TODO: intermediateid doesn't really seem to be used here, can we remove entirely?
+    if not intermediatefileid:
+        intermediatefileid = fileid
+
+    url = '%s/api/files/%s?key=%s' % (client.host, intermediatefileid, client.key)
+    return url
 
 # pylint: disable=too-many-arguments
 def download(connector, client, fileid, intermediatefileid=None, ext=""):

pyclowder/api/v2/files.py

@@ -24,6 +24,26 @@
     pass
 
 
+def get_download_url(connector, client, fileid, intermediatefileid=None, ext=""):
+    """Download file to be processed from Clowder.
+
+        Keyword arguments:
+        connector -- connector information, used to get missing parameters and send status updates
+        client -- ClowderClient containing authentication credentials
+        fileid -- the file that is currently being processed
+        intermediatefileid -- either same as fileid, or the intermediate file to be used
+        ext -- the file extension, the downloaded file will end with this extension
+        """
+
+    connector.message_process({"type": "file", "id": fileid}, "Getting download url for file.")
+
+    # TODO: intermediateid doesn't really seem to be used here, can we remove entirely?
+    if not intermediatefileid:
+        intermediatefileid = fileid
+
+    url = '%s/api/v2/files/%s' % (client.host, intermediatefileid)
+    return url
+
 # pylint: disable=too-many-arguments
 def download(connector, client, fileid, intermediatefileid=None, ext=""):
     """Download file to be processed from Clowder.

pyclowder/files.py

@@ -27,6 +27,13 @@
 except:
     pass
 
+def get_download_url(connector, host, key, fileid, intermediatefileid=None, ext=""):
+    client = ClowderClient(host=host, key=key)
+    if clowder_version == 2:
+        download_url = v2files.get_download_url(connector, client, fileid, intermediatefileid, ext)
+    else:
+        download_url = v1files.get_download_url(connector, client, fileid, intermediatefileid, ext)
+    return download_url
 
 # pylint: disable=too-many-arguments
 def download(connector, host, key, fileid, intermediatefileid=None, ext=""):