From fe7a7d81b2a219a51b758e34bedeb20922c9d260 Mon Sep 17 00:00:00 2001 From: Rishabh Nambiar Date: Wed, 15 Nov 2017 10:50:54 +0530 Subject: [PATCH 1/3] [fix] Allow capital letters in bucket name (#4494) fix for https://github.com/frappe/erpnext/issues/11547 --- .../doctype/s3_backup_settings/s3_backup_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py index c557365e6b..64bbc869a7 100755 --- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py +++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.py @@ -22,7 +22,7 @@ class S3BackupSettings(Document): aws_secret_access_key=self.get_password('secret_access_key'), ) - bucket_lower = str(self.bucket).lower() + bucket_lower = str(self.bucket) try: conn.list_buckets() From 450a54ec697880e41bfebba244b80bde72481a75 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 15 Nov 2017 13:59:24 +0530 Subject: [PATCH 2/3] [fix] prepare file list by including all nested files (#4491) --- .../dropbox_settings/dropbox_settings.py | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py index a839049d7b..f8daf965b5 100644 --- a/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py +++ b/frappe/integrations/doctype/dropbox_settings/dropbox_settings.py @@ -122,26 +122,27 @@ def upload_from_folder(path, dropbox_folder, dropbox_client, did_not_upload, err else: raise - for filename in os.listdir(path): - filename = cstr(filename) - - if filename in ignore_list: - continue - - found = False - filepath = os.path.join(path, filename) - for file_metadata in response.entries: - if (os.path.basename(filepath) == file_metadata.name - and os.stat(encode(filepath)).st_size == int(file_metadata.size)): - found = True - break - - if not found: - try: - upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client) - except Exception: - did_not_upload.append(filename) - error_log.append(frappe.get_traceback()) + for root, directory, files in os.walk(path): + for filename in files: + filename = cstr(filename) + filepath = os.path.join(root, filename) + + if filename in ignore_list: + continue + + found = False + for file_metadata in response.entries: + if (os.path.basename(filepath) == file_metadata.name + and os.stat(encode(filepath)).st_size == int(file_metadata.size)): + found = True + break + + if not found: + try: + upload_file_to_dropbox(filepath, dropbox_folder, dropbox_client) + except Exception: + did_not_upload.append(filepath) + error_log.append(frappe.get_traceback()) def upload_file_to_dropbox(filename, folder, dropbox_client): create_folder_if_not_exists(folder, dropbox_client) From 36027ad6c68620470a17ae9e48a817c3b3d7173a Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 15 Nov 2017 14:37:43 +0600 Subject: [PATCH 3/3] bumped to version 9.2.14 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 726472be52..443a5a612e 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.2.13' +__version__ = '9.2.14' __title__ = "Frappe Framework" local = Local()