Update app.py

app.py

@@ -1,66 +1,147 @@
-import os, time, threading, requests, json
+import os, json, requests, threading, queue
 import telebot
-from flask import Flask
+from telebot import types
 
-# --- الإعدادات ---
 BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN")
-TACHI_URL = "http://127.0.0.1:4567/api/v1"
+
+TACHI_URL = "http://127.0.0.1:4567"
+
 bot = telebot.TeleBot(BOT_TOKEN)
-app = Flask(__name__)
-
-# --- وظائف التفاعل مع Tachidesk ---
-
-def get_manga_id(query):
-    """البحث عن المانجا والحصول على الـ ID الخاص بها"""
-    params = {"query": query}
-    res = requests.get(f"{TACHI_URL}/search", params=params)
-    results = res.json()
-    return results[0]['id'] if results else None
-
-def get_chapter_pages(manga_id, chapter_num):
-    """جلب روابط الصور للفصل المحدد"""
-    # 1. جلب قائمة الفصول
-    chapters = requests.get(f"{TACH_URL}/manga/{manga_id}/chapters").json()
-    
-    # 2. البحث عن الفصل المطلوب (رقمياً)
-    chapter_id = None
-    for ch in chapters:
-        if str(chapter_num) in str(ch['chapterNumber']):
-            chapter_id = ch['id']
-            break
-    
-    if not chapter_id: return None
-
-    # 3. جلب الصور
-    pages = requests.get(f"{TACHI_URL}/chapter/{chapter_id}/pages").json()
-    return [p['url'] for p in pages]
-
-# --- أوامر البوت ---
 
+task_queue = queue.Queue()
+
+ARCHIVE_FILE = "archive.json"
+archive = json.load(open(ARCHIVE_FILE)) if os.path.exists(ARCHIVE_FILE) else {}
+
+# ================= SEARCH =================
+def search_manga(query):
+    url = f"{TACHI_URL}/api/v1/library/search?q={query}"
+    r = requests.get(url).json()
+    return r[:5]
+
+# ================= GET CHAPTERS =================
+def get_chapters(manga_id):
+    url = f"{TACHI_URL}/api/v1/manga/{manga_id}/chapters"
+    r = requests.get(url).json()
+    return r
+
+# ================= DOWNLOAD =================
+def get_pages(manga_id, chapter_id):
+    url = f"{TACHI_URL}/api/v1/manga/{manga_id}/chapter/{chapter_id}"
+    r = requests.get(url).json()
+    return r.get("pages", [])
+
+# ================= WORKER =================
+def worker():
+    while True:
+        task = task_queue.get()
+
+        chat = task["chat"]
+        pages = task["pages"]
+        key = task["key"]
+
+        if key in archive:
+            bot.send_message(chat, "📦 من الأرشيف")
+            bot.send_document(chat, archive[key])
+            continue
+
+        from PIL import Image
+        import io
+
+        imgs = []
+
+        for url in pages:
+            try:
+                r = requests.get(url, timeout=10)
+                img = Image.open(io.BytesIO(r.content)).convert("RGB")
+                imgs.append(img)
+            except:
+                pass
+
+        if not imgs:
+            bot.send_message(chat, "❌ فشل التحميل")
+            continue
+
+        filename = f"{key}.pdf"
+
+        imgs[0].save(filename, save_all=True, append_images=imgs[1:])
+
+        with open(filename, "rb") as f:
+            msg = bot.send_document(chat, f)
+            archive[key] = msg.document.file_id
+
+            json.dump(archive, open(ARCHIVE_FILE, "w"))
+
+        os.remove(filename)
+
+# ================= HANDLERS =================
 @bot.message_handler(commands=['start'])
-def send_welcome(message):
-    bot.reply_to(message, "أهلاً بك! أنا بوت مانهوا مدعوم بمحرك Tachidesk.\nأرسل اسم المانجا للبحث.")
+def start(msg):
+    bot.send_message(msg.chat.id, "🔥 اكتب اسم مانجا")
 
 @bot.message_handler(func=lambda m: True)
-def handle_search(message):
-    manga_name = message.text
-    bot.send_message(message.chat.id, f"🔍 جاري البحث عن {manga_name}...")
-    
-    m_id = get_manga_id(manga_name)
-    if m_id:
-        pages = get_chapter_pages(m_id, 1) # سحب الفصل الأول كمثال
-        if pages:
-            bot.send_message(message.chat.id, f"✅ تم العثور على {len(pages)} صفحة. جاري التحميل...")
-            # هنا يمكنك إرسال الصور أو تحويلها لـ PDF كما في كودك السابق
-        else:
-            bot.send_message(message.chat.id, "❌ لم أستطع جلب صفحات هذا الفصل.")
-    else:
-        bot.send_message(message.chat.id, "❌ لم يتم العثور على المانجا.")
-
-# تشغيل Flask للتوافق مع Hugging Face
-@app.route('/')
-def home(): return "Tachidesk Bot is Alive!"
+def handle(msg):
+    text = msg.text
+
+    results = search_manga(text)
+
+    if not results:
+        bot.send_message(msg.chat.id, "❌ ماكو نتائج")
+        return
+
+    markup = types.InlineKeyboardMarkup()
+
+    for r in results:
+        name = r.get("title", "Unknown")
+        mid = r.get("id")
+
+        markup.add(
+            types.InlineKeyboardButton(
+                name,
+                callback_data=f"manga|{mid}"
+            )
+        )
+
+    bot.send_message(msg.chat.id, "📚 اختر:", reply_markup=markup)
+
+@bot.callback_query_handler(func=lambda call: True)
+def callback(call):
+    if call.data.startswith("manga|"):
+        manga_id = call.data.split("|")[1]
+
+        chapters = get_chapters(manga_id)
+
+        markup = types.InlineKeyboardMarkup()
+
+        for ch in chapters[:20]:
+            cid = ch.get("id")
+            title = ch.get("title", "Chapter")
+
+            markup.add(
+                types.InlineKeyboardButton(
+                    title,
+                    callback_data=f"chapter|{manga_id}|{cid}"
+                )
+            )
+
+        bot.send_message(call.message.chat.id, "📖 اختر فصل:", reply_markup=markup)
+
+    elif call.data.startswith("chapter|"):
+        _, manga_id, chapter_id = call.data.split("|")
+
+        pages = get_pages(manga_id, chapter_id)
+
+        key = f"{manga_id}_{chapter_id}"
+
+        task_queue.put({
+            "chat": call.message.chat.id,
+            "pages": pages,
+            "key": key
+        })
+
+        bot.send_message(call.message.chat.id, "⏳ جاري التحميل")
 
+# ================= RUN =================
 if __name__ == "__main__":
-    threading.Thread(target=lambda: app.run(host="0.0.0.0", port=7860)).start()
+    threading.Thread(target=worker, daemon=True).start()
     bot.infinity_polling()