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

Another possible fix

Browse source
This commit is contained in:
Steffo 2018-04-09 22:55:48 +02:00
parent 3b44100fcf
commit da3063421f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
discordbot.py
View file

@ -16,6 +16,7 @@ import os
import asyncio import asyncio
import configparser import configparser
import subprocess import subprocess
import async_timeout
# Queue emojis # Queue emojis
queue_emojis = [":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:", ":ten:"] queue_emojis = [":one:", ":two:", ":three:", ":four:", ":five:", ":six:", ":seven:", ":eight:", ":nine:", ":ten:"]
@ -343,7 +344,7 @@ async def update_music_queue():
if voice_client is None: if voice_client is None:
await asyncio.sleep(5) await asyncio.sleep(5)
continue continue
if voice_player is not None and not voice_player._end.is_set(): if voice_player is not None and not voice_player.is_done():
await asyncio.sleep(1) await asyncio.sleep(1)
continue continue
if len(voice_queue) == 0: if len(voice_queue) == 0:
@ -355,7 +356,13 @@ async def update_music_queue():
await client.send_message(client.get_channel(config["Discord"]["main_channel"]), await client.send_message(client.get_channel(config["Discord"]["main_channel"]),
f"⬇️ E' iniziato il download di `{video.ytdl_url}`.") f"⬇️ E' iniziato il download di `{video.ytdl_url}`.")
try: try:
await video.download() async with async_timeout.timeout(30):
await video.download()
except asyncio.TimeoutError:
await client.send_message(client.get_channel(config["Discord"]["main_channel"]),
f"⚠️ Il download della canzone ha richiesto più di 30 secondi ed è stato "
f"annullato. ")
continue
except DurationError: except DurationError:
await client.send_message(client.get_channel(config["Discord"]["main_channel"]), await client.send_message(client.get_channel(config["Discord"]["main_channel"]),
f"⚠️ Il file supera il limite di durata impostato in config.ini " f"⚠️ Il file supera il limite di durata impostato in config.ini "
@ -383,13 +390,7 @@ def process(users_connection=None):
asyncio.ensure_future(update_users_pipe(users_connection)) asyncio.ensure_future(update_users_pipe(users_connection))
asyncio.ensure_future(update_music_queue()) asyncio.ensure_future(update_music_queue())
client.on_error = on_error client.on_error = on_error
while True: client.run(config["Discord"]["bot_token"])
try:
client.run(config["Discord"]["bot_token"])
except Exception as e:
on_error("client_run")
print(e)
print("Discordbot restarting...")
if __name__ == "__main__": if __name__ == "__main__":