fixed compressed play

1 files changed, 50 insertions, 10 deletions

diff --git a/cogs/music/play_utils.py b/cogs/music/play_utils.py
index 6fa0edd..b3d81a8 100644
--- a/cogs/music/play_utils.py
+++ b/cogs/music/play_utils.py
@@ -108,30 +108,70 @@ class PlayUtils:
     async def compress(ctx, filename):
         if not filename:
             await ctx.respond("dzie wideło", ephemeral=True)
-            return
+            return None
 
-        ffmpeg_command = f"ffmpeg -i {filename} -ac 1 -b:a 500 -acodec libopus {filename}"
+        # Create temp directory if it doesn't exist
+        temp_dir = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'temp', 'compressed')
+        os.makedirs(temp_dir, exist_ok=True)
+        
+        # Create a temporary output filename in the temp directory
+        base_name = os.path.basename(filename)
+        output_filename = os.path.join(temp_dir, f"{os.path.splitext(base_name)[0]}_compressed.opus")
+        
+        # Ensure the output directory exists
+        os.makedirs(os.path.dirname(output_filename) or '.', exist_ok=True)
+        
+        # Use proper quoting for filenames with spaces
+        ffmpeg_command = [
+            'ffmpeg',
+            '-y',  # Overwrite output file if it exists
+            '-i', filename,
+            '-ac', '1',  # Mono audio
+            '-b:a', '500',  # 500k bitrate
+            '-acodec', 'libopus',
+            output_filename
+        ]
+        
         try:
-            process = await asyncio.create_subprocess_shell(
-                ffmpeg_command,
+            logger.info(f"Running FFmpeg command: {' '.join(ffmpeg_command)}")
+            process = await asyncio.create_subprocess_exec(
+                *ffmpeg_command,
                 stdout=asyncio.subprocess.PIPE,
                 stderr=asyncio.subprocess.PIPE
             )
+            
             stdout, stderr = await process.communicate()
+            
             if process.returncode != 0:
-                logger.error(f"FFmpeg error: {stderr.decode()}")
+                error_msg = stderr.decode()
+                logger.error(f"FFmpeg error ({process.returncode}): {error_msg}")
                 await ctx.respond("eror kompresujync pilk", ephemeral=True)
-            else:
-                logger.info(f"Compressed file: {filename}")
+                return None
+                
+            if not os.path.exists(output_filename):
+                logger.error(f"Output file was not created: {output_filename}")
+                await ctx.respond("eror kompresujync pilk - output file not created", ephemeral=True)
+                return None
+                
+            logger.info(f"Successfully compressed file: {output_filename}")
+            return output_filename
+            
         except Exception as e:
-            logger.error(f"Error compressing file: {e}")
-            await ctx.respond("eror kompresujync pilk", ephemeral=True)
+            logger.error(f"Error compressing file: {str(e)}", exc_info=True)
+            await ctx.respond(f"eror kompresujync pilk: {str(e)}", ephemeral=True)
+            return None
 
     @staticmethod
-    async def play(ctx, filepath):
+    async def play(ctx, filepath, delete_after_play=False):
         # Check if user is in a voice channel
         if not ctx.author.voice or not ctx.author.voice.channel:
             await ctx.respond("Musisz być na kanale głosowym, żebym mógł dołączyć!", ephemeral=True)
+            if delete_after_play and os.path.exists(filepath):
+                try:
+                    os.remove(filepath)
+                    logger.info(f"Cleaned up temporary file: {filepath}")
+                except Exception as e:
+                    logger.error(f"Error cleaning up file {filepath}: {str(e)}")
             return
 
         logger.info(f"Attempting to play: {filepath}")