aboutsummaryrefslogtreecommitdiffstats
path: root/cogs/music/play_commands.py
diff options
context:
space:
mode:
Diffstat (limited to 'cogs/music/play_commands.py')
-rw-r--r--cogs/music/play_commands.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/cogs/music/play_commands.py b/cogs/music/play_commands.py
index 5373436..bdb021d 100644
--- a/cogs/music/play_commands.py
+++ b/cogs/music/play_commands.py
@@ -18,6 +18,8 @@ from discord.ext import commands
18 18
19from cogs.music import audio_playback, media_processing 19from cogs.music import audio_playback, media_processing
20from cogs.utils.file_search import UniversalSearcher 20from cogs.utils.file_search import UniversalSearcher
21from cogs.utils.settings import get_uploadurl
22from cogs.utils.url_helper import clean_url_for_ytdlp
21 23
22logger = logging.getLogger(__name__) 24logger = logging.getLogger(__name__)
23 25
@@ -192,6 +194,7 @@ class PlayCommands(commands.Cog):
192 } 194 }
193 195
194 loop = asyncio.get_event_loop() 196 loop = asyncio.get_event_loop()
197 url = clean_url_for_ytdlp(url)
195 with YoutubeDL(ytdl_opts) as ydl: 198 with YoutubeDL(ytdl_opts) as ydl:
196 info_dict = await loop.run_in_executor( 199 info_dict = await loop.run_in_executor(
197 None, lambda: ydl.extract_info(url, download=True) 200 None, lambda: ydl.extract_info(url, download=True)
@@ -229,14 +232,13 @@ class PlayCommands(commands.Cog):
229 232
230 try: 233 try:
231 logger.info(f"Starting async upload: {file_path}") 234 logger.info(f"Starting async upload: {file_path}")
232 baseurl = os.getenv("COPYPARTY_URL_UPLOAD") 235 baseurl = get_uploadurl()
233 password = os.getenv("COPYPARTY_PASSWORD", "") 236 password = os.getenv("COPYPARTY_PASSWORD", "")
234 237
235 logger.info(f"Upload - baseurl: {baseurl}, password set: {bool(password)}") 238 logger.info(f"Upload - baseurl: {baseurl}, password set: {bool(password)}")
236 239
237 if not baseurl: 240 if baseurl == "http://localhost:3939":
238 logger.error("COPYPARTY_URL_UPLOAD not set!") 241 logger.warning("COPYPARTY_URL_UPLOAD not set! Using default")
239 return
240 242
241 with open(file_path, "rb") as f: 243 with open(file_path, "rb") as f:
242 content = f.read() 244 content = f.read()