bulk upload

app/bot/handlers/admin.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from aiogram import F, Router
 from aiogram.filters import BaseFilter, Command, CommandObject
-from aiogram.types import Message
+from aiogram.types import Message, ReactionTypeEmoji
 from sqlalchemy import text
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -16,7 +16,7 @@ from app.db.models import User
 from app.db.repos import library as repo
 from app.db.repos import stats as stats_repo
 from app.services import engagement
-from app.services.ingest import parse_caption
+from app.services.ingest import KIND_ALIASES, clean_title, parse_caption
 
 log = logging.getLogger(__name__)
 
@@ -38,7 +38,10 @@ HELP = (
     "/courses : list courses with ids\n"
     "/stats : numbers\n"
     "/ping : measure database and Telegram speed\n\n"
-    "<b>Upload a file:</b> send it here with caption\n"
+    "<b>Bulk upload (easiest):</b>\n"
+    "<code>/upload 3 exam</code> then send or FORWARD many files (e.g. from your channel).\n"
+    "👍 = saved. Send /done when finished.\n\n"
+    "<b>Single file:</b> send it with caption\n"
     "<code>&lt;course_id&gt; &lt;slide|exam|note|book&gt; [title]</code>\n"
     "e.g. <code>3 exam Midterm 2017</code>"
 )
@@ -141,16 +144,59 @@ def _extract(message: Message) -> Optional[tuple[str, str, str, Optional[str]]]:
     return None
 
 
+# admin_id -> {"course_id": int, "kind": str, "saved": int, "dupes": int}
+_upload_mode: dict[int, dict] = {}
+
+
+@router.message(Command("upload"))
+async def upload_on(message: Message, command: CommandObject, session: AsyncSession) -> None:
+    parts = (command.args or "").split()
+    kind = KIND_ALIASES.get(parts[1].lower().lstrip("#")) if len(parts) == 2 else None
+    if len(parts) != 2 or not parts[0].isdigit() or not kind:
+        await message.answer("Usage: <code>/upload &lt;course_id&gt; &lt;slide|exam|note|book&gt;</code>\nSee /courses for ids.")
+        return
+    course = await repo.get_course(session, int(parts[0]))
+    if not course:
+        await message.answer(f"❗ No course with id {parts[0]}. See /courses")
+        return
+    _upload_mode[message.from_user.id] = {"course_id": course.id, "kind": kind, "saved": 0, "dupes": 0}
+    await message.answer(
+        f"📥 Upload mode <b>ON</b>: {course.name} · {kind}\n"
+        "Send or forward files now (many at once is fine). 👍 = saved.\n"
+        "Change course: send /upload again. Finish: /done"
+    )
+
+
+@router.message(Command("done"))
+async def upload_off(message: Message) -> None:
+    mode = _upload_mode.pop(message.from_user.id, None)
+    if not mode:
+        await message.answer("Upload mode was not on.")
+        return
+    await message.answer(f"✅ Done. Saved <b>{mode['saved']}</b> files, skipped {mode['dupes']} duplicates.")
+
+
+async def _ack(message: Message) -> None:
+    try:
+        await message.react([ReactionTypeEmoji(emoji="👍")])
+    except Exception:  # reactions unavailable in this chat/client: stay quiet
+        pass
+
+
 @router.message(F.chat.type == "private", F.document | F.video | F.audio | F.photo)
 async def ingest(message: Message, user: User, session: AsyncSession) -> None:
-    parsed = parse_caption(message.caption)
-    if not parsed:
+    parsed = parse_caption(message.caption)  # explicit caption wins
+    mode = _upload_mode.get(user.id)
+    if parsed:
+        course_id, kind, title = parsed
+    elif mode:
+        course_id, kind, title = mode["course_id"], mode["kind"], None
+    else:
         await message.answer(
-            "❗ Caption needed: <code>&lt;course_id&gt; &lt;" + "|".join(KINDS) + "&gt; [title]</code>\n"
-            "See /courses for ids."
+            "❗ Use <code>/upload &lt;course_id&gt; &lt;kind&gt;</code> for bulk upload, or send the file with caption\n"
+            "<code>&lt;course_id&gt; &lt;" + "|".join(KINDS) + "&gt; [title]</code>\nSee /courses for ids."
         )
         return
-    course_id, kind, title = parsed
     course = await repo.get_course(session, course_id)
     if not course:
         await message.answer(f"❗ No course with id {course_id}. See /courses")
@@ -158,7 +204,11 @@ async def ingest(message: Message, user: User, session: AsyncSession) -> None:
     file_type, file_id, unique_id, file_name = _extract(message)
     existing = await repo.find_by_unique_id(session, unique_id)
     if existing:
-        await message.answer(f"⚠️ Already saved as file #{existing.id}: {existing.title}")
+        if mode and not parsed:
+            mode["dupes"] += 1
+            await _ack(message)
+        else:
+            await message.answer(f"⚠️ Already saved as file #{existing.id}: {existing.title}")
         return
 
     backup_chat = backup_msg = None
@@ -174,7 +224,7 @@ async def ingest(message: Message, user: User, session: AsyncSession) -> None:
         session,
         course_id=course.id,
         kind=kind,
-        title=(title or file_name or f"{course.name} {kind}")[:250],
+        title=(title or clean_title(file_name, message.caption, f"{course.name} {kind}"))[:250],
         file_id=file_id,
         file_type=file_type,
         file_unique_id=unique_id,
@@ -182,5 +232,9 @@ async def ingest(message: Message, user: User, session: AsyncSession) -> None:
         library_chat_id=backup_chat,
         library_message_id=backup_msg,
     )
-    note = "" if backup_msg else " (no backup copy)"
-    await message.answer(f"✅ Saved #{material.id}: {material.title}\n📘 {course.name} · {kind}{note}")
+    if mode and not parsed:
+        mode["saved"] += 1
+        await _ack(message)
+    else:
+        note = "" if backup_msg else " (no backup copy)"
+        await message.answer(f"✅ Saved #{material.id}: {material.title}\n📘 {course.name} · {kind}{note}")

app/services/ingest.py

@@ -20,3 +20,14 @@ def parse_caption(caption: Optional[str]) -> Optional[tuple[int, str, Optional[s
         return None
     title = parts[2].strip() if len(parts) == 3 and parts[2].strip() else None
     return int(parts[0]), kind, title
+
+
+def clean_title(file_name: Optional[str], caption: Optional[str], fallback: str) -> str:
+    """Readable title for bulk uploads: file name without extension, else first caption line."""
+    import os
+
+    name = os.path.splitext(file_name)[0] if file_name else ""
+    name = name.replace("_", " ").strip()
+    if not name and caption:
+        name = caption.strip().split("\n")[0].strip()
+    return (name or fallback)[:250]

tests/test_logic.py

@@ -11,7 +11,7 @@ import asyncio  # noqa: E402
 from app.core import cache  # noqa: E402
 from app.core.aio import gather_results, gather_safe  # noqa: E402
 from app.services.engagement import DAILY_POINTS, MILESTONES, touch  # noqa: E402
-from app.services.ingest import parse_caption  # noqa: E402
+from app.services.ingest import clean_title, parse_caption  # noqa: E402
 
 
 def _user(**kw):
@@ -85,6 +85,12 @@ def test_plain_gather_fails_but_ours_works():
     asyncio.run(go())
 
 
+def test_clean_title():
+    assert clean_title("Math1003_Module_Final.pdf", None, "x") == "Math1003 Module Final"
+    assert clean_title(None, "Physics slides\n#physics", "x") == "Physics slides"
+    assert clean_title(None, None, "fallback") == "fallback"
+
+
 if __name__ == "__main__":
     for name, fn in list(globals().items()):
         if name.startswith("test_"):