Update app.py

app.py

@@ -1,221 +1,52 @@
-import os, re, uuid, threading, time, subprocess, shutil
+import os, re, uuid, threading, time, subprocess
 from pathlib import Path
 from flask import Flask, request, jsonify, send_from_directory, Response
 
-BASE_DIR    = Path(__file__).parent
+BASE_DIR = Path(__file__).parent
 COOKIES_FILE = str(BASE_DIR / 'm_youtube_com_cookies.txt')
-OUTPUT_DIR  = BASE_DIR / 'outputs'
+OUTPUT_DIR = BASE_DIR / 'outputs'
 OUTPUT_DIR.mkdir(exist_ok=True)
 
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 10 * 1024 * 1024
 
-# ── Per-job progress store ──
-job_progress = {}   # tid → {pct, msg, done, error, files}
-_prog_lock = threading.Lock()
-
-def set_prog(tid, pct, msg, **extra):
-    with _prog_lock:
-        job_progress[tid] = {'pct': pct, 'msg': msg, **extra}
-
-# ── Quality → yt-dlp format string ──
+# Quality formats
 QUALITY_FMT = {
-    '1080': (
-        'bestvideo[height<=1080][ext=mp4]+bestaudio[ext=m4a]'
-        '/bestvideo[height<=1080]+bestaudio'
-        '/best[height<=1080]'
-        '/best'
-    ),
-    '720': (
-        'bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]'
-        '/bestvideo[height<=720]+bestaudio'
-        '/best[height<=720]'
-        '/best'
-    ),
-    '480': (
-        'bestvideo[height<=480][ext=mp4]+bestaudio[ext=m4a]'
-        '/best[height<=480]'
-        '/best'
-    ),
-    '360': (
-        'best[height<=360]'
-        '/worst'
-    ),
-    'audio': 'bestaudio[ext=m4a]/bestaudio',
+    '720': 'bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]/best[height<=720]/best',
+    '480': 'best[height<=480]/best',
+    '360': 'best[height<=360]/best',
 }
 
-def ytdlp_download(out_tmpl, video_url, quality='720', timeout=1200):
-    """
-    yt-dlp download — platform-aware, cookies, quality selector, audio-only support.
-    Extracted and extended from Recap Studio app.py.
-    """
-    url_lower = video_url.lower()
-    is_tiktok    = 'tiktok.com'    in url_lower
-    is_facebook  = 'facebook.com'  in url_lower or 'fb.watch' in url_lower
-    is_instagram = 'instagram.com' in url_lower
-
+def ytdlp_download(out_path, url, quality='720'):
     fmt = QUALITY_FMT.get(quality, QUALITY_FMT['720'])
-
-    # Social platforms — simpler format, no mp4+m4a merge required
-    if (is_tiktok or is_facebook or is_instagram) and quality != 'audio':
-        h = {'1080':'1080','720':'720','480':'480','360':'360'}.get(quality,'720')
-        fmt = (
-            f'bestvideo[height<={h}]+bestaudio'
-            f'/best[height<={h}]'
-            '/best'
-        )
-
-    ext = 'mp3' if quality == 'audio' else 'mp4'
-
-    cmd = [
-        'yt-dlp',
-        '--no-playlist',
-        '-f', fmt,
-        '--merge-output-format', ext,
-        '--no-check-certificates',
-        '--no-warnings',
-    ]
-
-    # Audio-only: extract + convert to mp3
-    if quality == 'audio':
-        cmd += [
-            '-x', '--audio-format', 'mp3',
-            '--audio-quality', '0',
-        ]
-
+    cmd = ['yt-dlp', '-f', fmt, '--merge-output-format', 'mp4', '-o', out_path, url]
     if os.path.exists(COOKIES_FILE):
         cmd += ['--cookies', COOKIES_FILE]
-
-    cmd += ['-o', out_tmpl, video_url]
-    print(f'[ytdlp] {" ".join(cmd)}')
-    subprocess.run(cmd, check=True, timeout=timeout)
-
-def get_video_info(url):
-    """Fetch title, thumbnail, duration via yt-dlp --dump-json (no download)."""
-    cmd = [
-        'yt-dlp',
-        '--no-playlist',
-        '--dump-json',
-        '--no-check-certificates',
-        '--no-warnings',
-    ]
-    if os.path.exists(COOKIES_FILE):
-        cmd += ['--cookies', COOKIES_FILE]
-    cmd.append(url)
-    result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
-    if result.returncode != 0:
-        raise RuntimeError(result.stderr.strip() or 'yt-dlp info fetch failed')
-    import json
-    data = json.loads(result.stdout)
-    return {
-        'title':     data.get('title', 'Unknown'),
-        'thumbnail': data.get('thumbnail', ''),
-        'duration':  data.get('duration', 0),
-        'uploader':  data.get('uploader', ''),
-        'view_count': data.get('view_count', 0),
-    }
-
-# ── Routes ──
+    subprocess.run(cmd, check=True, timeout=300)
 
 @app.route('/')
 def index():
-    return send_from_directory('.', 'index.html')
-
-@app.route('/outputs/<path:fname>')
-def serve_output(fname):
-    return send_from_directory(str(OUTPUT_DIR), fname)
-
-@app.route('/api/info', methods=['POST'])
-def api_info():
-    """Fetch video metadata without downloading."""
-    data = request.get_json(force=True) or {}
-    url  = (data.get('url') or '').strip()
-    if not url:
-        return jsonify(ok=False, msg='URL မပေးရသေး')
-    try:
-        info = get_video_info(url)
-        return jsonify(ok=True, **info)
-    except Exception as e:
-        return jsonify(ok=False, msg=str(e))
+    return "YouTube Downloader & Auto Poster is running!"
 
 @app.route('/api/download', methods=['POST'])
 def api_download():
-    """Start background download job."""
-    data    = request.get_json(force=True) or {}
-    url     = (data.get('url') or '').strip()
-    quality = (data.get('quality') or '720').strip()
-
+    data = request.get_json() or {}
+    url = data.get('url', '').strip()
+    quality = data.get('quality', '720')
+    
     if not url:
-        return jsonify(ok=False, msg='URL မပေးရသေး')
-    if quality not in QUALITY_FMT:
-        return jsonify(ok=False, msg=f'Quality မမှန်: {quality}')
-
-    tid    = uuid.uuid4().hex[:12]
-    ext    = 'mp3' if quality == 'audio' else 'mp4'
-    out_fn = f'dl_{tid}.{ext}'
-    out_tmpl = str(OUTPUT_DIR / out_fn)
-
-    set_prog(tid, 0, '⏳ Download စတင်နေသည်…')
-
+        return jsonify(ok=False, msg='No URL')
+    
+    tid = uuid.uuid4().hex[:8]
+    out_path = str(OUTPUT_DIR / f'{tid}.mp4')
+    
     def _bg():
         try:
-            set_prog(tid, 10, '⬇️ Downloading…')
-            ytdlp_download(out_tmpl, url, quality=quality)
-
-            # yt-dlp may produce dl_tid.mp4, dl_tid.webm, dl_tid.mkv etc.
-            # Find the actual output file
-            candidates = list(OUTPUT_DIR.glob(f'dl_{tid}.*'))
-            if not candidates:
-                raise FileNotFoundError('Output file not found after download')
-
-            out_file = candidates[0]
-            file_size = out_file.stat().st_size
-
-            set_prog(tid, 100,
-                     f'✅ Download ပြီးပါပြီ!',
-                     done=True,
-                     file_url=f'/outputs/{out_file.name}',
-                     file_name=out_file.name,
-                     file_size=file_size,
-                     quality=quality)
+            ytdlp_download(out_path, url, quality)
         except Exception as e:
-            import traceback; traceback.print_exc()
-            set_prog(tid, 0, f'❌ {e}', error=True)
-
-    threading.Thread(target=_bg, daemon=True).start()
-    return jsonify(ok=True, tid=tid)
-
-@app.route('/api/progress/<tid>')
-def api_progress(tid):
-    """SSE stream for job progress."""
-    def _stream():
-        last = None
-        for _ in range(600):   # 10 min max
-            with _prog_lock:
-                state = dict(job_progress.get(tid, {'pct': 0, 'msg': '…'}))
-            if state != last:
-                import json
-                yield f'data: {json.dumps(state)}\n\n'
-                last = dict(state)
-            if state.get('done') or state.get('error'):
-                break
-            time.sleep(0.5)
-    return Response(_stream(), mimetype='text/event-stream',
-                    headers={'Cache-Control': 'no-cache', 'X-Accel-Buffering': 'no'})
-
-# ── Auto cleanup outputs older than 2 hours ──
-def _cleanup_loop():
-    while True:
-        time.sleep(1800)
-        now = time.time()
-        for fp in OUTPUT_DIR.glob('dl_*'):
-            try:
-                if now - fp.stat().st_mtime > 7200:
-                    fp.unlink(missing_ok=True)
-            except:
-                pass
-
-threading.Thread(target=_cleanup_loop, daemon=True).start()
+            print(f"Error: {e}")
+    
+    threading.Thread(target=_bg).start()
+    return jsonify(ok=True, tid=tid, msg='Download started')
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)
+    app.run(host='0.0.0.0', port=7860)