From 08a71e4bd4a4bf71caacb4e537176df7d9dd8007 Mon Sep 17 00:00:00 2001 From: jaskaranSM <37726998+jaskaranSM@users.noreply.github.com> Date: Mon, 23 Mar 2020 16:59:09 +0530 Subject: [PATCH] TeamDrive List fix Signed-off-by: lzzy12 --- bot/helper/mirror_utils/upload_utils/gdriveTools.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index 8881cfa..e6f81dc 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -112,7 +112,8 @@ class GoogleDriveHelper: 'value': None, 'withLink': True } - return self.__service.permissions().create(supportsTeamDrives=True, fileId=drive_id, body=permissions).execute() + return self.__service.permissions().create(supportsTeamDrives=True, fileId=drive_id, + body=permissions).execute() @retry(wait=wait_exponential(multiplier=2, min=3, max=6), stop=stop_after_attempt(5), retry=retry_if_exception_type(HttpError), before=before_log(LOGGER, logging.DEBUG)) @@ -251,10 +252,12 @@ class GoogleDriveHelper: err = str(e).replace('>', '').replace('<', '') LOGGER.error(err) return err - msg += f'{meta.get("name")} ({get_readable_file_size(self.transferred_size)})' + msg += f'{meta.get("name")}' \ + f' ({get_readable_file_size(self.transferred_size)})' else: file = self.copyFile(meta.get('id'), parent_id) - msg += f'{meta.get("name")} ({get_readable_file_size(int(meta.get("size")))})' + msg += f'{meta.get("name")}' \ + f' ({get_readable_file_size(int(meta.get("size")))}) ' return msg def cloneFolder(self, name, local_path, folder_id, parent_id): @@ -264,7 +267,9 @@ class GoogleDriveHelper: LOGGER.info(f"Syncing: {local_path}") new_id = None while True: - response = self.__service.files().list(q=q, + response = self.__service.files().list(supportsTeamDrives=True, + includeTeamDriveItems=True, + q=q, spaces='drive', fields='nextPageToken, files(id, name, mimeType,size)', pageToken=page_token).execute()