Skip to content

PILOT-2677: Fix the error message error when download empty folder #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QXgu merged 1 commit into from
Apr 18, 2023
Merged

PILOT-2677: Fix the error message error when download empty folder #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions app/services/file_manager/file_download/download_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down