From c225a3e2526b536d1b0f15bbc54ce054047e506e Mon Sep 17 00:00:00 2001 From: mtuszowski Date: Sun, 10 Nov 2024 19:08:59 +0100 Subject: [PATCH] Batch download --- music_commands.py | 13 ++++++++++--- music_functions.py | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/music_commands.py b/music_commands.py index c66ed7e..ecbf242 100644 --- a/music_commands.py +++ b/music_commands.py @@ -611,9 +611,16 @@ class MusicModule(commands.Cog): text = file_bytes.decode(encoding=check.group(1)) self.logger.info(text) lines = text.split("\n") - for item in lines: - self.logger.info(item) - + for link in lines: + pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$" + if re.match(pat, link) and (re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)): + self.logger.info("%s to link do jutuba", link) + elif re.match(pat, link) and re.match(".*spotify.*", link): + self.logger.info("%s to link do spotify", link) + elif re.match(pat, link): + self.logger.info("%s to link do czegos", link) + else: + ctx.reply("Spierdalaj") else: ctx.reply("Spierdalaj") diff --git a/music_functions.py b/music_functions.py index bb005c5..78372f4 100644 --- a/music_functions.py +++ b/music_functions.py @@ -150,9 +150,10 @@ async def get_file(ctx, source, link): elif source == "Youtube": link_ok = False pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$" - if re.match(pat, link) and re.match(".*youtube.*", link): + if re.match(pat, link) and (re.match(".*youtube.*", link) or re.match(".*youtu.be.*", link)): link_ok = True + if link_ok: dir_path = "" file_list = []