diff --git a/bot/__init__.py b/bot/__init__.py
index a7a176a9..26693283 100644
--- a/bot/__init__.py
+++ b/bot/__init__.py
@@ -48,9 +48,6 @@
INDEX_URLS = []
TELEGRAPH = []
-def get_config(name: str):
- return os.environ[name]
-
download_dict_lock = Lock()
status_reply_dict_lock = Lock()
# Key: update.message.message_id
@@ -60,32 +57,23 @@ def get_config(name: str):
# Value: telegram.Message
status_reply_dict = {}
-try:
- BOT_TOKEN = get_config('BOT_TOKEN')
-except:
+BOT_TOKEN = os.environ.get('BOT_TOKEN', '')
+if len(BOT_TOKEN) == 0:
LOGGER.error("BOT_TOKEN env variable is missing")
exit(1)
-try:
- OWNER_ID = int(get_config('OWNER_ID'))
-except:
+OWNER_ID = os.environ.get('OWNER_ID', '')
+if len(OWNER_ID) == 0:
LOGGER.error("OWNER_ID env variable is missing")
exit(1)
+else:
+ OWNER_ID = int(OWNER_ID)
-try:
- PARENT_ID = get_config('DRIVE_FOLDER_ID')
-except:
+DRIVE_FOLDER_ID = os.environ.get('DRIVE_FOLDER_ID', '')
+if len(DRIVE_FOLDER_ID) == 0:
LOGGER.error("DRIVE_FOLDER_ID env variable is missing")
exit(1)
-try:
- DOWNLOAD_DIR = get_config('DOWNLOAD_DIR')
- if not DOWNLOAD_DIR.endswith("/"):
- DOWNLOAD_DIR = DOWNLOAD_DIR + '/'
-except:
- LOGGER.error("DOWNLOAD_DIR env variable is missing")
- exit(1)
-
users = os.environ.get('AUTHORIZED_USERS', '')
if len(users) != 0:
AUTHORIZED_USERS = {int(user.strip()) for user in users.split()}
@@ -102,6 +90,13 @@ def get_config(name: str):
USE_SERVICE_ACCOUNTS = os.environ.get('USE_SERVICE_ACCOUNTS', '')
USE_SERVICE_ACCOUNTS = USE_SERVICE_ACCOUNTS.lower() == 'true'
+DOWNLOAD_DIR = os.environ.get('DOWNLOAD_DIR', '')
+if len(DOWNLOAD_DIR) == 0:
+ DOWNLOAD_DIR = '/usr/src/app/downloads/'
+else:
+ if not DOWNLOAD_DIR.endswith('/'):
+ DOWNLOAD_DIR = DOWNLOAD_DIR + '/'
+
STATUS_UPDATE_INTERVAL = os.environ.get('STATUS_UPDATE_INTERVAL', '')
STATUS_UPDATE_INTERVAL = 10 if len(STATUS_UPDATE_INTERVAL) == 0 else int(STATUS_UPDATE_INTERVAL)
diff --git a/bot/helper/drive_utils/gdriveTools.py b/bot/helper/drive_utils/gdriveTools.py
index 6e0389e2..bf92c92e 100644
--- a/bot/helper/drive_utils/gdriveTools.py
+++ b/bot/helper/drive_utils/gdriveTools.py
@@ -19,7 +19,7 @@
from googleapiclient.errors import Error as GCError, HttpError
from googleapiclient.http import MediaFileUpload, MediaIoBaseDownload
-from bot import LOGGER, DRIVE_NAMES, DRIVE_IDS, INDEX_URLS, PARENT_ID, \
+from bot import LOGGER, DRIVE_NAMES, DRIVE_IDS, INDEX_URLS, DRIVE_FOLDER_ID, \
IS_TEAM_DRIVE, TELEGRAPH, USE_SERVICE_ACCOUNTS, INDEX_URL
from bot.helper.ext_utils.bot_utils import SetInterval, get_readable_file_size
from bot.helper.ext_utils.fs_utils import get_mime_type
@@ -308,13 +308,13 @@ def setPermission(self, link, access):
@retry(wait=wait_exponential(multiplier=2, min=3, max=6),
stop=stop_after_attempt(3),
retry=retry_if_exception_type(GCError))
- def __create_directory(self, directory_name, parent_id):
+ def __create_directory(self, directory_name, dest_id):
file_metadata = {
"name": directory_name,
"mimeType": self.__G_DRIVE_DIR_MIME_TYPE
}
- if parent_id is not None:
- file_metadata["parents"] = [parent_id]
+ if dest_id is not None:
+ file_metadata["parents"] = [dest_id]
file = self.__service.files().create(
supportsAllDrives=True,
body=file_metadata).execute()
@@ -354,20 +354,20 @@ def __copyFile(self, file_id, dest_id):
else:
raise err
- def __cloneFolder(self, name, local_path, folder_id, parent_id):
+ def __cloneFolder(self, name, local_path, folder_id, dest_id):
files = self.__getFilesByFolderId(folder_id)
if len(files) == 0:
- return parent_id
+ return dest_id
for file in files:
if file.get('mimeType') == self.__G_DRIVE_DIR_MIME_TYPE:
self.__total_folders += 1
file_path = os.path.join(local_path, file.get('name'))
- current_dir_id = self.__create_directory(file.get('name'), parent_id)
+ current_dir_id = self.__create_directory(file.get('name'), dest_id)
self.__cloneFolder(file.get('name'), file_path, file.get('id'), current_dir_id)
else:
self.__total_files += 1
self.transferred_size += int(file.get('size', 0))
- self.__copyFile(file.get('id'), parent_id)
+ self.__copyFile(file.get('id'), dest_id)
if self.__is_cancelled:
break
@@ -376,8 +376,6 @@ def clone(self, link, dest_id):
self.__start_time = time.time()
self.__total_files = 0
self.__total_folders = 0
- parent_id = PARENT_ID
- index_url = INDEX_URL
try:
file_id = self.__getIdFromUrl(link)
except (KeyError, IndexError):
@@ -385,15 +383,17 @@ def clone(self, link, dest_id):
LOGGER.error(msg)
return msg
if dest_id != "":
- parent_id = dest_id
index_url = None
+ else:
+ dest_id = DRIVE_FOLDER_ID
+ index_url = INDEX_URL
msg = ""
try:
meta = self.__getFileMetadata(file_id)
name = meta.get("name")
mime_type = meta.get("mimeType")
if mime_type == self.__G_DRIVE_DIR_MIME_TYPE:
- dir_id = self.__create_directory(meta.get('name'), parent_id)
+ dir_id = self.__create_directory(meta.get('name'), dest_id)
self.__cloneFolder(meta.get('name'), meta.get('name'), meta.get('id'), dir_id)
durl = self.__G_DRIVE_DIR_BASE_DOWNLOAD_URL.format(dir_id)
if self.__is_cancelled:
@@ -411,7 +411,7 @@ def clone(self, link, dest_id):
url = f'{index_url}/{url_path}/'
msg += f' | Index Link'
else:
- file = self.__copyFile(meta.get('id'), parent_id)
+ file = self.__copyFile(meta.get('id'), dest_id)
msg += f'Name: {file.get("name")}'
if mime_type is None:
mime_type = 'File'
@@ -492,13 +492,13 @@ def _progress(self):
@retry(wait=wait_exponential(multiplier=2, min=3, max=6),
stop=stop_after_attempt(3),
retry=(retry_if_exception_type(GCError) | retry_if_exception_type(IOError)))
- def __upload_file(self, file_path, file_name, mime_type, parent_id):
+ def __upload_file(self, file_path, file_name, mime_type, dest_id):
file_metadata = {
'name': file_name,
'mimeType': mime_type
}
- if parent_id is not None:
- file_metadata['parents'] = [parent_id]
+ if dest_id is not None:
+ file_metadata['parents'] = [dest_id]
if os.path.getsize(file_path) == 0:
media_body = MediaFileUpload(file_path, mimetype=mime_type, resumable=False)
response = self.__service.files().create(
@@ -531,7 +531,7 @@ def __upload_file(self, file_path, file_name, mime_type, parent_id):
raise err
if USE_SERVICE_ACCOUNTS:
self.__switchServiceAccount()
- return self.__upload_file(file_path, file_name, mime_type, parent_id)
+ return self.__upload_file(file_path, file_name, mime_type, dest_id)
else:
LOGGER.error(f"Warning: {reason}")
raise err
@@ -546,24 +546,24 @@ def __upload_file(self, file_path, file_name, mime_type, parent_id):
download_url = self.__G_DRIVE_BASE_DOWNLOAD_URL.format(drive_file.get('id'))
return download_url
- def __upload_dir(self, input_directory, parent_id):
+ def __upload_dir(self, input_directory, dest_id):
list_dirs = os.listdir(input_directory)
if len(list_dirs) == 0:
- return parent_id
+ return dest_id
new_id = None
for item in list_dirs:
current_file_name = os.path.join(input_directory, item)
if os.path.isdir(current_file_name):
- current_dir_id = self.__create_directory(item, parent_id)
+ current_dir_id = self.__create_directory(item, dest_id)
new_id = self.__upload_dir(current_file_name, current_dir_id)
self.__total_folders += 1
else:
mime_type = get_mime_type(current_file_name)
file_name = current_file_name.split("/")[-1]
# 'current_file_name' will have the full path
- self.__upload_file(current_file_name, file_name, mime_type, parent_id)
+ self.__upload_file(current_file_name, file_name, mime_type, dest_id)
self.__total_files += 1
- new_id = parent_id
+ new_id = dest_id
if self.__is_cancelled:
break
return new_id
@@ -576,14 +576,14 @@ def upload(self, file_name: str):
try:
if os.path.isfile(file_path):
mime_type = get_mime_type(file_path)
- link = self.__upload_file(file_path, file_name, mime_type, PARENT_ID)
+ link = self.__upload_file(file_path, file_name, mime_type, DRIVE_FOLDER_ID)
if self.__is_cancelled:
return
if link is None:
raise Exception("The upload task has been manually cancelled")
else:
mime_type = 'Folder'
- dir_id = self.__create_directory(os.path.basename(os.path.abspath(file_name)), PARENT_ID)
+ dir_id = self.__create_directory(os.path.basename(os.path.abspath(file_name)), DRIVE_FOLDER_ID)
result = self.__upload_dir(file_path, dir_id)
if result is None:
raise Exception("The upload task has been manually cancelled")
@@ -687,7 +687,7 @@ def download(self, link):
err = err.last_attempt.exception()
err = str(err).replace('>', '').replace('<', '')
if "downloadQuotaExceeded" in err:
- err = "Download quota exceeded."
+ err = "Download quota exceeded"
elif "File not found" in err:
token_service = self.__alt_authorize()
if token_service is not None:
@@ -762,27 +762,27 @@ def __drive_query(self, DRIVE_IDS, search_type, file_name):
elif search_type == '-f':
query += "mimeType != 'application/vnd.google-apps.folder' and "
query += "trashed=false"
- for parent_id in DRIVE_IDS:
- if parent_id == "root":
+ for drive_id in DRIVE_IDS:
+ if drive_id == "root":
batch.add(
self.__service.files().list(
q=f"{query} and 'me' in owners",
pageSize=1000,
spaces='drive',
fields='files(id, name, mimeType, size)',
- orderBy='folder, modifiedTime desc'))
+ orderBy='folder, name'))
else:
batch.add(
self.__service.files().list(
supportsAllDrives=True,
includeItemsFromAllDrives=True,
- driveId=parent_id,
+ driveId=drive_id,
q=query,
corpora='drive',
spaces='drive',
pageSize=1000,
fields='files(id, name, mimeType, size)',
- orderBy='folder, modifiedTime desc'))
+ orderBy='folder, name'))
batch.execute()
def drive_list(self, file_name):
diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py
index 06234e6d..04c30e46 100644
--- a/bot/helper/ext_utils/bot_utils.py
+++ b/bot/helper/ext_utils/bot_utils.py
@@ -30,8 +30,8 @@ def __init__(self, interval, action):
def __setInterval(self):
nextTime = time.time() + self.interval
while not self.stopEvent.wait(nextTime - time.time()):
- nextTime += self.interval
self.action()
+ nextTime = time.time() + self.interval
def cancel(self):
self.stopEvent.set()
diff --git a/config_sample.env b/config_sample.env
index 853441f3..6525c425 100644
--- a/config_sample.env
+++ b/config_sample.env
@@ -2,12 +2,12 @@
BOT_TOKEN=
OWNER_ID=
DRIVE_FOLDER_ID=
-DOWNLOAD_DIR=/usr/src/app/downloads
# OPTIONAL CONFIG
AUTHORIZED_USERS=
DATABASE_URL=
IS_TEAM_DRIVE=
USE_SERVICE_ACCOUNTS=
+DOWNLOAD_DIR=
STATUS_UPDATE_INTERVAL=
TELEGRAPH_ACCS=
INDEX_URL=