diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index d367c0a..0aa1376 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -250,10 +250,7 @@ class GoogleDriveHelper: self.transferred_size = 0 try: file_id = self.getIdFromUrl(link) - except KeyError: - msg = "Google drive ID could not be found in the provided link" - return msg - except IndexError: + except (KeyError,IndexError): msg = "Google drive ID could not be found in the provided link" return msg msg = "" @@ -277,12 +274,26 @@ class GoogleDriveHelper: return err msg += f'{meta.get("name")}' \ f' ({get_readable_file_size(self.transferred_size)})' + if INDEX_URL is not None: + url = requests.utils.requote_uri(f'{INDEX_URL}/{meta.get("name")}/') + msg += f' | Index URL' else: - file = self.copyFile(meta.get('id'), parent_id) - - msg += f'{meta.get("name")}' + try: + file = self.copyFile(meta.get('id'), parent_id) + except Exception as e: + if isinstance(e, RetryError): + LOGGER.info(f"Total Attempts: {e.last_attempt.attempt_number}") + err = e.last_attempt.exception() + else: + err = str(e).replace('>', '').replace('<', '') + LOGGER.error(err) + return err + msg += f'{file.get("name")}' try: msg += f' ({get_readable_file_size(int(meta.get("size")))}) ' + if INDEX_URL is not None: + url = requests.utils.requote_uri(f'{INDEX_URL}/{file.get("name")}/') + msg += f' | Index URL' except TypeError: pass return msg