Update app.py

app.py

@@ -1,6 +1,7 @@
-import os, re, uuid, threading, time, subprocess
+import os, re, uuid, threading, time, subprocess, json
 from pathlib import Path
-from flask import Flask, request, jsonify, send_from_directory, Response
+from datetime import datetime
+from flask import Flask, request, jsonify, send_from_directory, Response, render_template_string
 
 BASE_DIR = Path(__file__).parent
 COOKIES_FILE = str(BASE_DIR / 'm_youtube_com_cookies.txt')
@@ -8,24 +9,180 @@ OUTPUT_DIR = BASE_DIR / 'outputs'
 OUTPUT_DIR.mkdir(exist_ok=True)
 
 app = Flask(__name__)
+app.config['MAX_CONTENT_LENGTH'] = 10 * 1024 * 1024
 
-# Quality formats
+# ── Global variables for bot control ──
+bot_thread = None
+bot_running = False
+bot_logs = []
+log_lock = threading.Lock()
+
+# ── Quality formats ──
 QUALITY_FMT = {
+    '1080': 'bestvideo[height<=1080][ext=mp4]+bestaudio[ext=m4a]/best[height<=1080]/best',
     '720': 'bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]/best[height<=720]/best',
     '480': 'best[height<=480]/best',
     '360': 'best[height<=360]/best',
+    'audio': 'bestaudio[ext=m4a]/bestaudio',
 }
 
+def add_log(msg):
+    """Add timestamped message to debug log"""
+    with log_lock:
+        timestamp = datetime.now().strftime('%H:%M:%S')
+        bot_logs.append(f'[{timestamp}] {msg}')
+        if len(bot_logs) > 200:
+            bot_logs.pop(0)
+    print(f'[LOG] {msg}')
+
 def ytdlp_download(out_path, url, quality='720'):
-    fmt = QUALITY_FMT.get(quality, QUALITY_FMT['720'])
-    cmd = ['yt-dlp', '-f', fmt, '--merge-output-format', 'mp4', '-o', out_path, url]
+    """Download video using yt-dlp"""
+    add_log(f'Downloading: {url[:80]}...')
+    
+    if quality == 'audio':
+        fmt = 'bestaudio[ext=m4a]/bestaudio'
+        cmd = ['yt-dlp', '-f', fmt, '-x', '--audio-format', 'mp3', '-o', out_path, url]
+    else:
+        fmt = QUALITY_FMT.get(quality, QUALITY_FMT['720'])
+        cmd = ['yt-dlp', '-f', fmt, '--merge-output-format', 'mp4', '-o', out_path, url]
+    
+    if os.path.exists(COOKIES_FILE):
+        cmd += ['--cookies', COOKIES_FILE]
+        add_log('Using YouTube cookies')
+    
+    add_log(f'Running: {" ".join(cmd[:4])}...')
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=300)
+    
+    if result.returncode == 0:
+        add_log(f'✅ Download complete: {out_path}')
+        return True
+    else:
+        add_log(f'❌ Download failed: {result.stderr[:200]}')
+        return False
+
+def get_video_info(url):
+    """Get video metadata without downloading"""
+    add_log(f'Fetching info: {url[:80]}...')
+    cmd = ['yt-dlp', '--dump-json', '--no-playlist', '--no-warnings']
     if os.path.exists(COOKIES_FILE):
         cmd += ['--cookies', COOKIES_FILE]
-    subprocess.run(cmd, check=True, timeout=300)
+    cmd.append(url)
+    
+    result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
+    if result.returncode != 0:
+        raise Exception(result.stderr[:200])
+    
+    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),
+    }
+
+# ── Auto Poster Bot Functions ──
+def auto_poster_worker():
+    """Background worker for YouTube channel monitoring"""
+    global bot_running
+    add_log('🤖 Auto Poster Bot Started')
+    add_log(f'Monitoring channel: UCzHMxST9eZUo0XIaSyaTizA')
+    
+    last_video_id = None
+    check_count = 0
+    
+    while bot_running:
+        check_count += 1
+        add_log(f'🔍 Checking RSS feed... (#{check_count})')
+        
+        try:
+            import feedparser
+            rss_url = 'https://www.youtube.com/feeds/videos.xml?channel_id=UCzHMxST9eZUo0XIaSyaTizA'
+            feed = feedparser.parse(rss_url)
+            
+            if feed.entries:
+                latest = feed.entries[0]
+                video_id = latest.get('yt_videoid', '')
+                title = latest.get('title', 'No Title')
+                
+                if last_video_id is None:
+                    last_video_id = video_id
+                    add_log(f'📌 Initialized with last video: {video_id} - {title[:50]}')
+                elif video_id != last_video_id:
+                    add_log(f'📹 NEW VIDEO DETECTED! ID: {video_id}')
+                    add_log(f'📹 Title: {title}')
+                    add_log(f'📹 URL: https://youtube.com/watch?v={video_id}')
+                    
+                    # Download and process
+                    video_path = OUTPUT_DIR / f'{video_id}.mp4'
+                    if ytdlp_download(str(video_path), f'https://youtube.com/watch?v={video_id}', '720'):
+                        add_log(f'✅ Downloaded: {title[:50]}')
+                        # TODO: Add TikTok upload here
+                        add_log(f'📤 Would upload to TikTok here...')
+                    
+                    last_video_id = video_id
+                else:
+                    add_log(f'📭 No new videos (last: {last_video_id[:8]}...)')
+            else:
+                add_log('⚠️ No entries found in RSS feed')
+                
+        except Exception as e:
+            add_log(f'❌ RSS error: {str(e)[:100]}')
+        
+        # Wait 5 minutes
+        for _ in range(300):
+            if not bot_running:
+                break
+            time.sleep(1)
+    
+    add_log('🛑 Auto Poster Bot Stopped')
+
+def start_bot():
+    """Start the auto poster bot"""
+    global bot_thread, bot_running
+    if bot_running:
+        return {'ok': False, 'msg': 'Bot is already running'}
+    
+    bot_running = True
+    bot_thread = threading.Thread(target=auto_poster_worker, daemon=True)
+    bot_thread.start()
+    add_log('▶️ Bot started by user')
+    return {'ok': True, 'msg': 'Bot started'}
 
+def stop_bot():
+    """Stop the auto poster bot"""
+    global bot_running
+    if not bot_running:
+        return {'ok': False, 'msg': 'Bot is not running'}
+    
+    bot_running = False
+    add_log('⏹️ Bot stopped by user')
+    return {'ok': True, 'msg': 'Bot stopped'}
+
+def get_bot_status():
+    """Get current bot status"""
+    return {
+        'running': bot_running,
+        'logs': bot_logs[-50:],  # Last 50 logs
+        'log_count': len(bot_logs)
+    }
+
+# ── Routes ──
 @app.route('/')
 def index():
-    return "YouTube Downloader & Auto Poster is running!"
+    return render_template_string(HTML_TEMPLATE)
+
+@app.route('/api/info', methods=['POST'])
+def api_info():
+    data = request.get_json() or {}
+    url = data.get('url', '').strip()
+    if not url:
+        return jsonify({'ok': False, 'msg': 'No URL provided'})
+    try:
+        info = get_video_info(url)
+        return jsonify({'ok': True, **info})
+    except Exception as e:
+        return jsonify({'ok': False, 'msg': str(e)})
 
 @app.route('/api/download', methods=['POST'])
 def api_download():
@@ -34,19 +191,166 @@ def api_download():
     quality = data.get('quality', '720')
     
     if not url:
-        return jsonify(ok=False, msg='No URL')
+        return jsonify({'ok': False, 'msg': 'No URL provided'})
     
     tid = uuid.uuid4().hex[:8]
-    out_path = str(OUTPUT_DIR / f'{tid}.mp4')
+    ext = 'mp3' if quality == 'audio' else 'mp4'
+    out_path = str(OUTPUT_DIR / f'dl_{tid}.{ext}')
     
     def _bg():
-        try:
-            ytdlp_download(out_path, url, quality)
-        except Exception as e:
-            print(f"Error: {e}")
+        ytdlp_download(out_path, url, quality)
     
     threading.Thread(target=_bg).start()
-    return jsonify(ok=True, tid=tid, msg='Download started')
+    return jsonify({'ok': True, 'tid': tid, 'msg': 'Download started'})
+
+@app.route('/api/bot/start', methods=['POST'])
+def api_bot_start():
+    return jsonify(start_bot())
+
+@app.route('/api/bot/stop', methods=['POST'])
+def api_bot_stop():
+    return jsonify(stop_bot())
+
+@app.route('/api/bot/status', methods=['GET'])
+def api_bot_status():
+    return jsonify(get_bot_status())
+
+@app.route('/api/bot/logs', methods=['GET'])
+def api_bot_logs():
+    limit = request.args.get('limit', 50, type=int)
+    with log_lock:
+        return jsonify({'ok': True, 'logs': bot_logs[-limit:], 'total': len(bot_logs)})
+
+@app.route('/outputs/<path:fname>')
+def serve_output(fname):
+    return send_from_directory(str(OUTPUT_DIR), fname)
+
+# ── HTML Template ──
+HTML_TEMPLATE = '''
+<!DOCTYPE html>
+<html>
+<head>
+    <title>YouTube Downloader + Auto Poster</title>
+    <style>
+        body { font-family: monospace; max-width: 800px; margin: 0 auto; padding: 20px; background: #0a0a0a; color: #0f0; }
+        .card { background: #111; border: 1px solid #333; border-radius: 8px; padding: 16px; margin-bottom: 20px; }
+        button { background: #00aa00; color: black; border: none; padding: 8px 16px; cursor: pointer; margin-right: 8px; }
+        button.stop { background: #aa0000; }
+        button.danger { background: #aa0000; }
+        input, select { padding: 8px; margin: 5px 0; width: 100%; box-sizing: border-box; background: #222; color: #0f0; border: 1px solid #333; }
+        pre { background: #1a1a1a; padding: 10px; overflow-x: auto; font-size: 12px; border-radius: 4px; }
+        .log-box { height: 300px; overflow-y: scroll; background: #0a0a0a; border: 1px solid #333; padding: 10px; font-size: 11px; }
+        .status { padding: 8px; border-radius: 4px; margin-bottom: 10px; }
+        .status.running { background: #1a3a1a; color: #0f0; }
+        .status.stopped { background: #3a1a1a; color: #f00; }
+        hr { border-color: #333; }
+    </style>
+</head>
+<body>
+    <h1>🎬 YouTube Downloader + Auto Poster Bot</h1>
+    
+    <!-- Bot Control -->
+    <div class="card">
+        <h2>🤖 Auto Poster Bot</h2>
+        <div id="bot-status" class="status stopped">🔴 Bot is STOPPED</div>
+        <button id="start-btn" onclick="startBot()">▶️ START BOT</button>
+        <button id="stop-btn" class="stop" onclick="stopBot()">⏹️ STOP BOT</button>
+        <button onclick="refreshStatus()">🔄 Refresh Status</button>
+        <hr>
+        <h3>📜 Debug Log (Last 50 lines)</h3>
+        <div id="log-box" class="log-box"></div>
+    </div>
+    
+    <!-- Video Info -->
+    <div class="card">
+        <h2>📹 Video Info</h2>
+        <input type="text" id="info-url" placeholder="YouTube URL">
+        <button onclick="getInfo()">Get Info</button>
+        <pre id="info-result"></pre>
+    </div>
+    
+    <!-- Download -->
+    <div class="card">
+        <h2>⬇️ Download Video</h2>
+        <input type="text" id="dl-url" placeholder="YouTube URL">
+        <select id="quality">
+            <option value="1080">1080p</option>
+            <option value="720" selected>720p</option>
+            <option value="480">480p</option>
+            <option value="360">360p</option>
+            <option value="audio">MP3 Audio</option>
+        </select>
+        <button onclick="startDownload()">Download</button>
+        <pre id="dl-result"></pre>
+    </div>
+    
+    <script>
+        async function refreshStatus() {
+            const res = await fetch('/api/bot/status');
+            const data = await res.json();
+            const statusDiv = document.getElementById('bot-status');
+            if (data.running) {
+                statusDiv.className = 'status running';
+                statusDiv.innerHTML = '🟢 Bot is RUNNING';
+            } else {
+                statusDiv.className = 'status stopped';
+                statusDiv.innerHTML = '🔴 Bot is STOPPED';
+            }
+            document.getElementById('log-box').innerHTML = data.logs.map(l => `<div>${escapeHtml(l)}</div>`).join('');
+        }
+        
+        async function startBot() {
+            const res = await fetch('/api/bot/start', {method: 'POST'});
+            const data = await res.json();
+            alert(data.msg);
+            refreshStatus();
+        }
+        
+        async function stopBot() {
+            const res = await fetch('/api/bot/stop', {method: 'POST'});
+            const data = await res.json();
+            alert(data.msg);
+            refreshStatus();
+        }
+        
+        async function getInfo() {
+            const url = document.getElementById('info-url').value;
+            if (!url) { alert('Enter URL'); return; }
+            const res = await fetch('/api/info', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({url})
+            });
+            const data = await res.json();
+            document.getElementById('info-result').innerHTML = JSON.stringify(data, null, 2);
+        }
+        
+        async function startDownload() {
+            const url = document.getElementById('dl-url').value;
+            const quality = document.getElementById('quality').value;
+            if (!url) { alert('Enter URL'); return; }
+            const res = await fetch('/api/download', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({url, quality})
+            });
+            const data = await res.json();
+            document.getElementById('dl-result').innerHTML = JSON.stringify(data, null, 2);
+            refreshStatus();
+        }
+        
+        function escapeHtml(text) {
+            const div = document.createElement('div');
+            div.textContent = text;
+            return div.innerHTML;
+        }
+        
+        refreshStatus();
+        setInterval(refreshStatus, 5000);
+    </script>
+</body>
+</html>
+'''
 
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860)
+    app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)