Revert "Index stuff"

This reverts commit 969779a878fab17e2689543fe6421198e22b5c72.

backend/app.py

@@ -53,8 +53,6 @@ PAGE_SIZE = 60
 THUMB_MAX_AGE = 1800
 THUMB_DIR = Path(tempfile.gettempdir()) / "pixif2-thumbs"
 PAGE_URL_CACHE_MAX_AGE = 1800
-SCAN_LOOKUP_CHUNK = 500
-PROGRESS_MILESTONES = (25, 50, 75)
 
 app = FastAPI()
 ACTIVE_TASKS = {}
@@ -129,19 +127,13 @@ async def init_db():
             {
                 "sql": "CREATE TABLE IF NOT EXISTS pi_scans (post_id TEXT PRIMARY KEY, url TEXT, exif_type INTEGER)"
             },
-            {
-                "sql": "CREATE TABLE IF NOT EXISTS pi_search_posts (search_id TEXT NOT NULL, post_id TEXT NOT NULL, pos INTEGER NOT NULL, PRIMARY KEY (search_id, post_id))"
-            },
-            {
-                "sql": "CREATE INDEX IF NOT EXISTS pi_search_posts_search_pos_idx ON pi_search_posts (search_id, pos)"
-            },
-            {
-                "sql": "CREATE INDEX IF NOT EXISTS pi_search_posts_post_idx ON pi_search_posts (post_id)"
-            },
         ]
     )
     for sql in (
         "DROP INDEX IF EXISTS pi_searches_created_at_idx",
+        "DROP INDEX IF EXISTS pi_search_posts_search_pos_idx",
+        "DROP INDEX IF EXISTS pi_search_posts_post_idx",
+        "DROP TABLE IF EXISTS pi_search_posts",
         "ALTER TABLE pi_searches DROP COLUMN api_url",
         "ALTER TABLE pi_searches DROP COLUMN created_at",
     ):
@@ -171,38 +163,6 @@ async def discord_notify(msg):
         print(f"Discord webhook error: {repr(e)}")
 
 
-async def start_task(search_id, task_type, phase, total):
-    ACTIVE_TASKS[search_id] = {
-        "type": task_type,
-        "phase": phase,
-        "total": total,
-        "done": 0,
-        "sent": set(),
-    }
-    await discord_notify(f"`{search_id}` started")
-
-
-async def update_task(search_id, done=None, total=None, phase=None):
-    task = ACTIVE_TASKS.get(search_id)
-    if not task:
-        return
-    if done is not None:
-        task["done"] = done
-    if total is not None:
-        task["total"] = total
-    if phase is not None and task.get("phase") != phase:
-        task["phase"] = phase
-        task["sent"] = set()
-    total = task.get("total") or 0
-    if total <= 0:
-        return
-    pct = int(task.get("done", 0) * 100 / total)
-    for mark in PROGRESS_MILESTONES:
-        if pct >= mark and mark not in task["sent"]:
-            task["sent"].add(mark)
-            await discord_notify(f"`{search_id}` {mark}% {task['phase']}")
-
-
 def is_ai_post(post):
     if post.get("aiType") == 2:
         return True
@@ -266,48 +226,6 @@ async def save_search(search_id, post_ids):
         ],
     }
     await turso_execute([stmt])
-    await save_search_posts(search_id, post_ids)
-
-
-async def save_search_posts(search_id, post_ids):
-    stmts = []
-    for pos, post_id in enumerate(post_ids):
-        stmts.append(
-            {
-                "sql": "INSERT OR IGNORE INTO pi_search_posts (search_id, post_id, pos) VALUES (?, ?, ?)",
-                "args": [
-                    {"type": "text", "value": search_id},
-                    {"type": "text", "value": str(post_id)},
-                    {"type": "integer", "value": str(pos)},
-                ],
-            }
-        )
-    for i in range(0, len(stmts), 200):
-        await turso_batch(stmts[i : i + 200])
-
-
-async def ensure_search_posts(search_id, post_ids):
-    resp = await turso_execute(
-        [
-            {
-                "sql": "SELECT COUNT(*) FROM pi_search_posts WHERE search_id = ?",
-                "args": [{"type": "text", "value": search_id}],
-            }
-        ]
-    )
-    rows = (resp.get("results") or [{}])[0].get("response", {}).get("result", {}).get("rows", [])
-    count = int(rows[0][0].get("value", "0")) if rows else 0
-    if count == len(post_ids):
-        return
-    await turso_execute(
-        [
-            {
-                "sql": "DELETE FROM pi_search_posts WHERE search_id = ?",
-                "args": [{"type": "text", "value": search_id}],
-            }
-        ]
-    )
-    await save_search_posts(search_id, post_ids)
 
 
 async def pixiv_search_live(url, pages, mode, phpsessid, search_id):
@@ -324,7 +242,8 @@ async def pixiv_search_live(url, pages, mode, phpsessid, search_id):
         for coro in asyncio.as_completed(tasks):
             data = await coro
             done += 1
-            await update_task(search_id, done=done, total=pages)
+            if search_id in ACTIVE_TASKS:
+                ACTIVE_TASKS[search_id].update({"total": pages, "done": done})
             if data.get("error"):
                 continue
             body = data.get("body") or {}
@@ -344,7 +263,7 @@ async def pixiv_search_live(url, pages, mode, phpsessid, search_id):
     return post_ids, keywords, first_url
 
 
-async def pixiv_user_posts(user_ids, phpsessid, task_id=None):
+async def pixiv_user_posts(user_ids, phpsessid):
     cookies = {"PHPSESSID": phpsessid}
     results = []
     async with aiohttp.ClientSession(cookies=cookies, headers=PIXIV_HEADERS) as session:
@@ -364,8 +283,6 @@ async def pixiv_user_posts(user_ids, phpsessid, task_id=None):
                 )
                 username = (udata.get("body") or {}).get("name") or ""
             results.append({"user_id": uid, "post_ids": posts, "username": username})
-            if task_id:
-                await update_task(task_id, done=len(results), total=len(user_ids))
     return results
 
 
@@ -504,8 +421,8 @@ async def run_scan(post_ids, phpsessid, task_id=None, save_live=False):
             result = await coro
             results.append(result)
             pending.append(result)
-            if task_id:
-                await update_task(task_id, done=len(results), total=len(post_ids))
+            if task_id and task_id in ACTIVE_TASKS:
+                ACTIVE_TASKS[task_id]["done"] = len(results)
             if save_live and len(pending) >= 20:
                 await save_scan_results(pending)
                 pending = []
@@ -538,19 +455,15 @@ async def save_scan_results(results):
 async def get_scanned_post_ids(post_ids):
     if not post_ids:
         return {}
-    chunks = [
-        post_ids[i : i + SCAN_LOOKUP_CHUNK]
-        for i in range(0, len(post_ids), SCAN_LOOKUP_CHUNK)
-    ]
-
-    async def fetch_chunk(chunk):
+    chunks = [post_ids[i : i + 200] for i in range(0, len(post_ids), 200)]
+    scanned = {}
+    for chunk in chunks:
         placeholders = ",".join("?" for _ in chunk)
         stmt = {
             "sql": f"SELECT post_id, url, exif_type FROM pi_scans WHERE post_id IN ({placeholders})",
             "args": [{"type": "text", "value": str(pid)} for pid in chunk],
         }
         resp = await turso_execute([stmt])
-        out = {}
         results = resp.get("results") or []
         if results and "response" in results[0]:
             rows = results[0]["response"].get("result", {}).get("rows", [])
@@ -558,12 +471,7 @@ async def get_scanned_post_ids(post_ids):
                 pid = row[0].get("value")
                 url_val = row[1].get("value") if row[1].get("type") != "null" else ""
                 et = row[2].get("value") if row[2].get("type") != "null" else None
-                out[pid] = {"url": url_val, "exif_type": int(et) if et else None}
-        return out
-
-    scanned = {}
-    for result in await asyncio.gather(*(fetch_chunk(chunk) for chunk in chunks)):
-        scanned.update(result)
+                scanned[pid] = {"url": url_val, "exif_type": int(et) if et else None}
     return scanned
 
 
@@ -649,8 +557,7 @@ async def fetch_pixiv_bytes(url, phpsessid):
 
 async def create_webp(post_id, image_url, phpsessid, page=0, kind="t"):
     cleanup_thumbs()
-    cache_kind = "v33" if kind == "v" else "t10"
-    out = THUMB_DIR / f"{post_id}_p{page}_{cache_kind}.webp"
+    out = THUMB_DIR / f"{post_id}_p{page}_{kind}.webp"
     if out.exists():
         os.utime(out, None)
         return out
@@ -659,9 +566,9 @@ async def create_webp(post_id, image_url, phpsessid, page=0, kind="t"):
         raise HTTPException(status_code=404, detail="image not found")
     image = Image.open(io.BytesIO(data))
     if kind == "v":
-        image = image.resize((max(image.width // 3, 1), max(image.height // 3, 1)))
+        image = image.resize((max(image.width // 2, 1), max(image.height // 2, 1)))
     else:
-        image = image.resize((max(image.width // 10, 1), max(image.height // 10, 1)))
+        image.thumbnail((360, 360))
     if image.mode not in ("RGB", "RGBA"):
         image = image.convert("RGB")
     image.save(out, "WEBP", quality=82 if kind == "v" else 72)
@@ -682,7 +589,13 @@ def image_links(post_id, url):
 
 
 async def bg_search_task(search_id, url, pages, mode, phpsessid):
-    await start_task(search_id, "search", "searching", pages)
+    ACTIVE_TASKS[search_id] = {
+        "type": "search",
+        "phase": "searching",
+        "total": pages,
+        "done": 0,
+    }
+    await discord_notify(f"`{search_id}` started")
     try:
         post_ids, _, _ = await pixiv_search_live(url, pages, mode, phpsessid, search_id)
         await discord_notify(f"`{search_id}` completed - {len(post_ids)} posts found")
@@ -693,14 +606,27 @@ async def bg_search_task(search_id, url, pages, mode, phpsessid):
 
 
 async def bg_user_task(search_id, user_ids, phpsessid):
-    await start_task(search_id, "user_search", "searching", len(user_ids))
+    ACTIVE_TASKS[search_id] = {
+        "type": "user_search",
+        "phase": "searching",
+        "total": len(user_ids),
+        "done": 0,
+    }
+    await discord_notify(f"`{search_id}` started (users)")
     try:
-        results = await pixiv_user_posts(user_ids, phpsessid, search_id)
+        results = await pixiv_user_posts(user_ids, phpsessid)
         all_post_ids = []
         for r in results:
             all_post_ids.extend(r["post_ids"])
         all_post_ids = list(dict.fromkeys(all_post_ids))
         await save_search(search_id, all_post_ids)
+        already = await get_scanned_post_ids(all_post_ids)
+        to_scan = [pid for pid in all_post_ids if pid not in already]
+        if to_scan:
+            ACTIVE_TASKS[search_id].update(
+                {"phase": "scanning", "total": len(to_scan), "done": 0}
+            )
+            await run_scan(to_scan, phpsessid, task_id=search_id, save_live=True)
         await discord_notify(
             f"`{search_id}` completed - {len(all_post_ids)} posts from {len(user_ids)} users"
         )
@@ -711,12 +637,18 @@ async def bg_user_task(search_id, user_ids, phpsessid):
 
 
 async def bg_scan_task(search_id, post_ids, phpsessid):
-    await start_task(search_id, "scan", "scanning", len(post_ids))
+    ACTIVE_TASKS[search_id] = {
+        "type": "scan",
+        "phase": "scanning",
+        "total": len(post_ids),
+        "done": 0,
+    }
+    await discord_notify(f"`{search_id}` scan started ({len(post_ids)} posts)")
     try:
         results = await run_scan(post_ids, phpsessid, task_id=search_id, save_live=True)
         found = sum(1 for _, url, _ in results if url)
         await discord_notify(
-            f"`{search_id}` completed - {found}/{len(post_ids)} have exif"
+            f"`{search_id}` scan completed - {found}/{len(post_ids)} have exif"
         )
     except Exception as e:
         await discord_notify(f"`{search_id}` scan failed: {e}")
@@ -725,22 +657,33 @@ async def bg_scan_task(search_id, post_ids, phpsessid):
 
 
 async def bg_search_and_scan_task(search_id, url, pages, mode, phpsessid):
-    await start_task(search_id, "search+scan", "searching", pages)
+    ACTIVE_TASKS[search_id] = {
+        "type": "search+scan",
+        "phase": "searching",
+        "total": pages,
+        "done": 0,
+    }
+    await discord_notify(f"`{search_id}` search+scan started")
     try:
         post_ids, _, _ = await pixiv_search_live(url, pages, mode, phpsessid, search_id)
+        await discord_notify(
+            f"`{search_id}` search done - {len(post_ids)} posts, scanning..."
+        )
         already = await get_scanned_post_ids(post_ids)
         to_scan = [pid for pid in post_ids if pid not in already]
         if to_scan:
-            await update_task(search_id, done=0, total=len(to_scan), phase="scanning")
+            ACTIVE_TASKS[search_id].update(
+                {"phase": "scanning", "total": len(to_scan), "done": 0}
+            )
             results = await run_scan(
                 to_scan, phpsessid, task_id=search_id, save_live=True
             )
             found = sum(1 for _, url, _ in results if url)
             await discord_notify(
-                f"`{search_id}` completed - {len(post_ids)} posts, {found}/{len(to_scan)} new exif"
+                f"`{search_id}` scan completed - {found}/{len(to_scan)} new exif"
             )
         else:
-            await discord_notify(f"`{search_id}` completed - all {len(post_ids)} already scanned")
+            await discord_notify(f"`{search_id}` all {len(post_ids)} already scanned")
     except Exception as e:
         await discord_notify(f"`{search_id}` failed: {e}")
     finally:
@@ -782,12 +725,9 @@ async def startup():
 async def submit_search(req: SearchRequest, bg: BackgroundTasks):
     search_id = base26_time()
     phpsessid = PHPSESSID
-    if req.action == "search":
-        bg.add_task(bg_search_task, search_id, req.url, req.pages, req.mode, phpsessid)
-    elif req.action == "scan_and_search":
-        bg.add_task(
-            bg_search_and_scan_task, search_id, req.url, req.pages, req.mode, phpsessid
-        )
+    bg.add_task(
+        bg_search_and_scan_task, search_id, req.url, req.pages, req.mode, phpsessid
+    )
     return {"id": search_id, "status": "started"}
 
 
@@ -803,6 +743,8 @@ async def submit_users(req: UserSearchRequest, bg: BackgroundTasks):
 @app.post("/api/scan")
 async def scan_search(req: ScanRequest, bg: BackgroundTasks):
     phpsessid = PHPSESSID
+    if req.search_id in ACTIVE_TASKS:
+        return {"status": "active", **ACTIVE_TASKS[req.search_id]}
     resp = await turso_execute(
         [
             {
@@ -895,63 +837,25 @@ async def get_results(search_id: str, page: int = 1, exif_only: bool = True):
     if not rows:
         return {"error": "not found"}
     post_ids = json.loads(rows[0][0].get("value", "[]"))
-    await ensure_search_posts(search_id, post_ids)
-    page = max(page, 1)
-    offset = (page - 1) * PAGE_SIZE
-    args = [{"type": "text", "value": search_id}]
-    if exif_only:
-        total_sql = "SELECT COUNT(*) FROM pi_search_posts p JOIN pi_scans s ON s.post_id = p.post_id WHERE p.search_id = ? AND s.exif_type IS NOT NULL"
-        item_sql = "SELECT p.post_id, s.url, s.exif_type, 1 FROM pi_search_posts p JOIN pi_scans s ON s.post_id = p.post_id WHERE p.search_id = ? AND s.exif_type IS NOT NULL ORDER BY p.pos LIMIT ? OFFSET ?"
-    else:
-        total_sql = "SELECT COUNT(*) FROM pi_search_posts WHERE search_id = ?"
-        item_sql = "SELECT p.post_id, s.url, s.exif_type, CASE WHEN s.post_id IS NULL THEN 0 ELSE 1 END FROM pi_search_posts p LEFT JOIN pi_scans s ON s.post_id = p.post_id WHERE p.search_id = ? ORDER BY p.pos LIMIT ? OFFSET ?"
-    resp = await turso_execute(
-        [
-            {"sql": total_sql, "args": args},
-            {
-                "sql": "SELECT COUNT(*) FROM pi_search_posts p JOIN pi_scans s ON s.post_id = p.post_id WHERE p.search_id = ?",
-                "args": args,
-            },
-            {
-                "sql": item_sql,
-                "args": args
-                + [
-                    {"type": "integer", "value": str(PAGE_SIZE)},
-                    {"type": "integer", "value": str(offset)},
-                ],
-            },
-        ]
-    )
-    result_rows = [
-        r.get("response", {}).get("result", {}).get("rows", [])
-        for r in resp.get("results", [])
-    ]
-    total = (
-        int(result_rows[0][0][0].get("value", "0"))
-        if result_rows and result_rows[0]
-        else 0
-    )
-    scanned_count = (
-        int(result_rows[1][0][0].get("value", "0"))
-        if len(result_rows) > 1 and result_rows[1]
-        else 0
-    )
-    items = []
-    item_rows = result_rows[2] if len(result_rows) > 2 else []
-    for row in item_rows:
-        pid = row[0].get("value")
-        url = row[1].get("value") if row[1].get("type") != "null" else ""
-        exif_type = row[2].get("value") if row[2].get("type") != "null" else None
-        scanned = row[3].get("value") == "1"
-        items.append(
+    scanned = await get_scanned_post_ids(post_ids)
+    source = (
+        exif_items(post_ids, scanned)
+        if exif_only
+        else [
             {
                 "post_id": pid,
-                "url": url,
-                "exif_type": int(exif_type) if exif_type else None,
-                "scanned": scanned,
-                **image_links(pid, url),
+                "url": scanned[pid]["url"] if pid in scanned else None,
+                "exif_type": scanned[pid]["exif_type"] if pid in scanned else None,
+                "scanned": pid in scanned,
+                **image_links(pid, scanned[pid]["url"] if pid in scanned else ""),
             }
-        )
+            for pid in post_ids
+        ]
+    )
+    page = max(page, 1)
+    total = len(source)
+    start = (page - 1) * PAGE_SIZE
+    items = source[start : start + PAGE_SIZE]
     return {
         "search_id": search_id,
         "items": items,
@@ -960,7 +864,7 @@ async def get_results(search_id: str, page: int = 1, exif_only: bool = True):
         "page_size": PAGE_SIZE,
         "pages": max((total + PAGE_SIZE - 1) // PAGE_SIZE, 1),
         "raw_total": len(post_ids),
-        "scanned_count": scanned_count,
+        "scanned_count": len(scanned),
     }
 
 
@@ -1023,10 +927,6 @@ async def get_thumb(post_id: str):
 async def delete_search(search_id: str):
     await turso_execute(
         [
-            {
-                "sql": "DELETE FROM pi_search_posts WHERE search_id = ?",
-                "args": [{"type": "text", "value": search_id}],
-            },
             {
                 "sql": "DELETE FROM pi_searches WHERE id = ?",
                 "args": [{"type": "text", "value": search_id}],
@@ -1053,14 +953,8 @@ async def rename_search(search_id: str, req: RenameRequest):
     if not rows:
         return {"error": "not found"}
     post_ids_val = rows[0][0].get("value", "[]")
-    post_ids = json.loads(post_ids_val)
-    await ensure_search_posts(search_id, post_ids)
     await turso_execute(
         [
-            {
-                "sql": "DELETE FROM pi_search_posts WHERE search_id = ?",
-                "args": [{"type": "text", "value": req.new_id}],
-            },
             {
                 "sql": "DELETE FROM pi_searches WHERE id = ?",
                 "args": [{"type": "text", "value": search_id}],
@@ -1072,16 +966,14 @@ async def rename_search(search_id: str, req: RenameRequest):
                     {"type": "text", "value": post_ids_val},
                 ],
             },
-            {
-                "sql": "UPDATE pi_search_posts SET search_id = ? WHERE search_id = ?",
-                "args": [
-                    {"type": "text", "value": req.new_id},
-                    {"type": "text", "value": search_id},
-                ],
-            },
         ]
     )
     return {"status": "renamed", "new_id": req.new_id}
 
 
+@app.get("/api/progress")
+async def get_progress():
+    return [{"id": k, **v} for k, v in ACTIVE_TASKS.items()]
+
+
 app.mount("/", StaticFiles(directory=FRONTEND_DIR, html=True), name="frontend")

frontend/app.js

@@ -17,7 +17,6 @@ $("#btn-submit").addEventListener("click", async () => {
   if (!url) return
   const pages = parseInt($("#input-pages").value) || 30
   const mode = $("#input-mode").value
-  const action = $("#input-action").value
   const status = $("#submit-status")
   status.textContent = "Submitting..."
   status.className = ""
@@ -38,13 +37,13 @@ $("#btn-submit").addEventListener("click", async () => {
       resp = await fetch("/api/submit_users", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ user_ids: userIds, action })
+        body: JSON.stringify({ user_ids: userIds })
       })
     } else {
       resp = await fetch("/api/submit", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ url, pages, mode, action })
+        body: JSON.stringify({ url, pages, mode })
       })
     }
     const data = await resp.json()
@@ -64,6 +63,7 @@ function route() {
   const params = new URLSearchParams(qs)
   $$(".tab").forEach(t => t.classList.toggle("active", t.dataset.tab === tab))
   $$(".panel").forEach(p => p.classList.toggle("active", p.id === tab))
+  if (tab === "progress") loadProgress()
   if (tab === "explorer") {
     if (parts[1]) {
       openSearch(decodeURIComponent(parts[1]), parseInt(params.get("page")) || 1, params.get("exif") !== "0")
@@ -85,9 +85,20 @@ async function loadSearches() {
   detail.classList.add("hidden")
   list.innerHTML = "Loading..."
   try {
-    const searchResp = await fetch("/api/searches")
+    const [searchResp, taskResp] = await Promise.all([fetch("/api/searches"), fetch("/api/progress")])
     const data = await searchResp.json()
-    if (!data.length) { list.innerHTML = "No searches yet"; return }
+    const tasks = await taskResp.json()
+    const active = tasks.filter(t => t.type === "search" || t.type === "search+scan" || t.type === "user_search")
+    if (!data.length && !active.length) { list.innerHTML = "No searches yet"; return }
+    const activeHtml = active.map(t => {
+      const pct = t.total > 0 ? Math.round(t.done / t.total * 100) : 0
+      const label = t.total > 0 ? `${t.done}/${t.total}` : "..."
+      return `<div class="search-item active-task" data-id="${esc(t.id)}">
+        <span class="id">${esc(t.id)}</span>
+        <span class="time">${esc(t.type)} ${esc(t.phase)} ${label}</span>
+        <div class="mini-bar"><div style="width:${pct}%"></div></div>
+      </div>`
+    }).join("")
     const savedHtml = data.map(s => {
       const d = new Date(parseInt(s.created_at) * 1000)
       const ts = d.toLocaleString()
@@ -100,7 +111,7 @@ async function loadSearches() {
         </span>
       </div>`
     }).join("")
-    list.innerHTML = savedHtml
+    list.innerHTML = activeHtml + savedHtml
     list.querySelectorAll(".search-item").forEach(el => {
       if (!el.dataset.id) return
       el.querySelector(".id").addEventListener("click", () => { location.hash = explorerHash(el.dataset.id, 1, true) })
@@ -132,25 +143,7 @@ async function openSearch(id, page = 1, exifOnly = true) {
 
     const allScanned = data.scanned_count >= data.raw_total
     $("#detail-stats").textContent = `${data.total}/${data.raw_total} shown | ${data.scanned_count}/${data.raw_total} scanned`
-    const scanBtn = $("#btn-scan")
-    if (allScanned) {
-      scanBtn.textContent = "Scanned"
-      scanBtn.disabled = true
-    } else {
-      scanBtn.textContent = `Scan (${data.raw_total - data.scanned_count} remaining)`
-      scanBtn.disabled = false
-      scanBtn.onclick = async () => {
-        scanBtn.disabled = true
-        scanBtn.textContent = "Scanning..."
-        const r = await fetch("/api/scan", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ search_id: id })
-        })
-        const d = await r.json()
-        scanBtn.textContent = d.status === "already_scanned" ? "Scanned" : `Scanning ${d.to_scan}...`
-      }
-    }
+    if (!allScanned) resumeScan(id)
 
     $("#filter-exif").onchange = () => { location.hash = explorerHash(id, 1, $("#filter-exif").checked) }
     $("#btn-back").onclick = () => { location.hash = "#/explorer" }
@@ -161,6 +154,14 @@ async function openSearch(id, page = 1, exifOnly = true) {
   }
 }
 
+async function resumeScan(id) {
+  await fetch("/api/scan", {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ search_id: id })
+  })
+}
+
 function pageSuffix(url) {
   if (!url) return ""
   const m = url.match(/_p(\d+)\./)
@@ -287,6 +288,30 @@ async function renameSearch(id) {
   loadSearches()
 }
 
+async function loadProgress() {
+  const el = $("#progress-list")
+  try {
+    const resp = await fetch("/api/progress")
+    const tasks = await resp.json()
+    if (!tasks.length) { el.innerHTML = '<div class="progress-empty">No active tasks</div>'; return }
+    el.innerHTML = tasks.map(t => {
+      const pct = t.total > 0 ? Math.round(t.done / t.total * 100) : 0
+      const label = t.total > 0 ? `${t.done} / ${t.total}` : "..."
+      return `<div class="progress-item">
+        <div class="progress-info">
+          <span class="progress-id">${t.id}</span>
+          <span class="progress-type">${t.type}</span>
+          <span class="progress-phase">${t.phase}</span>
+          <span class="progress-label">${label}</span>
+        </div>
+        <div class="progress-bar-bg"><div class="progress-bar-fill" style="width:${pct}%"></div></div>
+      </div>`
+    }).join("")
+  } catch (e) {
+    el.innerHTML = `<div class="progress-empty">Error: ${e.message}</div>`
+  }
+}
+
 window.addEventListener("hashchange", route)
 if (!location.hash) location.hash = "#/submit"
 route()

frontend/index.html

@@ -11,6 +11,7 @@
 <div id="app">
   <nav>
     <button class="tab active" data-tab="submit">Submit</button>
+    <button class="tab" data-tab="progress">Progress</button>
     <button class="tab" data-tab="explorer">Explorer</button>
   </nav>
 
@@ -33,18 +34,16 @@
           <option value="real">Real Only</option>
         </select>
       </div>
-      <div class="form-group">
-        <label>Action</label>
-        <select id="input-action">
-          <option value="search">Search</option>
-          <option value="scan_and_search" selected>Search & Scan</option>
-        </select>
-      </div>
     </div>
     <button id="btn-submit" class="btn-primary">Submit</button>
     <div id="submit-status"></div>
   </section>
 
+  <section id="progress" class="panel">
+    <h2>Progress</h2>
+    <div id="progress-list"></div>
+  </section>
+
   <section id="explorer" class="panel">
     <h2>Explorer</h2>
     <div id="search-list"></div>
@@ -54,7 +53,6 @@
         <span id="detail-title"></span>
         <span id="detail-stats"></span>
         <label class="check-row"><input type="checkbox" id="filter-exif" checked> Exif Only</label>
-        <button id="btn-scan" class="btn-primary">Scan</button>
       </div>
       <div id="pager"></div>
       <div id="results-grid"></div>

frontend/style.css

@@ -20,6 +20,7 @@ input:focus, select:focus { outline: none; border-color: #6c63ff; }
 .btn-secondary:hover { background: #3a3a4e; }
 .btn-secondary:disabled { color: #666; cursor: not-allowed; }
 #submit-status { margin-top: 1rem; padding: .5rem; border-radius: 4px; font-size: .9rem; }
+#submit-status a { color: inherit; overflow-wrap: anywhere; }
 .status-ok { background: #1a3a1a; color: #6f6; }
 .status-err { background: #3a1a1a; color: #f66; }
 .hidden { display: none; }
@@ -35,6 +36,9 @@ input:focus, select:focus { outline: none; border-color: #6c63ff; }
 .btn-icon { background: none; border: 1px solid transparent; color: #666; font-size: 1rem; cursor: pointer; padding: .1rem .4rem; border-radius: 3px; line-height: 1; }
 .btn-icon:hover { color: #e0e0e0; border-color: #555; }
 .btn-delete:hover { color: #f66; border-color: #f66; }
+.active-task { border-color: #ffb74d; }
+.mini-bar { width: 120px; height: 4px; background: #333; border-radius: 2px; overflow: hidden; margin-left: .75rem; }
+.mini-bar div { height: 100%; background: #ffb74d; }
 
 .detail-header { display: flex; align-items: center; gap: 1rem; flex-wrap: wrap; margin-bottom: 1rem; }
 #detail-title { font-weight: bold; color: #6c63ff; }
@@ -66,6 +70,16 @@ input:focus, select:focus { outline: none; border-color: #6c63ff; }
 .not-scanned { color: #555; }
 .no-exif { color: #666; }
 
+.progress-empty { color: #666; padding: 1rem 0; }
+.progress-item { background: #1a1a2e; border: 1px solid #333; border-radius: 6px; padding: .75rem 1rem; margin-bottom: .5rem; }
+.progress-info { display: flex; align-items: center; gap: 1rem; margin-bottom: .5rem; font-size: .85rem; }
+.progress-id { color: #6c63ff; font-family: monospace; }
+.progress-type { color: #aaa; }
+.progress-phase { color: #ffb74d; }
+.progress-label { margin-left: auto; color: #ccc; }
+.progress-bar-bg { background: #2a2a3e; border-radius: 3px; height: 6px; overflow: hidden; }
+.progress-bar-fill { background: #6c63ff; height: 100%; transition: width .3s ease; }
+
 #viewer { position: fixed; inset: 0; z-index: 10; background: rgba(0, 0, 0, .92); display: flex; flex-direction: column; }
 #viewer.hidden { display: none; }
 .viewer-bar { display: flex; align-items: center; justify-content: flex-end; gap: .5rem; padding: .75rem; background: #111; border-bottom: 1px solid #333; }