ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

derp

Browse source
This commit is contained in:
Steffo 2018-09-18 00:19:35 +02:00
parent 7824d4f38d
commit c111b98dac
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
discordbot.py
View file

@ -135,6 +135,9 @@ class Video:
return f"`{self.file}`" return f"`{self.file}`"
return f"_{self.info['title']}_" return f"_{self.info['title']}_"
def __repr__(self):
return f"<discordbot.Video {str(self)}>"
def plain_text(self): def plain_text(self):
if self.info is None or "title" not in self.info: if self.info is None or "title" not in self.info:
return self.file return self.file
@ -152,7 +155,7 @@ class Video:
if self.info is not None and self.duration.total_seconds() > int(config["YouTube"]["max_duration"]): if self.info is not None and self.duration.total_seconds() > int(config["YouTube"]["max_duration"]):
raise DurationError() raise DurationError()
# Download the file # Download the file
logger.info(f"Now downloading {repr(self)}") logger.info(f"Now downloading {repr(self)}.")
with youtube_dl.YoutubeDL({"noplaylist": True, with youtube_dl.YoutubeDL({"noplaylist": True,
"format": "best", "format": "best",
"postprocessors": [{ "postprocessors": [{
@ -163,7 +166,8 @@ class Video:
"progress_hooks": progress_hooks, "progress_hooks": progress_hooks,
"quiet": True}) as ytdl: "quiet": True}) as ytdl:
await loop.run_in_executor(executor, functools.partial(ytdl.download, [self.url])) await loop.run_in_executor(executor, functools.partial(ytdl.download, [self.url]))
self.downloaded = True logger.info(f"Download of {repr(self)} complete.")
self.downloaded = True
def create_audio_source(self) -> discord.PCMVolumeTransformer: def create_audio_source(self) -> discord.PCMVolumeTransformer:
# Check if the file has been downloaded # Check if the file has been downloaded
@ -458,7 +462,7 @@ class RoyalDiscordBot(discord.Client):
while True: while True:
# Fun things will happen with multiple voice clients! # Fun things will happen with multiple voice clients!
for voice_client in self.voice_clients: for voice_client in self.voice_clients:
if not voice_client.is_connected() or not voice_client.is_playing(): if not voice_client.is_connected() or voice_client.is_playing():
continue continue
if len(self.video_queue) == 0: if len(self.video_queue) == 0:
self.now_playing = None self.now_playing = None