diff --git a/Dockerfile b/Dockerfile index 5442b44b..4e424848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN chmod 777 /usr/src/app RUN apt-get -qq update && DEBIAN_FRONTEND="noninteractive" \ apt-get -qq install -y locales python3 python3-pip \ - libmagic-dev p7zip-full unzip && locale-gen en_US.UTF-8 + libmagic-dev p7zip-full p7zip-rar unzip && locale-gen en_US.UTF-8 ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" diff --git a/README.md b/README.md index 224bb240..7527e1e8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ## SearchX -> A simple Telegram Bot for searching data on Google Drive. Able to clone data from Google Drive, AppDrive, DriveApp and GDToT links. Supports MongoDB for storing authorized users record. +> A simple Telegram Bot for searching data on Google Drive. Able to clone data from Google Drive, AppDrive and GDToT. Supports MongoDB for storing authorized users record.

diff --git a/bot/__main__.py b/bot/__main__.py index 15036838..8d06800c 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -74,11 +74,11 @@ def log(update, context):

/{BotCommands.ListCommand} <query>: Find data on Google Drive

-• /{BotCommands.CloneCommand} <url> <key>: Copy data from Google Drive, AppDrive, DriveApp and GDToT (Key optional) +• /{BotCommands.CloneCommand} <url> <key>: Copy data from Google Drive, AppDrive and GDToT (Key optional)

-• /{BotCommands.ArchiveCommand}: Archive data from Google Drive, AppDrive, DriveApp and GDToT +• /{BotCommands.ArchiveCommand}: Archive data from Google Drive, AppDrive and GDToT

-• /{BotCommands.ExtractCommand}: Extract data from Google Drive, AppDrive, DriveApp and GDToT +• /{BotCommands.ExtractCommand}: Extract data from Google Drive, AppDrive and GDToT

/{BotCommands.CountCommand} <drive_url>: Count data from Google Drive

diff --git a/bot/helper/download_utils/ddl_generator.py b/bot/helper/download_utils/ddl_generator.py index 560b7c2d..f5693d80 100644 --- a/bot/helper/download_utils/ddl_generator.py +++ b/bot/helper/download_utils/ddl_generator.py @@ -67,10 +67,6 @@ def appdrive(url: str) -> str: elif 'error' in response and response['error']: info['error'] = True info['message'] = response['message'] - if urlparse(url).netloc == 'driveapp.in' and not info['error']: - res = client.get(info['gdrive_link']) - drive_link = etree.HTML(res.content).xpath("//a[contains(@class,'btn')]/@href")[0] - info['gdrive_link'] = drive_link if not info['error']: return info else: diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py index 4e6a342f..4457f2d1 100644 --- a/bot/helper/ext_utils/bot_utils.py +++ b/bot/helper/ext_utils/bot_utils.py @@ -139,7 +139,7 @@ def is_gdrive_link(url: str): return "drive.google.com" in url def is_appdrive_link(url: str): - url = re.match(r'https?://(appdrive|driveapp)\.in/\S+', url) + url = re.match(r'https?://appdrive\.in/\S+', url) return bool(url) def is_gdtot_link(url: str): diff --git a/bot/modules/clone.py b/bot/modules/clone.py index 1f09bf3a..ee190226 100644 --- a/bot/modules/clone.py +++ b/bot/modules/clone.py @@ -100,7 +100,7 @@ def cloneNode(update, context): gd.deleteFile(link) else: help_msg = 'Instructions\nSend a link along with command' - help_msg += '\n\nSupported Sites\n• Google Drive\n• AppDrive\n• DriveApp\n• GDToT' + help_msg += '\n\nSupported Sites\n• Google Drive\n• AppDrive\n• GDToT' help_msg += '\n\nSet Destination Drive\nAdd <key> after the link' sendMessage(help_msg, context.bot, update.message) diff --git a/bot/modules/compress.py b/bot/modules/compress.py index e5be1e90..7b582bf0 100644 --- a/bot/modules/compress.py +++ b/bot/modules/compress.py @@ -216,7 +216,7 @@ def _compress(bot, message, is_archive=False, is_extract=False, pswd=None): threading.Thread(target=add_gd_download, args=(link, listener, is_appdrive, appdict, is_gdtot)).start() else: help_msg = 'Instructions\nSend a link along with command' - help_msg += '\n\nSupported Sites\n• Google Drive\n• AppDrive\n• DriveApp\n• GDToT' + help_msg += '\n\nSupported Sites\n• Google Drive\n• AppDrive\n• GDToT' help_msg += '\n\nSet Password\nAdd "pswd: xxx" after the link' sendMessage(help_msg, bot, message)