Update app.py

app.py

@@ -1,245 +1,216 @@
-import os, re, uuid, threading, time, subprocess, json
+import os, uuid, threading, time, subprocess, json, requests
 from pathlib import Path
 from datetime import datetime
-from flask import Flask, request, jsonify, send_from_directory, Response, render_template_string
+from flask import Flask, request, jsonify, send_from_directory, render_template_string
 
 BASE_DIR = Path(__file__).parent
 COOKIES_FILE = str(BASE_DIR / 'm_youtube_com_cookies.txt')
+TIKTOK_COOKIE_FILE = str(BASE_DIR / 'cookies.txt')
 OUTPUT_DIR = BASE_DIR / 'outputs'
 OUTPUT_DIR.mkdir(exist_ok=True)
 
 app = Flask(__name__)
-app.config['MAX_CONTENT_LENGTH'] = 10 * 1024 * 1024
 
-# ── Global variables for bot control ──
+# ── Global variables ──
 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}')
+    print(msg)
+
+def get_tiktok_sessionid():
+    try:
+        content = open(TIKTOK_COOKIE_FILE, 'r').read()
+        for part in content.replace('\n', ';').split(';'):
+            if part.strip().startswith('sessionid='):
+                return part.split('=', 1)[1]
+    except:
+        return None
+    return None
 
-def ytdlp_download(out_path, url, quality='720'):
-    """Download video using yt-dlp"""
-    add_log(f'Downloading: {url[:80]}...')
+def upload_to_tiktok(video_path, title):
+    sessionid = get_tiktok_sessionid()
+    if not sessionid:
+        add_log('❌ TikTok sessionid not found')
+        return False
     
-    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]
+    add_log(f'📤 Uploading: {title[:50]}...')
     
-    if os.path.exists(COOKIES_FILE):
-        cmd += ['--cookies', COOKIES_FILE]
-        add_log('Using YouTube cookies')
+    url = 'https://www.tiktok.com/api/v1/video/upload/'
+    headers = {'User-Agent': 'Mozilla/5.0', 'Cookie': f'sessionid={sessionid}'}
+    caption = f"{title}\n#movierecap #myanmar #fyp #viral"
     
-    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]}')
+    try:
+        with open(video_path, 'rb') as f:
+            files = {'video': ('video.mp4', f, 'video/mp4')}
+            data = {'caption': caption}
+            response = requests.post(url, headers=headers, data=data, files=files, timeout=120)
+            if response.status_code == 200 and response.json().get('status_code') == 0:
+                add_log('✅ Upload success!')
+                return True
+            else:
+                add_log(f'❌ Upload failed: {response.text[:100]}')
+                return False
+    except Exception as e:
+        add_log(f'❌ Error: {e}')
         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]
-    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
+def download_video(url, quality='720'):
+    tid = uuid.uuid4().hex[:8]
+    out_path = OUTPUT_DIR / f'{tid}.mp4'
     
-    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)
+    fmt_map = {'1080': 'best[height<=1080]', '720': 'best[height<=720]', '480': 'best[height<=480]'}
+    fmt = fmt_map.get(quality, 'best[height<=720]')
     
-    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'}
+    cmd = ['yt-dlp', '-f', fmt, '--merge-output-format', 'mp4', '-o', str(out_path), url]
+    if os.path.exists(COOKIES_FILE):
+        cmd += ['--cookies', COOKIES_FILE]
     
-    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'}
+    add_log(f'📥 Downloading: {url[:60]}...')
+    result = subprocess.run(cmd, capture_output=True, text=True)
     
-    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)
-    }
+    if result.returncode == 0 and out_path.exists():
+        add_log(f'✅ Downloaded: {out_path.name}')
+        return str(out_path)
+    else:
+        add_log(f'❌ Download failed: {result.stderr[:100]}')
+        return None
 
 # ── Routes ──
 @app.route('/')
 def index():
     return render_template_string(HTML_TEMPLATE)
 
-@app.route('/api/info', methods=['POST'])
-def api_info():
+@app.route('/api/upload/manual', methods=['POST'])
+def api_upload_manual():
+    """Manual upload - provide video URL and title"""
     data = request.get_json() or {}
-    url = data.get('url', '').strip()
-    if not url:
+    video_url = data.get('url', '').strip()
+    title = data.get('title', '').strip()
+    quality = data.get('quality', '720')
+    
+    if not video_url:
         return jsonify({'ok': False, 'msg': 'No URL provided'})
+    if not title:
+        return jsonify({'ok': False, 'msg': 'No title provided'})
+    
+    # Download first
+    video_path = download_video(video_url, quality)
+    if not video_path:
+        return jsonify({'ok': False, 'msg': 'Download failed'})
+    
+    # Then upload to TikTok
+    success = upload_to_tiktok(video_path, title)
+    
+    # Cleanup
     try:
-        info = get_video_info(url)
-        return jsonify({'ok': True, **info})
-    except Exception as e:
-        return jsonify({'ok': False, 'msg': str(e)})
+        os.remove(video_path)
+    except:
+        pass
+    
+    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed'})
 
-@app.route('/api/download', methods=['POST'])
-def api_download():
-    data = request.get_json() or {}
-    url = data.get('url', '').strip()
-    quality = data.get('quality', '720')
+@app.route('/api/upload/file', methods=['POST'])
+def api_upload_file():
+    """Manual upload - directly upload video file"""
+    if 'video' not in request.files:
+        return jsonify({'ok': False, 'msg': 'No video file'})
     
-    if not url:
-        return jsonify({'ok': False, 'msg': 'No URL provided'})
+    video = request.files['video']
+    title = request.form.get('title', 'Video')
     
-    tid = uuid.uuid4().hex[:8]
-    ext = 'mp3' if quality == 'audio' else 'mp4'
-    out_path = str(OUTPUT_DIR / f'dl_{tid}.{ext}')
+    # Save temp file
+    temp_path = OUTPUT_DIR / f'temp_{uuid.uuid4().hex[:8]}.mp4'
+    video.save(str(temp_path))
     
-    def _bg():
-        ytdlp_download(out_path, url, quality)
+    # Upload to TikTok
+    success = upload_to_tiktok(str(temp_path), title)
     
-    threading.Thread(target=_bg).start()
-    return jsonify({'ok': True, 'tid': tid, 'msg': 'Download started'})
+    # Cleanup
+    try:
+        temp_path.unlink()
+    except:
+        pass
+    
+    return jsonify({'ok': success, 'msg': 'Upload completed' if success else 'Upload failed'})
 
 @app.route('/api/bot/start', methods=['POST'])
 def api_bot_start():
-    return jsonify(start_bot())
+    global bot_thread, bot_running
+    if bot_running:
+        return jsonify({'ok': False, 'msg': 'Bot already running'})
+    bot_running = True
+    bot_thread = threading.Thread(target=auto_poster_worker, daemon=True)
+    bot_thread.start()
+    add_log('▶️ Bot started')
+    return jsonify({'ok': True, 'msg': 'Bot started'})
 
 @app.route('/api/bot/stop', methods=['POST'])
 def api_bot_stop():
-    return jsonify(stop_bot())
+    global bot_running
+    bot_running = False
+    add_log('⏹️ Bot stopped')
+    return jsonify({'ok': True, 'msg': 'Bot stopped'})
 
 @app.route('/api/bot/status', methods=['GET'])
 def api_bot_status():
-    return jsonify(get_bot_status())
+    return jsonify({'running': bot_running, 'logs': bot_logs[-50:], 'tiktok_cookie': get_tiktok_sessionid() is not None})
 
-@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)
+def auto_poster_worker():
+    global bot_running
+    add_log('🤖 Auto Poster started')
+    CHANNEL_ID = 'UCUZHFZ9jIKrLroW8LcyJEQQ'
+    last_id = None
+    
+    while bot_running:
+        try:
+            import feedparser
+            url = f'https://www.youtube.com/feeds/videos.xml?channel_id={CHANNEL_ID}'
+            feed = feedparser.parse(url)
+            
+            if feed.entries:
+                latest = feed.entries[0]
+                video_id = latest.get('yt_videoid', '')
+                title = latest.get('title', '')
+                
+                if last_id is None:
+                    last_id = video_id
+                    add_log(f'📌 Initialized: {video_id}')
+                elif video_id != last_id:
+                    add_log(f'📹 New video: {title[:50]}')
+                    video_path = download_video(f'https://youtube.com/watch?v={video_id}', '720')
+                    if video_path:
+                        upload_to_tiktok(video_path, title)
+                        try: os.remove(video_path)
+                        except: pass
+                    last_id = video_id
+        except Exception as e:
+            add_log(f'⚠️ Error: {e}')
+        
+        for _ in range(300):
+            if not bot_running: break
+            time.sleep(1)
 
-# ── HTML Template ──
+# ── HTML Template with Manual Upload ──
 HTML_TEMPLATE = '''
 <!DOCTYPE html>
 <html>
 <head>
-    <title>YouTube Downloader + Auto Poster</title>
+    <title>YouTube to TikTok Bot</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; }
+        button.red { background: #aa0000; }
+        input, select, textarea { padding: 8px; margin: 5px 0; width: 100%; box-sizing: border-box; background: #222; color: #0f0; border: 1px solid #333; }
+        .log-box { height: 200px; 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; }
@@ -247,56 +218,55 @@ HTML_TEMPLATE = '''
     </style>
 </head>
 <body>
-    <h1>🎬 YouTube Downloader + Auto Poster Bot</h1>
+    <h1>🎬 YouTube to TikTok Bot</h1>
     
-    <!-- Bot Control -->
+    <!-- Auto 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>
+        <div id="status" class="status stopped">🔴 STOPPED</div>
+        <button onclick="startBot()">▶️ START</button>
+        <button class="red" onclick="stopBot()">⏹️ STOP</button>
+        <button onclick="refreshStatus()">🔄 Refresh</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 id="log" class="log-box"></div>
     </div>
     
-    <!-- Download -->
+    <!-- Manual Upload by URL -->
     <div class="card">
-        <h2>⬇️ Download Video</h2>
-        <input type="text" id="dl-url" placeholder="YouTube URL">
-        <select id="quality">
+        <h2>📤 Manual Upload (by URL)</h2>
+        <input type="text" id="manual-url" placeholder="YouTube URL">
+        <input type="text" id="manual-title" placeholder="Video Title">
+        <select id="manual-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>
+        <button onclick="manualUpload()">⬆️ Download & Upload</button>
+        <div id="manual-result"></div>
+    </div>
+    
+    <!-- Manual Upload by File -->
+    <div class="card">
+        <h2>📁 Manual Upload (by File)</h2>
+        <input type="file" id="file-input" accept="video/mp4">
+        <input type="text" id="file-title" placeholder="Video Title">
+        <button onclick="manualUploadFile()">⬆️ Upload File to TikTok</button>
+        <div id="file-result"></div>
     </div>
     
     <script>
         async function refreshStatus() {
             const res = await fetch('/api/bot/status');
             const data = await res.json();
-            const statusDiv = document.getElementById('bot-status');
+            const statusDiv = document.getElementById('status');
             if (data.running) {
                 statusDiv.className = 'status running';
-                statusDiv.innerHTML = '🟢 Bot is RUNNING';
+                statusDiv.innerHTML = '🟢 RUNNING';
             } else {
                 statusDiv.className = 'status stopped';
-                statusDiv.innerHTML = '🔴 Bot is STOPPED';
+                statusDiv.innerHTML = '🔴 STOPPED';
             }
-            document.getElementById('log-box').innerHTML = data.logs.map(l => `<div>${escapeHtml(l)}</div>`).join('');
+            document.getElementById('log').innerHTML = data.logs.map(l => `<div>${escapeHtml(l)}</div>`).join('');
         }
         
         async function startBot() {
@@ -313,29 +283,36 @@ HTML_TEMPLATE = '''
             refreshStatus();
         }
         
-        async function getInfo() {
-            const url = document.getElementById('info-url').value;
-            if (!url) { alert('Enter URL'); return; }
-            const res = await fetch('/api/info', {
+        async function manualUpload() {
+            const url = document.getElementById('manual-url').value;
+            const title = document.getElementById('manual-title').value;
+            const quality = document.getElementById('manual-quality').value;
+            if (!url || !title) { alert('Enter URL and Title'); return; }
+            
+            document.getElementById('manual-result').innerHTML = '⏳ Processing...';
+            const res = await fetch('/api/upload/manual', {
                 method: 'POST',
                 headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({url})
+                body: JSON.stringify({url, title, quality})
             });
             const data = await res.json();
-            document.getElementById('info-result').innerHTML = JSON.stringify(data, null, 2);
+            document.getElementById('manual-result').innerHTML = data.ok ? '✅ ' + data.msg : '❌ ' + data.msg;
+            refreshStatus();
         }
         
-        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})
-            });
+        async function manualUploadFile() {
+            const file = document.getElementById('file-input').files[0];
+            const title = document.getElementById('file-title').value;
+            if (!file || !title) { alert('Select file and enter title'); return; }
+            
+            const formData = new FormData();
+            formData.append('video', file);
+            formData.append('title', title);
+            
+            document.getElementById('file-result').innerHTML = '⏳ Uploading...';
+            const res = await fetch('/api/upload/file', {method: 'POST', body: formData});
             const data = await res.json();
-            document.getElementById('dl-result').innerHTML = JSON.stringify(data, null, 2);
+            document.getElementById('file-result').innerHTML = data.ok ? '✅ ' + data.msg : '❌ ' + data.msg;
             refreshStatus();
         }
         
@@ -353,4 +330,4 @@ HTML_TEMPLATE = '''
 '''
 
 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, debug=False)