From 7eb3d7cd357c5ed71dcf24327b5e30ae772873f2 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Mon, 26 Oct 2015 22:05:57 -0400 Subject: [PATCH 1/2] generate_upload_token: Refactor code to use 'optional_keys' list. Process optional parameters like it is done in method "perform_upload", this will allow the introduction of more optional parameter. --- pydas/drivers.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pydas/drivers.py b/pydas/drivers.py index 2e30f78..322de90 100644 --- a/pydas/drivers.py +++ b/pydas/drivers.py @@ -922,7 +922,7 @@ def create_link(self, token, folder_id, url, **kwargs): response = self.request('midas.link.create', parameters) return response - def generate_upload_token(self, token, item_id, filename, checksum=None): + def generate_upload_token(self, token, item_id, filename, **kwargs): """ Generate a token to use for upload. @@ -953,8 +953,10 @@ def generate_upload_token(self, token, item_id, filename, checksum=None): parameters['token'] = token parameters['itemid'] = item_id parameters['filename'] = filename - if checksum is not None: - parameters['checksum'] = checksum + optional_keys = ['checksum'] + for key in optional_keys: + if key in kwargs: + parameters[key] = kwargs[key] response = self.request('midas.upload.generatetoken', parameters) return response['token'] From 6a4c9cf3bba4cee8374a47ef36823575a1751a77 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Tue, 27 Oct 2015 04:36:21 -0400 Subject: [PATCH 2/2] generate_upload_token: Add support for option parameter "create_additional_revision" This commit add supporte from parameter introduced in midasplatform/Midas#146 --- pydas/drivers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydas/drivers.py b/pydas/drivers.py index 322de90..a902c5e 100644 --- a/pydas/drivers.py +++ b/pydas/drivers.py @@ -953,7 +953,7 @@ def generate_upload_token(self, token, item_id, filename, **kwargs): parameters['token'] = token parameters['itemid'] = item_id parameters['filename'] = filename - optional_keys = ['checksum'] + optional_keys = ['checksum', 'create_additional_revision'] for key in optional_keys: if key in kwargs: parameters[key] = kwargs[key]