In cloud upload API, handle overwriting an existing object.

galaxyproject · May 7, 2018 · ff42cc7 · ff42cc7
1 parent 6a9ce39
commit ff42cc7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/galaxy/managers/cloud.py b/lib/galaxy/managers/cloud.py
@@ -6,6 +6,7 @@
 import os
 import random
 import string
+import datetime
 from cgi import FieldStorage
 
 from galaxy.exceptions import (
@@ -216,7 +217,7 @@ def download(self, trans, history_id, provider, bucket, obj, credentials):
         os.remove(staging_file_name)
         return datasets
 
-    def upload(self, trans, history_id, provider, bucket, credentials, dataset_ids=None):
+    def upload(self, trans, history_id, provider, bucket, credentials, dataset_ids=None, overwrite_existing=False):
         if CloudProviderFactory is None:
             raise Exception(NO_CLOUDBRIDGE_ERROR_MESSAGE)
         connection = self._configure_provider(provider, credentials)
@@ -228,5 +229,8 @@ def upload(self, trans, history_id, provider, bucket, credentials, dataset_ids=N
         history = trans.sa_session.query(trans.app.model.History).get(history_id)
         for hda in history.datasets:
             if dataset_ids is None or hda.dataset.id in dataset_ids:
-                created_obj = bucket_obj.create_object(hda.name)
+                object_label = hda.name
+                if overwrite_existing == True and bucket_obj.get(object_label) is not None:
+                    object_label += "-" + datetime.datetime.now().strftime("%y-%m-%d-%H-%M-%S")
+                created_obj = bucket_obj.create_object(object_label)
                 created_obj.upload_from_file(hda.dataset.get_file_name())
diff --git a/lib/galaxy/webapps/galaxy/api/cloud.py b/lib/galaxy/webapps/galaxy/api/cloud.py
@@ -162,5 +162,6 @@ def upload(self, trans, payload, **kwargs):
                                   provider,
                                   bucket,
                                   credentials,
-                                  dataset_ids)
+                                  dataset_ids,
+                                  payload.get("overwrite_existing", False))
         return 'The selected dataset(s) are uploaded successfully!'