Fix: Library Filtering + GQL Cleanup P.1

src/lib/components/library/Library.svelte

@@ -2,9 +2,9 @@
   import { getAdapter }   from '$lib/request-manager'
   import { libraryState } from '$lib/state/library.svelte'
   import type { LibrarySortOption, LibraryContentFilter, LibraryStatusFilter } from '$lib/state/library.svelte'
-  import { startLibraryUpdate } from '$lib/components/library/lib/libraryUpdater'
   import { addToast }           from '$lib/state/notifications.svelte'
   import { updateSettings, settingsState } from '$lib/state/settings.svelte'
+  import { readerState } from '$lib/state/reader.svelte'
   import { goto }               from '$app/navigation'
   import LibraryToolbar  from '$lib/components/library/LibraryToolbar.svelte'
   import LibraryGrid     from '$lib/components/library/LibraryGrid.svelte'
@@ -23,13 +23,17 @@
   const DT_TAB         = 'application/x-moku-tab'
   const COMPLETED_NAME = 'Completed'
 
-  let cancelUpdate:     (() => void) | null = null
+  let statusPollTimer:  ReturnType<typeof setTimeout> | null = null
   let refreshDoneTimer: ReturnType<typeof setTimeout> | null = null
 
+  const UPDATE_STATUS_POLL_MS = 2_000
+
   let ctx:      { x: number; y: number; manga: Manga } | null = $state(null)
   let emptyCtx: { x: number; y: number } | null              = $state(null)
 
-  let bulkWorking:    boolean      = $state(false)
+  let bulkWorking:     boolean      = $state(false)
+  let sortPanelOpen:   boolean      = $state(false)
+  let filterPanelOpen: boolean      = $state(false)
   let activeDragKind: 'tab' | null = $state(null)
   let dragInsertIdx                = $state(-1)
   let dragTabId:      string|null  = $state(null)
@@ -42,6 +46,9 @@
   $effect(() => { libraryState.syncFromSettings(settingsState.settings) })
   $effect(() => { libraryState.tab; libraryState.exitSelect() })
   $effect(() => { libraryState.guardTab() })
+  $effect(() => {
+    if (readerState.activeManga === null) loadLibrary()
+  })
 
   async function loadLibrary() {
     libraryState.loading = true
@@ -197,33 +204,57 @@
     } finally { bulkWorking = false }
   }
 
+  function stopStatusPolling() {
+    if (!statusPollTimer) return
+    clearTimeout(statusPollTimer)
+    statusPollTimer = null
+  }
+
   async function startRefresh() {
     if (libraryState.refreshing) return
     libraryState.refreshing = true
     libraryState.refreshProgress = { finished: 0, total: 0 }
 
-    cancelUpdate = startLibraryUpdate({
-      onProgress(p) { libraryState.refreshProgress = p },
-      async onDone({ newChapters, totalUpdated }) {
-        cancelUpdate = null
-        await loadLibrary()
-        libraryState.refreshing = false
-        libraryState.refreshDone = true
-        if (refreshDoneTimer) clearTimeout(refreshDoneTimer)
-        refreshDoneTimer = setTimeout(() => { libraryState.refreshDone = false }, 2500)
-        if (newChapters > 0) {
-          addToast({ kind: 'success', title: 'Library updated', body: `${newChapters} new chapter${newChapters !== 1 ? 's' : ''} across ${totalUpdated} series` })
-        } else {
-          addToast({ kind: 'info', title: 'Already up to date' })
+    try {
+      await getAdapter().checkForUpdates()
+    } catch (e) {
+      libraryState.refreshing = false
+      addToast({ kind: 'error', title: 'Update failed', body: String(e) })
+      return
+    }
+
+    const tick = async () => {
+      statusPollTimer = null
+      try {
+        const statusRes = await getAdapter().getLibraryUpdateStatus()
+        const wasRunning = libraryState.refreshing
+
+        libraryState.refreshProgress = {
+          finished: statusRes.finishedJobs ?? 0,
+          total:    statusRes.totalJobs    ?? 0,
         }
-      },
-      onError() { libraryState.refreshing = false; cancelUpdate = null },
-    })
+
+        if (statusRes.isRunning) {
+          statusPollTimer = setTimeout(tick, UPDATE_STATUS_POLL_MS)
+        } else if (wasRunning) {
+          libraryState.refreshing = false
+          libraryState.refreshDone = true
+          if (refreshDoneTimer) clearTimeout(refreshDoneTimer)
+          refreshDoneTimer = setTimeout(() => { libraryState.refreshDone = false }, 2500)
+          await loadLibrary()
+          addToast({ kind: 'info', title: 'Library updated' })
+        }
+      } catch {
+        if (libraryState.refreshing) statusPollTimer = setTimeout(tick, UPDATE_STATUS_POLL_MS)
+      }
+    }
+
+    statusPollTimer = setTimeout(tick, UPDATE_STATUS_POLL_MS)
   }
 
   async function cancelRefresh() {
     if (!libraryState.refreshing) return
-    cancelUpdate?.(); cancelUpdate = null
+    stopStatusPolling()
     try { await getAdapter().stopLibraryUpdate() } catch {}
     libraryState.refreshing = false
     libraryState.refreshProgress = { finished: 0, total: 0 }
@@ -370,7 +401,7 @@
       visibleCategories={libraryState.visibleCategories}
       visibleTabIds={libraryState.visibleTabIds}
       counts={libraryState.counts}
-      query={libraryState.filter.query}
+      search={libraryState.filter.query}
       refreshing={libraryState.refreshing}
       refreshProgress={libraryState.refreshProgress}
       refreshDone={libraryState.refreshDone}
@@ -379,13 +410,17 @@
       {dragInsertIdx}
       {dragTabId}
       {dragOverTabId}
+      {sortPanelOpen}
+      {filterPanelOpen}
       onTabChange={(t) => libraryState.tab = t}
-      onQuery={(q) => libraryState.filter.query = q}
+      onSearchChange={(q) => libraryState.filter.query = q}
       onSortChange={(mode) => libraryState.setTabSort(libraryState.tab, mode)}
       onSortDirToggle={() => libraryState.toggleTabSortDir(libraryState.tab)}
+      onSortPanelToggle={() => sortPanelOpen = !sortPanelOpen}
       onStatusChange={(s) => libraryState.setTabStatus(libraryState.tab, s)}
       onFilterToggle={(f) => libraryState.toggleTabFilter(libraryState.tab, f)}
       onFiltersClear={() => libraryState.clearTabFilters(libraryState.tab)}
+      onFilterPanelToggle={() => filterPanelOpen = !filterPanelOpen}
       onRefresh={startRefresh}
       onCancelRefresh={cancelRefresh}
       onRefreshCategory={refreshCategory}

src/lib/components/library/LibraryToolbar.svelte

@@ -212,14 +212,14 @@
     </div>
 
     <LibraryFilters
-      {tabStatus}
-      {tabFilters}
-      {hasActiveFilters}
-      {filterPanelOpen}
+      status={tabStatus}
+      filters={tabFilters}
+      hasActive={hasActiveFilters}
+      open={filterPanelOpen}
+      onToggle={onFilterPanelToggle}
       {onStatusChange}
       {onFilterToggle}
-      {onFiltersClear}
-      {onFilterPanelToggle}
+      onClear={onFiltersClear}
     />
   </div>
 </div>

src/lib/components/library/lib/libraryUpdater.ts

@@ -1,125 +0,0 @@
-import { getAdapter } from '$lib/request-manager'
-
-const POLL_INTERVAL_MS = 2000
-const POLL_INITIAL_MS  = 500
-
-export interface UpdateProgress {
-  finished:          number
-  total:             number
-  skippedManga:      number
-  skippedCategories: number
-}
-
-export interface UpdateResult {
-  entries:      UpdateEntry[]
-  totalUpdated: number
-  newChapters:  number
-}
-
-export interface UpdateEntry {
-  mangaId:      number
-  mangaTitle:   string
-  thumbnailUrl: string
-  newChapters:  number
-  checkedAt:    number
-}
-
-export interface LibraryUpdaterCallbacks {
-  onProgress: (p: UpdateProgress) => void
-  onDone:     (r: UpdateResult)   => void
-  onError:    (e?: unknown)       => void
-}
-
-function buildEntries(
-  mangaUpdates: { status: string; manga: { id: number; title: string; thumbnailUrl: string; unreadCount: number } }[]
-): UpdateEntry[] {
-  const byManga = new Map<number, UpdateEntry>()
-  for (const u of mangaUpdates) {
-    if (u.status !== 'UPDATED') continue
-    const existing = byManga.get(u.manga.id)
-    if (existing) {
-      existing.newChapters++
-    } else {
-      byManga.set(u.manga.id, {
-        mangaId:      u.manga.id,
-        mangaTitle:   u.manga.title,
-        thumbnailUrl: u.manga.thumbnailUrl,
-        newChapters:  1,
-        checkedAt:    Date.now(),
-      })
-    }
-  }
-  return [...byManga.values()]
-}
-
-export function startLibraryUpdate(callbacks: LibraryUpdaterCallbacks): () => void {
-  let timer:    ReturnType<typeof setTimeout> | null = null
-  let cancelled = false
-
-  function cancel() {
-    cancelled = true
-    if (timer) { clearTimeout(timer); timer = null }
-  }
-
-  async function run() {
-    let jobsStarted = false
-
-    try {
-      const status = await getAdapter().checkForUpdates()
-      if (cancelled) return
-
-      const { jobsInfo } = status
-      jobsStarted = jobsInfo.totalJobs > 0
-
-      callbacks.onProgress({
-        finished:          jobsInfo.finishedJobs,
-        total:             jobsInfo.totalJobs,
-        skippedManga:      jobsInfo.skippedMangasCount,
-        skippedCategories: jobsInfo.skippedCategoriesCount,
-      })
-
-      if (!jobsStarted || !jobsInfo.isRunning) {
-        callbacks.onDone({ entries: [], totalUpdated: 0, newChapters: 0 })
-        return
-      }
-    } catch (e) {
-      console.error('[libraryUpdater] failed to start update', e)
-      if (!cancelled) callbacks.onError(e)
-      return
-    }
-
-    function poll() {
-      getAdapter().getLibraryUpdateStatus()
-        .then(d => {
-          if (cancelled) return
-          const { jobsInfo, mangaUpdates } = d
-
-          if (jobsInfo.totalJobs > 0) jobsStarted = true
-          callbacks.onProgress({
-            finished:          jobsInfo.finishedJobs,
-            total:             jobsInfo.totalJobs,
-            skippedManga:      jobsInfo.skippedMangasCount,
-            skippedCategories: jobsInfo.skippedCategoriesCount,
-          })
-
-          if (!jobsInfo.isRunning && jobsStarted) {
-            const entries     = buildEntries(mangaUpdates)
-            const newChapters = entries.reduce((s, e) => s + e.newChapters, 0)
-            callbacks.onDone({ entries, totalUpdated: entries.length, newChapters })
-            return
-          }
-
-          timer = setTimeout(poll, POLL_INTERVAL_MS)
-        })
-        .catch(e => {
-          console.error('[libraryUpdater] poll error', e)
-          if (!cancelled) callbacks.onError(e)
-        })
-    }
-
-    timer = setTimeout(poll, POLL_INITIAL_MS)
-  }
-
-  run()
-  return cancel
-}

src/lib/components/reader/Reader.svelte

@@ -12,6 +12,7 @@
   import { clampZoom, captureZoomAnchor, restoreZoomAnchor } from "$lib/components/reader/lib/zoomHelpers";
   import { loadChapter, scheduleResumeDismiss }              from "$lib/components/reader/lib/chapterLoader";
   import { historyState }                                    from "$lib/state/history.svelte";
+  import { getAdapter }                                      from "$lib/request-manager";
   import type { ReaderSettings }                             from "$lib/state/reader.svelte";
   import ReaderControls                                      from "$lib/components/reader/ReaderControls.svelte";
   import PageView                                            from "$lib/components/reader/PageView.svelte";
@@ -380,19 +381,7 @@
             const toQueue = list.slice(idx + 1, idx + 1 + prefs.downloadAhead)
               .filter(c => !c.downloaded && !c.read)
               .map(c => c.id);
-            if (toQueue.length) {
-              const DL = `mutation EnqueueDl($ids: [Int!]!) { enqueueChaptersDownloads(input: { ids: $ids }) { downloadStatus { queue { chapter { id } } } } }`;
-              const base    = settingsState.settings.serverUrl ?? "http://localhost:4567";
-              const headers: Record<string, string> = { "Content-Type": "application/json" };
-              const mode    = settingsState.settings.serverAuthMode ?? "NONE";
-              if (mode === "BASIC_AUTH") {
-                const u = settingsState.settings.serverAuthUser?.trim() ?? "";
-                const p = settingsState.settings.serverAuthPass?.trim() ?? "";
-                if (u && p) headers["Authorization"] = `Basic ${btoa(`${u}:${p}`)}`;
-              }
-              fetch(`${base}/api/graphql`, { method: "POST", headers, body: JSON.stringify({ query: DL, variables: { ids: toQueue } }) })
-                .catch(console.error);
-            }
+            if (toQueue.length) getAdapter().enqueueDownloads(toQueue.map(String)).catch(console.error);
           }
         }
       });

src/lib/components/reader/ReaderControls.svelte

@@ -3,10 +3,11 @@
     X, CaretLeft, CaretRight, CaretUp, CaretDown,
     MagnifyingGlassMinus, MagnifyingGlassPlus,
     Bookmark, MapPin, Download, Check, GearSix, Sliders,
-    ArrowsOut, ArrowsIn,
+    ArrowsOut, ArrowsIn, Minus,
   } from "phosphor-svelte";
   import { readerState, MARKER_COLORS, MARKER_COLOR_HEX, ZOOM_STEP, ZOOM_MIN, ZOOM_MAX } from "$lib/state/reader.svelte";
-  import { settingsState }  from "$lib/state/settings.svelte";
+  import { getAdapter }        from "$lib/request-manager";
+  import { platformService }   from "$lib/platform-service";
   import { fly }               from "svelte/transition";
   import { cubicOut, cubicIn } from "svelte/easing";
   import type { Chapter }      from "$lib/types";
@@ -52,24 +53,6 @@
 
   const queueable = $derived(adjacent.remaining.filter(c => !c.downloaded));
 
-  async function gqlMutation(query: string, variables: Record<string, unknown>): Promise<void> {
-    const base = settingsState.settings.serverUrl ?? "http://localhost:4567";
-    const headers: Record<string, string> = { "Content-Type": "application/json" };
-    const mode = settingsState.settings.serverAuthMode ?? "NONE";
-    if (mode === "BASIC_AUTH") {
-      const u = settingsState.settings.serverAuthUser?.trim() ?? "";
-      const p = settingsState.settings.serverAuthPass?.trim() ?? "";
-      if (u && p) headers["Authorization"] = `Basic ${btoa(`${u}:${p}`)}`;
-    }
-    const res = await fetch(`${base}/api/graphql`, { method: "POST", headers, body: JSON.stringify({ query, variables }) });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`);
-    const json = await res.json();
-    if (json.errors?.length) throw new Error(json.errors[0].message);
-  }
-
-  const ENQUEUE_ONE  = `mutation EnqueueOne($id: Int!) { fetchChapterPages(input: { chapterId: $id }) { chapter { id } } }`;
-  const ENQUEUE_MANY = `mutation EnqueueMany($ids: [Int!]!) { enqueueChaptersDownloads(input: { ids: $ids }) { downloadStatus { queue { chapter { id } } } } }`;
-
   async function runDl(fn: () => Promise<void>) {
     readerState.dlBusy = true;
     try { await fn(); } catch (e) { console.error(e); }
@@ -77,6 +60,14 @@
     readerState.dlOpen = false;
   }
 
+  function enqueueOne(chapterId: number) {
+    return getAdapter().enqueueDownload(String(chapterId));
+  }
+
+  function enqueueMany(chapterIds: number[]) {
+    return getAdapter().enqueueDownloads(chapterIds.map(String));
+  }
+
   const isVertical  = $derived(barPosition === "left" || barPosition === "right");
   const popoverSide = $derived(
     barPosition === "left"  ? "right" :
@@ -96,9 +87,10 @@
     onRestoreZoomAnchor();
   }
 
+  const isTauri = platformService.platform === "tauri";
+
   async function toggleFullscreen() {
-    if (!document.fullscreenElement) await document.documentElement.requestFullscreen();
-    else await document.exitFullscreen();
+    await platformService.toggleFullscreen();
   }
 
   function closeAllPopovers() {
@@ -337,6 +329,16 @@
               <span>Fullscreen</span>
             {/if}
           </button>
+          {#if isTauri}
+            <button class="action-row" onclick={() => { readerState.actionsOpen = false; platformService.minimize(); }}>
+              <Minus size={13} weight="regular" />
+              <span>Minimize</span>
+            </button>
+            <button class="action-row action-row-danger" onclick={() => { readerState.actionsOpen = false; platformService.close(); }}>
+              <X size={13} weight="regular" />
+              <span>Close window</span>
+            </button>
+          {/if}
         </div>
       {/if}
 
@@ -345,13 +347,13 @@
         <div class="popover dl-popover popover-{popoverSide}" role="presentation" onclick={(e) => e.stopPropagation()}>
           <p class="dl-title">Download</p>
           <button class="dl-option" disabled={readerState.dlBusy || !!chapter.downloaded}
-            onclick={() => runDl(() => gqlMutation(ENQUEUE_ONE, { id: chapter.id }))}>
+            onclick={() => runDl(() => enqueueOne(chapter.id))}>
             This chapter
             <span class="dl-sub">{chapter.downloaded ? "Already downloaded" : chapter.name}</span>
           </button>
           <div class="dl-row">
             <button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0}
-              onclick={() => runDl(() => gqlMutation(ENQUEUE_MANY, { ids: queueable.slice(0, readerState.nextN).map(c => c.id) }))}>
+              onclick={() => runDl(() => enqueueMany(queueable.slice(0, readerState.nextN).map(c => c.id)))}>
               Next chapters
               <span class="dl-sub">{Math.min(readerState.nextN, queueable.length)} not yet downloaded</span>
             </button>
@@ -362,7 +364,7 @@
             </div>
           </div>
           <button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0}
-            onclick={() => runDl(() => gqlMutation(ENQUEUE_MANY, { ids: queueable.map(c => c.id) }))}>
+            onclick={() => runDl(() => enqueueMany(queueable.map(c => c.id)))}>
             All remaining
             <span class="dl-sub">{queueable.length} not yet downloaded</span>
           </button>
@@ -661,8 +663,10 @@
     transition: background var(--t-fast), color var(--t-fast);
   }
   .action-row:hover { background: var(--bg-overlay); color: var(--text-primary); }
+  .action-row.action-row-danger:hover { background: color-mix(in srgb, #c0392b 15%, transparent); color: var(--color-error, #e57373); }
   .action-row svg, .action-row :global(svg) { flex-shrink: 0; color: var(--text-faint); }
   .action-row:hover svg, .action-row:hover :global(svg) { color: var(--text-muted); }
+  .action-row-danger:hover svg, .action-row-danger:hover :global(svg) { color: var(--color-error, #e57373); }
 
   .action-divider { height: 1px; background: var(--border-dim); margin: var(--sp-1) 0; }