ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-27 13:34:28 +00:00
Code Activity

Centuplicata la velocità di download delle playlist. Seriamente.

Browse source
This commit is contained in:
Steffo 2019-02-11 01:20:52 +01:00
parent 55e95e100e
commit 4f4906545d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
discordbot.py
View file

@ -855,7 +855,9 @@ class RoyalDiscordBot(discord.Client):
async with self.main_channel.typing(): async with self.main_channel.typing():
with youtube_dl.YoutubeDL({"quiet": True, with youtube_dl.YoutubeDL({"quiet": True,
"ignoreerrors": True, "ignoreerrors": True,
"simulate": True}) as ytdl: "simulate": True,
"extract_flat": True,
"force_noplaylist": True}) as ytdl:
info = await loop.run_in_executor(executor, info = await loop.run_in_executor(executor,
functools.partial(ytdl.extract_info, url=url, download=False)) functools.partial(ytdl.extract_info, url=url, download=False))
if info is None: if info is None:
@ -866,7 +868,10 @@ class RoyalDiscordBot(discord.Client):
if "entries" in info: if "entries" in info:
logger.debug(f"Playlist detected at {url}.") logger.debug(f"Playlist detected at {url}.")
for entry in info["entries"]: for entry in info["entries"]:
self.video_queue.add(YoutubeDLVideo(entry["webpage_url"], enqueuer=enqueuer), index) if entry["ie_key"] == "Youtube":
self.video_queue.add(YoutubeDLVideo(f"https://youtu.be/{entry['id']}", enqueuer=enqueuer), index)
else:
self.video_queue.add(YoutubeDLVideo(entry["webpage_url"], enqueuer=enqueuer), index)
return return
logger.debug(f"Single video detected at {url}.") logger.debug(f"Single video detected at {url}.")
self.video_queue.add(YoutubeDLVideo(url, enqueuer=enqueuer), index) self.video_queue.add(YoutubeDLVideo(url, enqueuer=enqueuer), index)
@ -1225,7 +1230,7 @@ class RoyalDiscordBot(discord.Client):
] ]
await self.add_video_from_url(random.sample(videos, 1)[0], enqueuer=author) await self.add_video_from_url(random.sample(videos, 1)[0], enqueuer=author)
await channel.send(f"⚔️💀🤝") await channel.send(f"⚔️💀🤝")
logger.debug(f"Added random emojis? to the queue (EE2).") logger.debug(f"Added randomkda to the queue (EE2).")
def process(users_connection=None): def process(users_connection=None):