evanferrao
/
dump-mirrorbot
mirror of https://github.com/Box-boi/dump-mirrorbot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

TeamDrive List fix 

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
This commit is contained in:
jaskaranSM 2020-03-23 16:59:09 +05:30 committed by lzzy12
parent 6ca2f479d5
commit 08a71e4bd4
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bot/helper/mirror_utils/upload_utils/gdriveTools.py
View File

@ -112,7 +112,8 @@ class GoogleDriveHelper:
'value': None, 'value': None,
'withLink': True '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(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)) retry=retry_if_exception_type(HttpError), before=before_log(LOGGER, logging.DEBUG))
@ -251,10 +252,12 @@ class GoogleDriveHelper:
err = str(e).replace('>', '').replace('<', '') err = str(e).replace('>', '').replace('<', '')
LOGGER.error(err) LOGGER.error(err)
return err return err
msg += f'<a href="{self.__G_DRIVE_DIR_BASE_DOWNLOAD_URL.format(dir_id)}">{meta.get("name")}</a> ({get_readable_file_size(self.transferred_size)})' 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)})'
else: else:
file = self.copyFile(meta.get('id'), parent_id) 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> ({get_readable_file_size(int(meta.get("size")))})' msg += f'<a href="{self.__G_DRIVE_BASE_DOWNLOAD_URL.format(file.get("id"))}">{meta.get("name")}</a>' \
f' ({get_readable_file_size(int(meta.get("size")))}) '
return msg return msg
def cloneFolder(self, name, local_path, folder_id, parent_id): def cloneFolder(self, name, local_path, folder_id, parent_id):
@ -264,7 +267,9 @@ class GoogleDriveHelper:
LOGGER.info(f"Syncing: {local_path}") LOGGER.info(f"Syncing: {local_path}")
new_id = None new_id = None
while True: while True:
response = self.__service.files().list(q=q, response = self.__service.files().list(supportsTeamDrives=True,
includeTeamDriveItems=True,
q=q,
spaces='drive', spaces='drive',
fields='nextPageToken, files(id, name, mimeType,size)', fields='nextPageToken, files(id, name, mimeType,size)',
pageToken=page_token).execute() pageToken=page_token).execute()