Merge branch 'dev'

Signed-off-by: salmonik <raisersoft@proton.me>

3 files changed, 38 insertions, 16 deletions

diff --git a/cogs/music/audio_playback.py b/cogs/music/audio_playback.py
index 28c6118..1313d01 100644
--- a/cogs/music/audio_playback.py
+++ b/cogs/music/audio_playback.py
@@ -137,8 +137,16 @@ class AudioPlaybackManager:
         return absolute_source, display_name, is_url
 
     @staticmethod
-    async def execute_playback(ctx, source, display_name, is_url):
-        """Execute the actual audio playback."""
+    async def execute_playback(ctx, source, display_name, is_url, interrupt=True):
+        """Execute the actual audio playback.
+
+        Args:
+            ctx: Discord context
+            source: Audio source path or URL
+            display_name: Name to display
+            is_url: Whether source is a URL
+            interrupt: If True, stop any currently playing audio. If False, skip if audio is playing.
+        """
         target_channel = await AudioPlaybackManager.validate_voice_channel(ctx)
         if not target_channel:
             return False
@@ -169,9 +177,12 @@ class AudioPlaybackManager:
                 logger.info(f"Moving to voice channel: {target_channel.name}")
                 await vc.move_to(target_channel)
 
-            # Stop any currently playing audio
-            if vc.is_playing() or vc.is_paused():  # type: ignore[union-attr]
+            # Stop any currently playing audio (if interrupt is True)
+            if interrupt and (vc.is_playing() or vc.is_paused()):  # type: ignore[union-attr]
                 vc.stop()  # type: ignore[union-attr]
+            elif not interrupt and vc.is_playing():  # type: ignore[union-attr]
+                logger.info("Audio already playing and interrupt=False, skipping playback")
+                return False
 
             # Prepare audio source
             (
@@ -181,13 +192,14 @@ class AudioPlaybackManager:
                 source, is_url, display_name
             )
 
-            # Track if playback failed
-            playback_failed = {"error": None}
+            # Track playback state
+            playback_state = {"error": None, "finished": False}
 
             def after_playing(error):
                 if error:
-                    playback_failed["error"] = str(error)
+                    playback_state["error"] = str(error)
                     logger.error(f"Playback error: {error}")
+                playback_state["finished"] = True
 
             # Play the audio
             vc.play(audio_source, after=after_playing)
@@ -197,14 +209,19 @@ class AudioPlaybackManager:
             # Wait for FFmpeg to attempt connection - errors usually happen within 5 seconds
             await asyncio.sleep(5)
 
-            # Check if playback actually started
-            if playback_failed["error"]:
-                logger.error(f"Playback failed: {playback_failed['error']}")
+            # Check if playback failed to start (not just finished quickly)
+            if playback_state["error"]:
+                logger.error(f"Playback failed: {playback_state['error']}")
                 await ctx.followup.send(
                     "eror: Timeout - nie udało się połączyć ze streamem", ephemeral=True
                 )
                 return False
 
+            # If playback finished within 5s, it was a short file - not an error
+            if playback_state["finished"]:
+                logger.info(f"Playback completed quickly: {final_display_name}")
+                return True
+
             if not vc.is_playing():
                 logger.error(f"Stream failed - not playing after 5s: {source}")
                 await ctx.followup.send(
@@ -232,13 +249,14 @@ class AudioPlaybackManager:
         return prepared_source, display_name, is_url
 
     @staticmethod
-    async def play(ctx, source, delete_after_play=False):
+    async def play(ctx, source, delete_after_play=False, interrupt=True):
         """Play audio from a local file or URL.
 
         Args:
             ctx: Discord context
             source: Either a local file path or a URL to stream from
             delete_after_play: If True, delete the file after playing (only for local files)
+            interrupt: If True, stop any currently playing audio. If False, skip if audio is playing.
         """
         # Validate and prepare source
         (
@@ -254,7 +272,7 @@ class AudioPlaybackManager:
 
         # Execute playback
         success = await AudioPlaybackManager.execute_playback(
-            ctx, prepared_source, display_name, is_url
+            ctx, prepared_source, display_name, is_url, interrupt
         )
 
         # Cleanup if needed
diff --git a/cogs/music/media_processing.py b/cogs/music/media_processing.py
index b9b814c..91bd406 100644
--- a/cogs/music/media_processing.py
+++ b/cogs/music/media_processing.py
@@ -9,6 +9,7 @@ import os
 
 import yt_dlp
 from youtubesearchpython import VideosSearch
+from cogs.utils.url_helper import clean_url_for_ytdlp
 
 logger = logging.getLogger(__name__)
 
@@ -36,6 +37,7 @@ class MediaDownloader:
         }
 
         try:
+            url = clean_url_for_ytdlp(url)
             with yt_dlp.YoutubeDL(ytdl_opts) as ydl:
                 info_dict = ydl.extract_info(url, download=True)
                 # Get the base filename without extension
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
 
 from cogs.music import audio_playback, media_processing
 from cogs.utils.file_search import UniversalSearcher
+from cogs.utils.settings import get_uploadurl
+from cogs.utils.url_helper import clean_url_for_ytdlp
 
 logger = logging.getLogger(__name__)
 
@@ -192,6 +194,7 @@ class PlayCommands(commands.Cog):
             }
 
             loop = asyncio.get_event_loop()
+            url = clean_url_for_ytdlp(url)
             with YoutubeDL(ytdl_opts) as ydl:
                 info_dict = await loop.run_in_executor(
                     None, lambda: ydl.extract_info(url, download=True)
@@ -229,14 +232,13 @@ class PlayCommands(commands.Cog):
 
         try:
             logger.info(f"Starting async upload: {file_path}")
-            baseurl = os.getenv("COPYPARTY_URL_UPLOAD")
+            baseurl = get_uploadurl()
             password = os.getenv("COPYPARTY_PASSWORD", "")
 
             logger.info(f"Upload - baseurl: {baseurl}, password set: {bool(password)}")
 
-            if not baseurl:
-                logger.error("COPYPARTY_URL_UPLOAD not set!")
-                return
+            if baseurl == "http://localhost:3939":
+                logger.warning("COPYPARTY_URL_UPLOAD not set! Using default")
 
             with open(file_path, "rb") as f:
                 content = f.read()