refactor: standardize string formatting and improve code readability
Some checks failed
Python syntax & lint / syntax-lint (push) Failing after 7s

This commit is contained in:
Space-Banane
2026-04-06 23:03:21 +02:00
parent e95f915d86
commit b817f34607
2 changed files with 106 additions and 70 deletions

View File

@@ -7,7 +7,7 @@ from flask import Flask, request, jsonify, Response, stream_with_context
from flask_cors import CORS
import time
app = Flask(__name__, static_folder='.', static_url_path='')
app = Flask(__name__, static_folder=".", static_url_path="")
CORS(app)
# Store active jobs: {job_id: {"lines": [], "done": bool, "error": bool}}
@@ -29,7 +29,7 @@ def run_ytdlp(job_id, cmd):
stderr=subprocess.STDOUT,
text=True,
bufsize=1,
cwd=DOWNLOAD_DIR
cwd=DOWNLOAD_DIR,
)
for line in process.stdout:
line = line.rstrip()
@@ -47,73 +47,79 @@ def run_ytdlp(job_id, cmd):
jobs[job_id]["error"] = True
@app.route('/')
@app.route("/")
def index():
return app.send_static_file('frontend.html')
return app.send_static_file("frontend.html")
@app.route('/api/info', methods=['POST'])
@app.route("/api/info", methods=["POST"])
def get_info():
data = request.json
url = data.get('url', '').strip()
cookies = data.get('cookies', '').strip()
url = data.get("url", "").strip()
cookies = data.get("cookies", "").strip()
if not url:
return jsonify({"error": "No URL provided"}), 400
cmd = [YTDLP_PATH, '--dump-json', '--no-playlist']
cmd = [YTDLP_PATH, "--dump-json", "--no-playlist"]
if cookies:
cmd += ['--cookies', cookies]
cmd += ['--extractor-args', 'generic:impersonate', url]
cmd += ["--cookies", cookies]
cmd += ["--extractor-args", "generic:impersonate", url]
try:
result = subprocess.run(cmd, capture_output=True, text=True, timeout=30, cwd=DOWNLOAD_DIR)
result = subprocess.run(
cmd, capture_output=True, text=True, timeout=30, cwd=DOWNLOAD_DIR
)
if result.returncode != 0:
return jsonify({"error": result.stderr or "Failed to fetch info"}), 400
info = json.loads(result.stdout)
formats = []
for f in info.get('formats', []):
formats.append({
"id": f.get('format_id'),
"ext": f.get('ext'),
"resolution": f.get('resolution') or f.get('format_note') or '',
"vcodec": f.get('vcodec', 'none'),
"acodec": f.get('acodec', 'none'),
"filesize": f.get('filesize') or f.get('filesize_approx'),
"tbr": f.get('tbr'),
"label": f.get('format'),
})
return jsonify({
"title": info.get('title', 'Unknown'),
"thumbnail": info.get('thumbnail'),
"duration": info.get('duration'),
"uploader": info.get('uploader'),
"formats": formats
})
for f in info.get("formats", []):
formats.append(
{
"id": f.get("format_id"),
"ext": f.get("ext"),
"resolution": f.get("resolution") or f.get("format_note") or "",
"vcodec": f.get("vcodec", "none"),
"acodec": f.get("acodec", "none"),
"filesize": f.get("filesize") or f.get("filesize_approx"),
"tbr": f.get("tbr"),
"label": f.get("format"),
}
)
return jsonify(
{
"title": info.get("title", "Unknown"),
"thumbnail": info.get("thumbnail"),
"duration": info.get("duration"),
"uploader": info.get("uploader"),
"formats": formats,
}
)
except subprocess.TimeoutExpired:
return jsonify({"error": "Timed out fetching video info"}), 408
except Exception as e:
return jsonify({"error": str(e)}), 500
@app.route('/api/download', methods=['POST'])
@app.route("/api/download", methods=["POST"])
def start_download():
data = request.json
url = data.get('url', '').strip()
format_id = data.get('format_id', '').strip()
cookies = data.get('cookies', '').strip()
extra_args = data.get('extra_args', '').strip()
url = data.get("url", "").strip()
format_id = data.get("format_id", "").strip()
cookies = data.get("cookies", "").strip()
extra_args = data.get("extra_args", "").strip()
if not url:
return jsonify({"error": "No URL provided"}), 400
cmd = [YTDLP_PATH]
if format_id:
cmd += ['-f', format_id]
cmd += ['--prefer-free-formats']
cmd += ["-f", format_id]
cmd += ["--prefer-free-formats"]
if cookies:
cmd += ['--cookies', cookies]
cmd += ['--extractor-args', 'generic:impersonate']
cmd += ["--cookies", cookies]
cmd += ["--extractor-args", "generic:impersonate"]
if extra_args:
cmd += extra_args.split()
cmd.append(url)
@@ -125,7 +131,7 @@ def start_download():
return jsonify({"job_id": job_id})
@app.route('/api/status/<job_id>')
@app.route("/api/status/<job_id>")
def job_status(job_id):
def generate():
sent = 0
@@ -135,20 +141,23 @@ def job_status(job_id):
if not job:
yield f"data: {json.dumps({'error': 'Job not found'})}\n\n"
break
lines = job['lines']
lines = job["lines"]
while sent < len(lines):
yield f"data: {json.dumps({'line': lines[sent]})}\n\n"
sent += 1
if job['done']:
if job["done"]:
yield f"data: {json.dumps({'done': True, 'error': job['error']})}\n\n"
break
time.sleep(0.2)
return Response(stream_with_context(generate()), mimetype='text/event-stream',
headers={'Cache-Control': 'no-cache', 'X-Accel-Buffering': 'no'})
return Response(
stream_with_context(generate()),
mimetype="text/event-stream",
headers={"Cache-Control": "no-cache", "X-Accel-Buffering": "no"},
)
if __name__ == '__main__':
if __name__ == "__main__":
print(f"[yt-dlp UI] Serving on http://localhost:5000")
print(f"[yt-dlp UI] Download directory: {DOWNLOAD_DIR}")
app.run(debug=False, host='0.0.0.0', port=5000, threaded=True)
app.run(debug=False, host="0.0.0.0", port=5000, threaded=True)