using host and key as arguments to match v1

Author: tcnichol

pyclowder/api/v2/files.py

@@ -268,7 +268,7 @@ def upload_to_dataset(connector, client, datasetid, filepath, check_duplicate=Fa
     logger = logging.getLogger(__name__)
 
     if check_duplicate:
-        ds_files = get_file_list(connector, client, datasetid)
+        ds_files = get_file_list(connector, client.host, client.key, datasetid)
         for f in ds_files:
             if f['name'] == os.path.basename(filepath):
                 logger.debug("found %s in dataset %s; not re-uploading" % (f['name'], datasetid))

pyclowder/datasets.py

@@ -134,7 +134,7 @@ def get_info(connector, host, key, datasetid):
     return info
 
 
-def get_file_list(connector, client, datasetid):
+def get_file_list(connector, host, key, datasetid):
     """Get list of files in a dataset as JSON object.
 
     Keyword arguments:
@@ -143,6 +143,7 @@ def get_file_list(connector, client, datasetid):
     key -- the secret key to login to clowder
     datasetid -- the dataset to get filelist of
     """
+    client = ClowderClient(host=host, key=key)
     if clowder_version == 2:
         file_list = v2datasets.get_file_list(connector, client, datasetid)
     else: