cleanup a few client parameters

Author: max-zilla

pyclowder/api/v1/files.py

@@ -297,7 +297,7 @@ def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=Fa
 
     for source_path in connector.mounted_paths:
         if filepath.startswith(connector.mounted_paths[source_path]):
-            return _upload_to_dataset_local(connector, client.host, client.key, datasetid, filepath)
+            return _upload_to_dataset_local(connector, client, datasetid, filepath)
 
     url = '%s/api/uploadToDataset/%s?key=%s' % (client.host, datasetid, client.key)
 

pyclowder/api/v2/files.py

@@ -247,7 +247,6 @@ def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=Fa
 
     logger = logging.getLogger(__name__)
 
-    # TODO fix this to use v2 api
     if check_duplicate:
         ds_files = get_file_list(connector, client.host, client.key, datasetid)
         for f in ds_files:
@@ -257,7 +256,7 @@ def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=Fa
 
     for source_path in connector.mounted_paths:
         if filepath.startswith(connector.mounted_paths[source_path]):
-            return _upload_to_dataset_local(connector, client.host, client.key, datasetid, filepath)
+            return _upload_to_dataset_local(connector, client, datasetid, filepath)
 
     url = '%s/api/v2/datasets/%s/files' % (client.host, datasetid)
 
@@ -279,17 +278,15 @@ def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=Fa
         logger.error("unable to upload file %s (not found)", filepath)
 
 
-def _upload_to_dataset_local(connector, host, key, datasetid, filepath):
+def _upload_to_dataset_local(connector, client, datasetid, filepath):
     """Upload file POINTER to existing Clowder dataset. Does not copy actual file bytes.
 
     Keyword arguments:
     connector -- connector information, used to get missing parameters and send status updates
-    host -- the clowder host, including http and port, should end with a /
-    key -- the secret key to login to clowder
+    client -- ClowderClient containing authentication credentials
     datasetid -- the dataset that the file should be associated with
     filepath -- path to file
     """
-    client = ClowderClient(host, key)
     logger = logging.getLogger(__name__)
     url = '%s/api/v2/datatsets/%s/files' % (client.host, datasetid)
 

pyclowder/files.py

@@ -115,7 +115,8 @@ def submit_extractions_by_dataset(connector, host, key, datasetid, extractorname
         extractorname -- registered name of extractor to trigger
         ext -- extension to filter. e.g. 'tif' will only submit TIFF files for extraction.
     """
-    filelist = get_file_list(connector, host, key, datasetid)
+    client = ClowderClient(host=host, key=key)
+    filelist = get_file_list(connector, client, datasetid)
 
     for f in filelist:
         # Only submit files that end with given extension, if specified
@@ -326,5 +327,5 @@ def _upload_to_dataset_local(connector, host, key, datasetid, filepath):
     if clowder_version == 2:
         uploadedfileid = v2files._upload_to_dataset_local(connector, client, datasetid, filepath)
     else:
-        uploadedfileid = v1files._upload_to_dataset_local(connector, host, key, datasetid, filepath)
+        uploadedfileid = v1files._upload_to_dataset_local(connector, client, datasetid, filepath)
     return uploadedfileid