diff --git a/bot/__init__.py b/bot/__init__.py index 7817f70..aba6a0f 100644 --- a/bot/__init__.py +++ b/bot/__init__.py @@ -25,8 +25,6 @@ DOWNLOAD_DIR = None BOT_TOKEN = None try: BOT_TOKEN = getConfig('BOT_TOKEN') - CLIENT_ID = getConfig('G_DRIVE_CLIENT_ID') - CLIENT_SECRET = getConfig('G_DRIVE_CLIENT_SECRET') parent_id = getConfig('GDRIVE_FOLDER_ID') DOWNLOAD_DIR = getConfig('DOWNLOAD_DIR') if DOWNLOAD_DIR[-1] != '/' or DOWNLOAD_DIR[-1] != '\\': diff --git a/bot/config_sample.ini b/bot/config_sample.ini index bfbd973..1e08754 100644 --- a/bot/config_sample.ini +++ b/bot/config_sample.ini @@ -3,9 +3,7 @@ _____REMOVE_THIS_LINE_____=True [DEFAULT] # ENTER BOT TOKEN( Get it from https://my.telegram.org) -BOT_TOKEN = -G_DRIVE_CLIENT_ID = -G_DRIVE_CLIENT_SECRET = +BOT_TOKEN = GDRIVE_FOLDER_ID = DOWNLOAD_DIR = ./download DOWNLOAD_STATUS_UPDATE_INTERVAL = 5 \ No newline at end of file diff --git a/bot/helper/gdriveTools.py b/bot/helper/gdriveTools.py index 35c44c1..65b6944 100644 --- a/bot/helper/gdriveTools.py +++ b/bot/helper/gdriveTools.py @@ -5,10 +5,11 @@ from googleapiclient.http import MediaFileUpload import pickle from mimetypes import guess_type import os -from bot import LOGGER, CLIENT_ID, CLIENT_SECRET, parent_id, DOWNLOAD_DIR, download_list +from bot import LOGGER, parent_id, DOWNLOAD_DIR, download_list from .listeners import MirrorListeners from shutil import rmtree + class GoogleDriveHelper: def __init__(self, listener: MirrorListeners): @@ -20,9 +21,6 @@ class GoogleDriveHelper: self.__G_DRIVE_DIR_MIME_TYPE = "application/vnd.google-apps.folder" self.__G_DRIVE_BASE_DOWNLOAD_URL = "https://drive.google.com/uc?id={}&export=download" self.__listener = listener - if CLIENT_ID is None or CLIENT_SECRET is None or parent_id is None: - LOGGER.error("Please Setup Config Properly.") - self.__service = self.authorize() def upload_file(self, file_path, file_name, mime_type, parent_id): diff --git a/bot/mirror.py b/bot/mirror.py index bb29773..5d191b9 100644 --- a/bot/mirror.py +++ b/bot/mirror.py @@ -19,8 +19,8 @@ class MirrorListener(listeners.MirrorListeners): for progress_str in progress_str_list: msg += progress_str + '\n\n' self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id, - chat_id=self.reply_message.chat.id, - parse_mode='HTMl') + chat_id=self.reply_message.chat.id, + parse_mode='HTMl') def onDownloadComplete(self, download): msg = "Downloaded"