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

Validate Url and Magnet with Regex

This commit is contained in:
jaskaranSM 2019-10-27 17:29:02 +05:30
parent 3bac006fb3
commit deb4b43fdd
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bot/helper/ext_utils/bot_utils.py
View File

@ -1,8 +1,12 @@
from bot import download_dict, download_dict_lock from bot import download_dict, download_dict_lock
import logging import logging
import re
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
MAGNET_REGEX = r"magnet:\?xt=urn:btih:[a-zA-Z0-9]*"
URL_REGEX = r"(?:(?:https?|ftp):\/\/)?[\w/\-?=%.]+\.[\w/\-?=%.]+"
class MirrorStatus: class MirrorStatus:
STATUS_UPLOADING = "Uploading" STATUS_UPLOADING = "Uploading"
@ -112,13 +116,14 @@ def get_readable_time(seconds: int) -> str:
def is_url(url: str): def is_url(url: str):
# TODO: Find the proper way to validate the url url = re.findall(URL_REGEX,url)
if url.startswith('https://') or url.startswith('http://'): if url:
return True return True
return False return False
def is_magnet(url: str): def is_magnet(url: str):
if "magnet" in url: magnet = re.findall(MAGNET_REGEX,url)
if magnet:
return True return True
return False return False

9
bot/helper/mirror_utils/download_tools.py
View File

@ -12,13 +12,13 @@ class DownloadHelper:
self.__is_torrent = False self.__is_torrent = False
def add_download(self, link: str): def add_download(self, link: str):
if is_url(link): if is_magnet(link):
download = aria2.add_magnet(link, {'dir': DOWNLOAD_DIR + str(self.__listener.uid)})
self.__is_torrent = True
else:
if link.endswith('.torrent'): if link.endswith('.torrent'):
self.__is_torrent = True self.__is_torrent = True
download = aria2.add_uris([link], {'dir': DOWNLOAD_DIR + str(self.__listener.uid)}) download = aria2.add_uris([link], {'dir': DOWNLOAD_DIR + str(self.__listener.uid)})
else:
download = aria2.add_magnet(link, {'dir': DOWNLOAD_DIR + str(self.__listener.uid)})
self.__is_torrent = True
with download_dict_lock: with download_dict_lock:
download_dict[self.__listener.message.message_id] = DownloadStatus(download.gid, download_dict[self.__listener.message.message_id] = DownloadStatus(download.gid,
self.__listener.uid) self.__listener.uid)
@ -60,6 +60,7 @@ class DownloadHelper:
sleep(DOWNLOAD_STATUS_UPDATE_INTERVAL) sleep(DOWNLOAD_STATUS_UPDATE_INTERVAL)
new_gid = self.__get_followed_download_gid() new_gid = self.__get_followed_download_gid()
with download_dict_lock: with download_dict_lock:
LOGGER.info(f"{download.name}: Changing GID {download.gid} to {new_gid}")
download_dict[self.__listener.message.message_id] = DownloadStatus(new_gid, download_dict[self.__listener.message.message_id] = DownloadStatus(new_gid,
self.__listener.message.message_id) self.__listener.message.message_id)

6
bot/modules/mirror.py
View File

@ -92,10 +92,12 @@ class MirrorListener(listeners.MirrorListeners):
deleteMessage(self.context, self.reply_message) deleteMessage(self.context, self.reply_message)
with status_reply_dict_lock: with status_reply_dict_lock:
del status_reply_dict[self.update.effective_chat.id] del status_reply_dict[self.update.effective_chat.id]
except BadRequest: except BadRequest as e:
LOGGER.error(str(e))
# This means that the message has been deleted because of a /status command # This means that the message has been deleted because of a /status command
pass pass
except KeyError: except KeyError as e:
LOGGER.error(str(e))
pass pass
sendMessage(msg, self.context, self.update) sendMessage(msg, self.context, self.update)
try: try: