From 0f010d719468f0b7a16288b09854e5eb5f0f4489 Mon Sep 17 00:00:00 2001 From: QXgu Date: Tue, 11 Apr 2023 21:53:27 -0400 Subject: [PATCH] PILOT-2677: Fix the error message error when download empty folder --- .../file_manager/file_download/download_client.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/services/file_manager/file_download/download_client.py b/app/services/file_manager/file_download/download_client.py index 7ee59a08..2586e580 100644 --- a/app/services/file_manager/file_download/download_client.py +++ b/app/services/file_manager/file_download/download_client.py @@ -90,18 +90,19 @@ def prepare_download(self): } url = self.appconfig.Connections.url_v2_download_pre % (self.project_code) res = resilient_session().post(url, headers=headers, json=payload) - res_json = res.json().get('result') + res_json = res.json() self.check_point = True if res.status_code == 200: # fetch the info from hash token - self.hash_code = res_json.get('payload', {}).get('hash_code') + response = res.json().get('result') + self.hash_code = response.get('payload', {}).get('hash_code') download_info = jwt.decode(self.hash_code, options={'verify_signature': False}) file_path = download_info.get('file_path') - pre_status = EFileStatus(res_json.get('status')) + pre_status = EFileStatus(response.get('status')) elif res.status_code == 403: SrvErrorHandler.customized_handle(ECustomizedError.NO_FILE_PERMMISION, self.interactive) - elif res.status_code == 400 and res_json.get('error_msg') == 'Folder is empty': + elif res.status_code == 400 and 'number of file must greater than 0' in res_json.get('error_msg'): SrvErrorHandler.customized_handle(ECustomizedError.FOLDER_EMPTY, self.interactive) else: SrvErrorHandler.customized_handle(ECustomizedError.DOWNLOAD_FAIL, self.interactive)