Update app.py

app.py

@@ -1,277 +1,59 @@
-# ═══════════════════════════════════════════════
-#  STEP 0: Health check ÖNCE başlasın
-# ═══════════════════════════════════════════════
 from http.server import HTTPServer, BaseHTTPRequestHandler
 import threading
 import logging
 import time
 
-logging.basicConfig(
-    format="%(asctime)s - %(levelname)s - %(message)s",
-    level=logging.INFO,
-)
+logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
-class HealthHandler(BaseHTTPRequestHandler):
+class H(BaseHTTPRequestHandler):
     def do_GET(self):
         self.send_response(200)
-        self.send_header("Content-Type", "text/plain")
         self.end_headers()
         self.wfile.write(b"OK")
-    def do_HEAD(self):
-        self.send_response(200)
-        self.end_headers()
-    def log_message(self, *args):
-        pass
-
-def _run_health():
-    s = HTTPServer(("0.0.0.0", 7860), HealthHandler)
-    s.serve_forever()
+    def log_message(self, *a): pass
 
-# HEMEN başlat - başka hiçbir şeyden önce
-_t = threading.Thread(target=_run_health, daemon=True)
-_t.start()
+threading.Thread(target=lambda: HTTPServer(("0.0.0.0", 7860), H).serve_forever(), daemon=True).start()
 time.sleep(0.5)
-logger.info("✅ Health check server ready on 7860")
-
-# ═══════════════════════════════════════════════
-#  STEP 1: Monkeypatch
-# ═══════════════════════════════════════════════
-import collections
-import collections.abc
-if not hasattr(collections, "Iterable"):
-    collections.Iterable = collections.abc.Iterable
-
-# ═══════════════════════════════════════════════
-#  STEP 2: Imports
-# ═══════════════════════════════════════════════
-import os
-import sys
-import tempfile
-import asyncio
-import traceback
-from datetime import datetime, timedelta
+logger.info("HEALTH OK")
 
+# === TEST: Import'ları tek tek dene ===
 try:
+    logger.info("importing collections...")
+    import collections, collections.abc
+    if not hasattr(collections, "Iterable"):
+        collections.Iterable = collections.abc.Iterable
+    logger.info("OK collections")
+
+    logger.info("importing pySmartDL...")
     from pySmartDL import SmartDL
+    logger.info("OK pySmartDL")
+
+    logger.info("importing pydrive2...")
     from pydrive2.auth import GoogleAuth
     from pydrive2.drive import GoogleDrive
-    from oauth2client.service_account import ServiceAccountCredentials
-    from telegram import Update
-    from telegram.ext import (
-        ApplicationBuilder,
-        CommandHandler,
-        MessageHandler,
-        filters,
-        ContextTypes,
-    )
-    from apscheduler.schedulers.asyncio import AsyncIOScheduler
-    logger.info("✅ All imports OK")
-except Exception as e:
-    logger.error(f"❌ Import failed: {e}")
-    traceback.print_exc()
-    # Ölme, health check çalışmaya devam etsin
-    while True:
-        time.sleep(3600)
-
-# ═══════════════════════════════════════════════
-#  STEP 3: Config
-# ═══════════════════════════════════════════════
-BOT_TOKEN = os.getenv("BOT_TOKEN")
-GDRIVE_SERVICE_ACCOUNT_JSON = os.getenv("GDRIVE_SERVICE_ACCOUNT_JSON")
-GDRIVE_FOLDER_ID = os.getenv("GDRIVE_FOLDER_ID")
-AUTHORIZED_USER_ID = os.getenv("AUTHORIZED_USER_ID")
-
-if AUTHORIZED_USER_ID:
-    try:
-        AUTHORIZED_USER_ID = int(AUTHORIZED_USER_ID)
-    except ValueError:
-        AUTHORIZED_USER_ID = None
-
-logger.info(f"BOT_TOKEN exists: {bool(BOT_TOKEN)}")
-logger.info(f"GDRIVE_JSON exists: {bool(GDRIVE_SERVICE_ACCOUNT_JSON)}")
-logger.info(f"FOLDER_ID exists: {bool(GDRIVE_FOLDER_ID)}")
-logger.info(f"AUTH_USER: {AUTHORIZED_USER_ID}")
-
-if not BOT_TOKEN:
-    logger.error("❌ BOT_TOKEN missing!")
-    while True:
-        time.sleep(3600)
-
-# ═══════════════════════════════════════════════
-#  STEP 4: Google Drive
-# ═══════════════════════════════════════════════
-drive_client = None
-
-def get_drive():
-    global drive_client
-    if not GDRIVE_SERVICE_ACCOUNT_JSON:
-        logger.warning("No GDRIVE_SERVICE_ACCOUNT_JSON")
-        return None
-    try:
-        with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
-            f.write(GDRIVE_SERVICE_ACCOUNT_JSON)
-            path = f.name
-        gauth = GoogleAuth()
-        gauth.auth_method = "service"
-        gauth.credentials = ServiceAccountCredentials.from_json_keyfile_name(
-            path, ["https://www.googleapis.com/auth/drive"]
-        )
-        drive_client = GoogleDrive(gauth)
-        os.unlink(path)
-        logger.info("✅ Google Drive OK")
-        return drive_client
-    except Exception as e:
-        logger.error(f"Drive auth error: {e}")
-        return None
-
-get_drive()
-
-# ═══════════════════════════════════════════════
-#  STEP 5: Helpers
-# ═══════════════════════════════════════════════
-def do_download(url, dest_dir):
-    os.makedirs(dest_dir, exist_ok=True)
-    obj = SmartDL(url, dest_dir, progress_bar=False, timeout=120)
-    obj.start()
-    return obj
-
-def do_upload(filepath, filename):
-    global drive_client
-    if not drive_client:
-        get_drive()
-    if not drive_client:
-        raise RuntimeError("No Drive client")
-    meta = {"title": filename}
-    if GDRIVE_FOLDER_ID:
-        meta["parents"] = [{"id": GDRIVE_FOLDER_ID}]
-    gf = drive_client.CreateFile(meta)
-    gf.SetContentFile(filepath)
-    gf.Upload()
-    return gf
-
-async def auto_delete(file_id):
-    try:
-        global drive_client
-        if not drive_client:
-            await asyncio.to_thread(get_drive)
-        if drive_client:
-            gf = await asyncio.to_thread(drive_client.CreateFile, {"id": file_id})
-            await asyncio.to_thread(gf.Delete)
-            logger.info(f"🗑 Deleted {file_id}")
-    except Exception as e:
-        logger.error(f"Delete error: {e}")
+    logger.info("OK pydrive2")
 
-# ═══════════════════════════════════════════════
-#  STEP 6: Bot Handlers
-# ═══════════════════════════════════════════════
-lock = None
-sched = None
-
-async def cmd_start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    if AUTHORIZED_USER_ID and update.effective_user.id != AUTHORIZED_USER_ID:
-        return
-    await update.message.reply_text("Merhaba! Link gönder, Drive'a yükleyeyim. 🚀")
-
-async def on_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    global lock, sched
-
-    if AUTHORIZED_USER_ID and update.effective_user.id != AUTHORIZED_USER_ID:
-        return
-
-    url = update.message.text.strip()
-    if not url.startswith(("http://", "https://")):
-        await update.message.reply_text("⛔ Geçersiz link.")
-        return
-
-    async with lock:
-        msg = await update.message.reply_text("⏳ Başlıyor...")
-        fp = None
-        try:
-            dest = os.path.join(os.getcwd(), "downloads")
-            await msg.edit_text("📥 İndiriliyor...")
-            obj = await asyncio.to_thread(do_download, url, dest)
-
-            if not obj.isSuccessful():
-                await msg.edit_text("❌ İndirme başarısız.")
-                return
-
-            fp = obj.get_dest()
-            fn = os.path.basename(fp)
-            sz = os.path.getsize(fp)
-
-            if sz > 5 * 1024**3:
-                await msg.edit_text(f"⚠️ Çok büyük: {sz/1024**3:.1f}GB. Max 5GB.")
-                os.remove(fp); fp = None
-                return
-
-            size_str = f"{sz/1024**2:.1f} MB" if sz > 1024**2 else f"{sz/1024:.1f} KB"
-            await msg.edit_text(f"✅ İndirildi: `{fn}` ({size_str})\n📤 Yükleniyor...", parse_mode="Markdown")
-
-            gf = await asyncio.to_thread(do_upload, fp, fn)
-            fid = gf["id"]
-            link = gf.get("alternateLink", f"https://drive.google.com/file/d/{fid}/view")
-
-            await msg.edit_text(
-                f"🚀 Tamam!\n📁 `{fn}`\n📦 {size_str}\n🔗 {link}\n⏱ 2 saat sonra silinecek.",
-                parse_mode="Markdown",
-            )
-
-            if fp and os.path.exists(fp):
-                os.remove(fp); fp = None
-
-            sched.add_job(auto_delete, "date",
-                          run_date=datetime.now() + timedelta(hours=2),
-                          args=[fid])
-
-        except Exception as e:
-            logger.error(f"Error: {e}", exc_info=True)
-            try:
-                await msg.edit_text(f"❌ Hata: `{e}`", parse_mode="Markdown")
-            except:
-                pass
-        finally:
-            if fp and os.path.exists(fp):
-                try: os.remove(fp)
-                except: pass
-
-# ═══════════════════════════════════════════════
-#  STEP 7: Main
-# ═══════════════════════════════════════════════
-def main():
-    global lock, sched
-
-    app = (
-        ApplicationBuilder()
-        .token(BOT_TOKEN)
-        .connect_timeout(30)
-        .read_timeout(30)
-        .write_timeout(30)
-        .build()
-    )
+    logger.info("importing oauth2client...")
+    from oauth2client.service_account import ServiceAccountCredentials
+    logger.info("OK oauth2client")
 
-    app.add_handler(CommandHandler("start", cmd_start))
-    app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, on_message))
+    logger.info("importing telegram...")
+    from telegram import Update
+    from telegram.ext import ApplicationBuilder, CommandHandler, MessageHandler, filters, ContextTypes
+    logger.info("OK telegram")
 
-    async def post_init(_):
-        global lock, sched
-        lock = asyncio.Lock()
-        sched = AsyncIOScheduler()
-        sched.start()
-        logger.info("✅ Bot fully ready")
+    logger.info("importing apscheduler...")
+    from apscheduler.schedulers.asyncio import AsyncIOScheduler
+    logger.info("OK apscheduler")
 
-    app.post_init = post_init
+    logger.info("✅ ALL IMPORTS DONE")
 
-    logger.info("🤖 Polling starting...")
-    app.run_polling(
-        allowed_updates=Update.ALL_TYPES,
-        drop_pending_updates=True,
-    )
+except Exception as e:
+    logger.error(f"❌ IMPORT FAILED: {e}")
+    import traceback
+    traceback.print_exc()
 
-if __name__ == "__main__":
-    try:
-        main()
-    except Exception as e:
-        logger.error(f"💀 Fatal: {e}", exc_info=True)
-        while True:
-            time.sleep(3600)
+# Ölme, health check yaşasın
+while True:
+    time.sleep(3600)