From 8e886a3030478604279bdfde9509d2846db8a768 Mon Sep 17 00:00:00 2001 From: lzzy12 Date: Wed, 25 Dec 2019 15:35:48 +0530 Subject: [PATCH] Add Index URL in /list cmd Also simplified code a bit Signed-off-by: lzzy12 --- .../mirror_utils/upload_utils/gdriveTools.py | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index 4930c30..7125235 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -4,7 +4,7 @@ from google.auth.transport.requests import Request from googleapiclient.http import MediaFileUpload import pickle import os -from bot import LOGGER, parent_id, DOWNLOAD_DIR, DOWNLOAD_STATUS_UPDATE_INTERVAL, IS_TEAM_DRIVE +from bot import LOGGER, parent_id, DOWNLOAD_DIR, DOWNLOAD_STATUS_UPDATE_INTERVAL, IS_TEAM_DRIVE, INDEX_URL from bot.helper.ext_utils.fs_utils import get_mime_type from bot.helper.ext_utils.bot_utils import * @@ -234,19 +234,23 @@ class GoogleDriveHelper: pageToken=page_token, orderBy='modifiedTime desc').execute() for file in response.get('files', []): + if len(results) >= 20: + break if file.get( 'mimeType') == "application/vnd.google-apps.folder": # Detect Whether Current Entity is a Folder or File. - if len(results) >= 20: - break msg += f"⁍ {file.get('name')}" \ - f" (folder)" + "\n" - results.append(file) + f" (folder)" + if INDEX_URL is not None: + url = f'{INDEX_URL}/{file.get("name")}/' + msg += f'| Index URL' else: - if len(results) >= 20: - break msg += f"⁍ {file.get('name')} ({get_readable_file_size(int(file.get('size')))})" + "\n" - results.append(file) + f"&export=download'>{file.get('name')} ({get_readable_file_size(int(file.get('size')))})" + if INDEX_URL is not None: + url = f'{INDEX_URL}/{file.get("name")}' + msg += f' | Index URL' + msg += '\n' + results.append(file) page_token = response.get('nextPageToken', None) if page_token is None: break