Update srv.py

srv.py

@@ -10,14 +10,11 @@
 ------------------------------------------------------------
 """
 
-import os
-import tempfile
-import uuid
-from flask import Flask, request, jsonify, send_file ,render_template
+from flask import Flask, request, jsonify, send_file, render_template
 from yt_dlp import YoutubeDL
+import os
 
 app = Flask(__name__)
-DOWNLOAD_FOLDER = tempfile.gettempdir()
 
 @app.route('/')
 def home():
@@ -48,49 +45,38 @@ def get_info():
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
-
-
 @app.route('/download', methods=['POST'])
 def download_media():
     data = request.json
     url = data.get('url')
-    format_type = data.get('format_type', 'mp3')
-    quality = data.get('quality', 'best')
+    format_type = data.get('format_type', 'mp3') 
+    quality = str(data.get('quality', 'best'))  
 
     if not url:
         return jsonify({'error': 'URL is required'}), 400
 
     try:
-        unique_id = str(uuid.uuid4())
-        file_ext = "mp3" if format_type == "mp3" else "mp4"
-        file_name = os.path.join(DOWNLOAD_FOLDER, f"{unique_id}.{file_ext}")
-
         if format_type == 'mp4':
             quality_map = {
-                '144': 'bv*[height=144]+ba/b[height=144]',
-                '240': 'bv*[height=240]+ba/b[height=240]',
-                '360': 'bv*[height=360]+ba/b[height=360]',
-                '480': 'bv*[height=480]+ba/b[height=480]',
-                '720': 'bv*[height=720]+ba/b[height=720]',
-                '1080': 'bv*[height=1080]+ba/b[height=1080]',
-                'best': 'bv+ba/bestvideo+bestaudio/best'
+                '144': 'bv*[height=144][ext=mp4]+ba[ext=m4a]/b[height=144][ext=mp4]',
+                '240': 'bv*[height=240][ext=mp4]+ba[ext=m4a]/b[height=240][ext=mp4]',
+                '360': 'bv*[height=360][ext=mp4]+ba[ext=m4a]/b[height=360][ext=mp4]',
+                '480': 'bv*[height=480][ext=mp4]+ba[ext=m4a]/b[height=480][ext=mp4]',
+                '720': 'bv*[height=720][ext=mp4]+ba[ext=m4a]/b[height=720][ext=mp4]',
+                '1080': 'bv*[height=1080][ext=mp4]+ba[ext=m4a]/b[height=1080][ext=mp4]',
+                'best': 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4]'  
             }
+
             ydl_opts = {
-                'format': quality_map.get(quality, 'best'),
-                'outtmpl': file_name,
-                'noprogress': True,
+                'format': quality_map.get(quality, quality_map['best']),
                 'merge_output_format': 'mp4',
-                'nocheckcertificate': True,
-                'external_downloader': 'aria2c',
+                'outtmpl': '%(title)s.%(ext)s',
                 'cookiefile': 'www.youtube.com_cookies.txt'
             }
-        else:
+        else: 
             ydl_opts = {
-                'format': 'bestaudio',
-                'outtmpl': file_name,
-                'noprogress': True,
-                'nocheckcertificate': True,
-                'external_downloader': 'aria2c',
+                  'format': 'bestaudio',
+                'outtmpl': '%(title)s.%(ext)s',
                 'cookiefile': 'www.youtube.com_cookies.txt',
                 'postprocessors': [{
                     'key': 'FFmpegExtractAudio',
@@ -98,18 +84,23 @@ def download_media():
                     'preferredquality': '64',
                 }],
             }
-
         with YoutubeDL(ydl_opts) as ydl:
-            ydl.extract_info(url, download=True)
+            info = ydl.extract_info(url, download=True)
+            file_ext = "mp4" if format_type == "mp4" else "mp3"
+            file_name = ydl.prepare_filename(info).rsplit(".", 1)[0] + f".{file_ext}"
 
-        return send_file(file_name, as_attachment=True, download_name=os.path.basename(file_name))
+        return send_file(
+            file_name,
+            as_attachment=True,
+            download_name=os.path.basename(file_name)
+        )
 
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
     finally:
-        if os.path.exists(file_name):
+        if 'file_name' in locals() and os.path.exists(file_name):
             os.remove(file_name)
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860, debug=True, threaded=True)
+    app.run(host='0.0.0.0', port=7860, debug=True ,threaded=True)