Update app.py

app.py

@@ -54,6 +54,10 @@ def get_tiktok_cookies():
 def get_tiktok_sessionid():
     return get_tiktok_cookies().get('sessionid')
 
+def _is_netscape_cookies(content):
+    """Check if cookies.txt is already in Netscape format"""
+    return '# Netscape' in content or '\tTRUE\t' in content or '\tFALSE\t' in content
+
 def _cookies_to_netscape(cookie_dict, out_path):
     """Write Netscape cookies.txt format that tiktok-uploader accepts"""
     lines = ['# Netscape HTTP Cookie File']
@@ -62,22 +66,47 @@ def _cookies_to_netscape(cookie_dict, out_path):
     Path(out_path).write_text('\n'.join(lines))
 
 def upload_to_tiktok(video_path, title):
-    cookies = get_tiktok_cookies()
-    sessionid = cookies.get('sessionid')
-    if not sessionid:
-        add_log('❌ sessionid not found in cookies.txt')
+    # Read raw cookies.txt
+    try:
+        raw_content = open(TIKTOK_COOKIE_FILE, 'r').read().strip()
+    except Exception as e:
+        add_log(f'❌ Cookie read error: {e}')
         return False
 
+    # Auto-detect format
+    if _is_netscape_cookies(raw_content):
+        # Already Netscape format — use directly
+        add_log('🍪 Netscape format cookies detected — using directly')
+        tmp_cookies = TIKTOK_COOKIE_FILE
+        # Extract sessionid for validation
+        sessionid = None
+        for line in raw_content.splitlines():
+            parts = line.split('\t')
+            if len(parts) >= 7 and parts[5] == 'sessionid':
+                sessionid = parts[6]
+                break
+        if not sessionid:
+            add_log('❌ sessionid not found in Netscape cookies')
+            return False
+    else:
+        # One-line format — convert to Netscape
+        add_log('🍪 One-line cookies detected — converting to Netscape format')
+        cookies = parse_cookies_string(raw_content)
+        sessionid = cookies.get('sessionid')
+        if not sessionid:
+            add_log('❌ sessionid not found in cookies.txt')
+            return False
+        tmp_cookies = str(OUTPUT_DIR / f'_tkcookies_{uuid.uuid4().hex[:6]}.txt')
+        try:
+            _cookies_to_netscape(cookies, tmp_cookies)
+        except Exception as e:
+            add_log(f'❌ Cookie write error: {e}')
+            return False
+
     add_log(f'📤 Uploading via browser automation: {title[:50]}...')
+    add_log(f'🔧 sessionid len: {len(sessionid)} | video size: {os.path.getsize(video_path)} bytes')
     caption = f"{title} #movierecap #myanmar #fyp #viral"
-
-    # Write temp Netscape cookies file
-    tmp_cookies = str(OUTPUT_DIR / f'_tkcookies_{uuid.uuid4().hex[:6]}.txt')
-    try:
-        _cookies_to_netscape(cookies, tmp_cookies)
-    except Exception as e:
-        add_log(f'❌ Cookie write error: {e}')
-        return False
+    is_temp = tmp_cookies != TIKTOK_COOKIE_FILE
 
     result_box = [None]
 
@@ -102,10 +131,11 @@ def upload_to_tiktok(video_path, title):
 
     t = threading.Thread(target=_do_upload, daemon=True)
     t.start()
-    t.join(timeout=180)  # max 3 min
+    t.join(timeout=180)
 
-    try: os.remove(tmp_cookies)
-    except: pass
+    if is_temp:
+        try: os.remove(tmp_cookies)
+        except: pass
 
     if t.is_alive():
         add_log('❌ Upload timed out after 3 minutes')