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

Fix bug

Browse source
This commit is contained in:
Steffo 2018-12-04 15:21:09 +01:00
parent 954ba6faf4
commit 311cf8aa03
1 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
discordbot.py
View file

@ -87,7 +87,7 @@ song_special_messages = {
"police academy": ":arrow_forward: {song} - freedom.png", "police academy": ":arrow_forward: {song} - freedom.png",
"super smash bros. ultimate": ":arrow_forward: Re-awaken the undying light with {song}!", "super smash bros. ultimate": ":arrow_forward: Re-awaken the undying light with {song}!",
"powerwolf": ":arrow_forward: Spaggia, ma non ti sei un po' stancato di {song}?", "powerwolf": ":arrow_forward: Spaggia, ma non ti sei un po' stancato di {song}?",
"eurobeat": ":arrow_forward: Nemesis approva la scelta di {song}. Ben fatto, amico." "eurobeat": ":arrow_forward: Nemesis approva la scelta di {song}. Ben fatto, amico."
} }
# FFmpeg settings # FFmpeg settings
@ -102,7 +102,7 @@ class Succ:
def __bool__(self): def __bool__(self):
return False return False
def __getattr__(self, attr): def __getattr__(self, attr):
return Succ() return Succ()
@ -129,7 +129,7 @@ sentry = Succ()
class Video: class Video:
def __init__(self, enqueuer: typing.Optional[discord.Member]=None): def __init__(self, enqueuer: typing.Optional[discord.Member] = None):
self.is_ready = False self.is_ready = False
self.name = None self.name = None
self.enqueuer = enqueuer self.enqueuer = enqueuer
@ -162,7 +162,7 @@ class Video:
def make_audio_source(self): def make_audio_source(self):
"""Create an AudioSource to be played through Discord, and store and return it.""" """Create an AudioSource to be played through Discord, and store and return it."""
raise NotImplementedError() raise NotImplementedError()
def get_suggestion(self): def get_suggestion(self):
"""Get the next suggested video, to be used when the queue is in LoopMode.FOLLOW_SUGGESTION""" """Get the next suggested video, to be used when the queue is in LoopMode.FOLLOW_SUGGESTION"""
raise NotImplementedError() raise NotImplementedError()
@ -170,8 +170,8 @@ class Video:
class YoutubeDLVideo(Video): class YoutubeDLVideo(Video):
"""A file sourcing from YoutubeDL.""" """A file sourcing from YoutubeDL."""
def __init__(self, url, enqueuer: typing.Optional[discord.Member]=None): def __init__(self, url, enqueuer: typing.Optional[discord.Member] = None):
super().__init__(enqueuer) super().__init__(enqueuer)
self.url = url self.url = url
self.info = None self.info = None
@ -208,7 +208,7 @@ class YoutubeDLVideo(Video):
if self.info is None: if self.info is None:
raise errors.VideoInfoUnknown() raise errors.VideoInfoUnknown()
return "./opusfiles/{}.opus".format(re.sub(r'[/\\?*"<>|!:]', "_", self.info.get("title", self.info["id"]))) return "./opusfiles/{}.opus".format(re.sub(r'[/\\?*"<>|!:]', "_", self.info.get("title", self.info["id"])))
def ready_up(self): def ready_up(self):
"""Download the video.""" """Download the video."""
# Skip download if it is already ready # Skip download if it is already ready
@ -230,10 +230,10 @@ class YoutubeDLVideo(Video):
}], }],
"outtmpl": self.get_filename(), "outtmpl": self.get_filename(),
"quiet": True}) as ytdl: "quiet": True}) as ytdl:
ytdl.download(self.url) ytdl.download([self.url])
logger.info(f"Completed youtube_dl download of {repr(self)}") logger.info(f"Completed youtube_dl download of {repr(self)}")
self.is_ready = True self.is_ready = True
def make_audio_source(self): def make_audio_source(self):
if not self.is_ready: if not self.is_ready:
raise errors.VideoIsNotReady() raise errors.VideoIsNotReady()
@ -267,12 +267,12 @@ class VideoQueue():
def __repr__(self) -> str: def __repr__(self) -> str:
return f"<VideoQueue of length {len(self)}>" return f"<VideoQueue of length {len(self)}>"
def add(self, video: Video, position: int=None) -> None: def add(self, video: Video, position: int = None) -> None:
if position is None: if position is None:
self.list.append(video) self.list.append(video)
return return
self.list.insert(position, video) self.list.insert(position, video)
def advance_queue(self): def advance_queue(self):
if self.loop_mode == LoopMode.NORMAL: if self.loop_mode == LoopMode.NORMAL:
try: try:
@ -289,7 +289,7 @@ class VideoQueue():
self.now_playing = None self.now_playing = None
return return
self.now_playing = self.now_playing.suggestion() self.now_playing = self.now_playing.suggestion()
def next_video(self) -> typing.Optional[Video]: def next_video(self) -> typing.Optional[Video]:
if len(self.list) == 0: if len(self.list) == 0:
return None return None
@ -312,14 +312,14 @@ class VideoQueue():
return video return video
return None return None
def not_ready_videos(self, limit: typing.Optional[int]=None): def not_ready_videos(self, limit: typing.Optional[int] = None):
"""Return the non-ready videos in the first limit positions of the queue.""" """Return the non-ready videos in the first limit positions of the queue."""
l = [] video_list = []
for video in self.list[:limit]: for video in self.list[:limit]:
if not video.is_ready: if not video.is_ready:
l.append(video) video_list.append(video)
return l return video_list
def __getitem__(self, index: int) -> Video: def __getitem__(self, index: int) -> Video:
"""Get an element from the list.""" """Get an element from the list."""
return self.list[index] return self.list[index]
@ -657,8 +657,10 @@ class RoyalDiscordBot(discord.Client):
with async_timeout.timeout(self.max_video_ready_time): with async_timeout.timeout(self.max_video_ready_time):
await loop.run_in_executor(executor, video.ready_up) await loop.run_in_executor(executor, video.ready_up)
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning(f"Video {repr(video)} took more than {self.max_video_ready_time} to download, skipping...") logger.warning(
await self.main_channel.send(f"⚠️ La preparazione di {video} ha richiesto più di {self.max_video_ready_time} secondi, pertanto è stato rimosso dalla coda.") f"Video {repr(video)} took more than {self.max_video_ready_time} to download, skipping...")
await self.main_channel.send(
f"⚠️ La preparazione di {video} ha richiesto più di {self.max_video_ready_time} secondi, pertanto è stato rimosso dalla coda.")
del self.video_queue.list[index] del self.video_queue.list[index]
continue continue
except Exception as e: except Exception as e:
@ -699,10 +701,12 @@ class RoyalDiscordBot(discord.Client):
# Try to generate an AudioSource # Try to generate an AudioSource
if self.video_queue.now_playing is None: if self.video_queue.now_playing is None:
continue continue
try: while True:
audio_source = self.video_queue.now_playing.make_audio_source() try:
except errors.VideoIsNotReady: audio_source = self.video_queue.now_playing.make_audio_source()
continue break
except errors.VideoIsNotReady:
await asyncio.sleep(1)
# Start playing the AudioSource # Start playing the AudioSource
logger.info(f"Started playing {self.video_queue.now_playing.plain_text()}.") logger.info(f"Started playing {self.video_queue.now_playing.plain_text()}.")
voice_client.play(audio_source) voice_client.play(audio_source)
@ -717,7 +721,8 @@ class RoyalDiscordBot(discord.Client):
try: try:
session = db.Session() session = db.Session()
enqueuer = await loop.run_in_executor(executor, session.query(db.Discord) enqueuer = await loop.run_in_executor(executor, session.query(db.Discord)
.filter_by(discord_id=self.video_queue.now_playing.enqueuer.id) .filter_by(
discord_id=self.video_queue.now_playing.enqueuer.id)
.one_or_none) .one_or_none)
played_music = db.PlayedMusic(enqueuer=enqueuer, played_music = db.PlayedMusic(enqueuer=enqueuer,
filename=self.video_queue.now_playing.database_text(), filename=self.video_queue.now_playing.database_text(),
@ -730,10 +735,12 @@ class RoyalDiscordBot(discord.Client):
# Send a message in chat # Send a message in chat
for key in song_special_messages: for key in song_special_messages:
if key in self.video_queue.now_playing.name.lower(): if key in self.video_queue.now_playing.name.lower():
await self.main_channel.send(song_special_messages[key].format(song=str(self.video_queue.now_playing))) await self.main_channel.send(
song_special_messages[key].format(song=str(self.video_queue.now_playing)))
break break
else: else:
await self.main_channel.send(f":arrow_forward: Ora in riproduzione: {str(self.video_queue.now_playing)}") await self.main_channel.send(
f":arrow_forward: Ora in riproduzione: {str(self.video_queue.now_playing)}")
async def inactivity_countdown(self): async def inactivity_countdown(self):
while True: while True:
@ -792,7 +799,7 @@ class RoyalDiscordBot(discord.Client):
logger.debug(f"Waiting {self.activity_report_sample_time} seconds before the next record.") logger.debug(f"Waiting {self.activity_report_sample_time} seconds before the next record.")
await asyncio.sleep(self.activity_report_sample_time) await asyncio.sleep(self.activity_report_sample_time)
async def add_video_from_url(self, url, index: typing.Optional[int] = None, enqueuer: discord.Member = None): async def add_video_from_url(self, url: str, index: typing.Optional[int] = None, enqueuer: discord.Member = None):
# Retrieve info # Retrieve info
logger.debug(f"Retrieving info for {url}.") logger.debug(f"Retrieving info for {url}.")
with youtube_dl.YoutubeDL({"quiet": True, with youtube_dl.YoutubeDL({"quiet": True,
@ -904,7 +911,7 @@ class RoyalDiscordBot(discord.Client):
# This is a search # This is a search
await self.add_video_from_url(url=f"ytsearch:{search}", enqueuer=author) await self.add_video_from_url(url=f"ytsearch:{search}", enqueuer=author)
await channel.send(f"✅ Video aggiunto alla coda.") await channel.send(f"✅ Video aggiunto alla coda.")
logger.debug(f"Added ytsearch:{search} to the queue as YouTube search.") logger.debug(f"Added ytsearch:{search} to the queue.")
@command @command
@requires_connected_voice_client @requires_connected_voice_client
@ -1049,7 +1056,8 @@ class RoyalDiscordBot(discord.Client):
"Sintassi: `!radiomessages <on|off>`") "Sintassi: `!radiomessages <on|off>`")
return return
logger.info(f"Radio messages status to {'enabled' if self.radio_messages_next_in < math.inf else 'disabled'}.") logger.info(f"Radio messages status to {'enabled' if self.radio_messages_next_in < math.inf else 'disabled'}.")
await channel.send(f"📻 Messaggi radio **{'attivati' if self.radio_messages_next_in < math.inf else 'disattivati'}**.") await channel.send(
f"📻 Messaggi radio **{'attivati' if self.radio_messages_next_in < math.inf else 'disattivati'}**.")
@command @command
@requires_connected_voice_client @requires_connected_voice_client