fix tmp dir being deleted before sending file

2 files changed, 19 insertions, 10 deletions

diff --git a/cogs/downloader.py b/cogs/downloader.py
index 42acc1d..a2e2299 100644
--- a/cogs/downloader.py
+++ b/cogs/downloader.py
@@ -70,7 +70,7 @@ class Downloader(commands.Cog):
         try:
             logger.info(f"Downloading {url} as {fformat}")
 
-            with tempfile.TemporaryDirectory() as temp_dir:
+            with tempfile.TemporaryDirectory(delete=False) as temp_dir:
                 # Configure yt-dlp to use the original filename
                 ydl_opts = {
                     'outtmpl': os.path.join(temp_dir, '%(title)s.%(ext)s'),
@@ -151,22 +151,24 @@ class Downloader(commands.Cog):
                                             "status": "success",
                                             "type": "url",
                                             "content": dl_url,
-                                            "format": fformat,
-                                            "filename": filename
+                                            "filename": filename,
+                                            "temp_dir": temp_dir
                                         }
                                     else:
                                         return {
                                             "status": "error",
                                             "type": "error",
                                             "content": "Invalid response from file server",
-                                            "details": str(result)
+                                            "details": str(result),
+                                            "temp_dir": temp_dir
                                         }
                                 except ValueError:
                                     return {
                                         "status": "error",
                                         "type": "error",
                                         "content": "Failed to parse server response",
-                                        "details": response.text[:200]  # First 200 chars of response
+                                        "details": response.text[:200],  # First 200 chars of response
+                                        "temp_dir": temp_dir
                                     }
                             else:
                                 error_msg = response.text if response.text else 'Unknown error'
@@ -174,7 +176,8 @@ class Downloader(commands.Cog):
                                     "status": "error",
                                     "type": "error",
                                     "content": f"Server returned {response.status_code}",
-                                    "details": error_msg
+                                    "details": error_msg,
+                                    "temp_dir": temp_dir
                                 }
 
                     except Exception as upload_error:
@@ -182,7 +185,8 @@ class Downloader(commands.Cog):
                             "status": "error",
                             "type": "error",
                             "content": "Upload failed",
-                            "details": str(upload_error)
+                            "details": str(upload_error),
+                            "temp_dir": temp_dir
                         }
 
                 else:
@@ -191,7 +195,8 @@ class Downloader(commands.Cog):
                         "status": "success",
                         "type": "file",
                         "content": actual_file,
-                        "filename": filename
+                        "filename": filename,
+                        "temp_dir": temp_dir
                     }
 
         except Exception as e:
@@ -201,7 +206,8 @@ class Downloader(commands.Cog):
                 "status": "error",
                 "type": "error",
                 "content": "Download failed",
-                "details": str(e)
+                "details": str(e),
+                "temp_dir": temp_dir
             }
 
 
diff --git a/cogs/jarvis.py b/cogs/jarvis.py
index 0f4606b..21f71f6 100644
--- a/cogs/jarvis.py
+++ b/cogs/jarvis.py
@@ -4,6 +4,7 @@ from discord.ext import commands
 import requests
 import json
 import logging
+import os
 
 from cogs.compression import Compression
 from cogs.downloader import Downloader
@@ -78,7 +79,7 @@ class Jarvis(commands.Cog):
 
         if action == "download":
             # Extract the URL from the message using regex
-            url_match = re.search(r'(https?://\S+)', message.content).group(0)
+            url_match = re.search(r'https://(?:[A-Za-z0-9-]+\.)*[A-Za-z0-9-]{1,63}\.[A-Za-z]{2,63}/\S*', message.content).group(0)
             if not url_match:
                 await channel.send("Nie znaleziono poprawnego linku w odpowiedzi.")
                 return
@@ -91,10 +92,12 @@ class Jarvis(commands.Cog):
                     elif response["type"] == "file":
                         file_data = response["content"]
                         await channel.send("wysyłon:", file=discord.File(file_data))
+                        os.remove(response["temp_dir"])
                 else:
                     logger.error(f"Error: {response['content']}")
                     if 'details' in response:
                         logger.error(f"Details: {response['details']}")
+                    os.remove(response["temp_dir"])
 
             elif action == "compress":
                 pass