From e5bb8e55ef5f0ea3331ccbc954220999d55cd0f8 Mon Sep 17 00:00:00 2001
From: jaskaranSM <beerabassian32@gmail.com>
Date: Thu, 16 Apr 2020 12:38:12 +0530
Subject: [PATCH] Clone fix and added index link support

---
 .../mirror_utils/upload_utils/gdriveTools.py  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

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'<a href="{self.__G_DRIVE_DIR_BASE_DOWNLOAD_URL.format(dir_id)}">{meta.get("name")}</a>' \
                    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' | <a href="{url}"> Index URL</a>'
         else:
-            file = self.copyFile(meta.get('id'), parent_id)
-
-            msg += f'<a href="{self.__G_DRIVE_BASE_DOWNLOAD_URL.format(file.get("id"))}">{meta.get("name")}</a>'
+            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'<a href="{self.__G_DRIVE_BASE_DOWNLOAD_URL.format(file.get("id"))}">{file.get("name")}</a>'
             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' | <a href="{url}"> Index URL</a>'
             except TypeError:
                 pass
         return msg