queue management refactor, embrace celery and redis

routes/playlist.py

@@ -2,93 +2,37 @@ from flask import Blueprint, Response, request
 import os
 import json
 import traceback
-from routes.utils.queue import download_queue_manager, get_config_params
+from routes.utils.celery_queue_manager import download_queue_manager
 
 playlist_bp = Blueprint('playlist', __name__)
 
 @playlist_bp.route('/download', methods=['GET'])
 def handle_download():
     # Retrieve essential parameters from the request.
-    service = request.args.get('service')
     url = request.args.get('url')
-    
-    # Get common parameters from config
-    config_params = get_config_params()
-    
-    # Allow request parameters to override config values
-    main = request.args.get('main')
-    fallback = request.args.get('fallback')
-    quality = request.args.get('quality')
-    fall_quality = request.args.get('fall_quality')
-    real_time_arg = request.args.get('real_time')
-    custom_dir_format = request.args.get('custom_dir_format')
-    custom_track_format = request.args.get('custom_track_format')
-    pad_tracks_arg = request.args.get('tracknum_padding')
-    
-    # Use config values as defaults when parameters are not provided
-    if not main:
-        main = config_params['spotify'] if service == 'spotify' else config_params['deezer']
-    
-    if not fallback and config_params['fallback'] and service == 'spotify':
-        fallback = config_params['spotify']
-        
-    if not quality:
-        quality = config_params['spotifyQuality'] if service == 'spotify' else config_params['deezerQuality']
-        
-    if not fall_quality and fallback:
-        fall_quality = config_params['spotifyQuality']
-    
-    # Parse boolean parameters
-    real_time = real_time_arg.lower() in ['true', '1', 'yes'] if real_time_arg is not None else config_params['realTime']
-    pad_tracks = pad_tracks_arg.lower() in ['true', '1', 'yes'] if pad_tracks_arg is not None else config_params['tracknum_padding']
-    
-    # Use config values for formatting if not provided
-    if not custom_dir_format:
-        custom_dir_format = config_params['customDirFormat']
-    
-    if not custom_track_format:
-        custom_track_format = config_params['customTrackFormat']
+    name = request.args.get('name')
+    artist = request.args.get('artist')
     
     # Validate required parameters
-    if not all([service, url, main]):
+    if not url:
         return Response(
-            json.dumps({"error": "Missing parameters: service, url, or main account"}),
+            json.dumps({"error": "Missing required parameter: url"}),
             status=400,
             mimetype='application/json'
         )
     
-    # Sanitize main and fallback to prevent directory traversal.
-    if main:
-        main = os.path.basename(main)
-    if fallback:
-        fallback = os.path.basename(fallback)
-    
-    # Build the task dictionary.
-    # Note: the key "download_type" tells the queue handler which download function to call.
-    task = {
+    # Add the task to the queue with only essential parameters
+    # The queue manager will now handle all config parameters
+    task_id = download_queue_manager.add_task({
         "download_type": "playlist",
-        "service": service,
         "url": url,
-        "main": main,
-        "fallback": fallback,
-        "quality": quality,
-        "fall_quality": fall_quality,
-        "real_time": real_time,
-        "custom_dir_format": custom_dir_format,
-        "custom_track_format": custom_track_format,
-        "pad_tracks": pad_tracks,
-        "orig_request": request.args.to_dict(),
-        # If provided, these additional parameters can be used by your download function.
-        "type": "playlist",
-        "name": request.args.get('name'),
-        "artist": request.args.get('artist')
-    }
-    
-    # Add the task to the queue and get the generated process (prg) filename.
-    prg_filename = download_queue_manager.add_task(task)
+        "name": name,
+        "artist": artist,
+        "orig_request": request.args.to_dict()
+    })
     
     return Response(
-        json.dumps({"prg_file": prg_filename}),
+        json.dumps({"prg_file": task_id}),
         status=202,
         mimetype='application/json'
     )