1.0.0.8 logging updates

2026-01-18 23:01:03 +13:00
parent 0a1edc0922
commit 7fa9c4d16e
15 changed files with 220 additions and 123 deletions
@@ -1,114 +1,116 @@
 <script>
-  import { onMount } from 'svelte'
-  import Footer from './components/Footer.svelte'
-  import AppSidebar from './components/AppSidebar.svelte'
-  import * as Sidebar from './lib/components/ui/sidebar'
-  import { Button } from './lib/components/ui/button'
-  import SettingsPanel from './components/SettingsPanel.svelte'
-  import ScanPanel from './components/ScanPanel.svelte'
-  import HistoryPanel from './components/HistoryPanel.svelte'
-  import LibraryPanel from './components/LibraryPanel.svelte'
-  import { Menu } from 'lucide-svelte'
-  import ToastHost from './components/ToastHost.svelte'
-  import { healthCheck } from './lib/api.js'
-  import { currentTheme, themes } from './lib/themeStore.js'
+  import { onMount } from "svelte";
+  import Footer from "./components/Footer.svelte";
+  import AppSidebar from "./components/AppSidebar.svelte";
+  import * as Sidebar from "./lib/components/ui/sidebar";
+  import { Button } from "./lib/components/ui/button";
+  import SettingsPanel from "./components/SettingsPanel.svelte";
+  import ScanPanel from "./components/ScanPanel.svelte";
+  import HistoryPanel from "./components/HistoryPanel.svelte";
+  import LibraryPanel from "./components/LibraryPanel.svelte";
+  import { Menu } from "lucide-svelte";
+  import ToastHost from "./components/ToastHost.svelte";
+  import { healthCheck } from "./lib/api.js";
+  import { currentTheme, themes } from "./lib/themeStore.js";

-  let currentView = 'scanner'
-  let apiConfigured = false
-  let selectedFiles = []
-  let metadataProvider = 'omdb'
-  let scanPanelKey = 0
-  let sidebarOpen = true
-  let sidebarCollapsed = false
-  let isMobile = false
+  let currentView = "scanner";
+  let apiConfigured = false;
+  let selectedFiles = [];
+  let metadataProvider = "omdb";
+  let scanPanelKey = 0;
+  let sidebarOpen = true;
+  let sidebarCollapsed = false;
+  let isMobile = false;

  // Apply theme on mount and when it changes
  function applyTheme(themeName) {
-    const theme = themes[themeName]
-    if (!theme) return
+    const theme = themes[themeName];
+    if (!theme) return;

-    const root = document.documentElement
+    const root = document.documentElement;
    Object.entries(theme.colors).forEach(([key, value]) => {
-      root.style.setProperty(`--${key}`, value)
-    })
+      root.style.setProperty(`--${key}`, value);
+    });

-    if (themeName === 'light') {
-      root.classList.add('light-theme')
+    if (themeName === "light") {
+      root.classList.add("light-theme");
    } else {
-      root.classList.remove('light-theme')
+      root.classList.remove("light-theme");
    }
  }

  function updateLayout() {
-    isMobile = window.innerWidth < 768
+    isMobile = window.innerWidth < 768;
    if (isMobile) {
-      sidebarOpen = false
+      sidebarOpen = false;
    } else {
-      sidebarOpen = true
+      sidebarOpen = true;
    }
  }

  onMount(async () => {
-    updateLayout()
-    const onResize = () => updateLayout()
-    window.addEventListener('resize', onResize)
+    updateLayout();
+    const onResize = () => updateLayout();
+    window.addEventListener("resize", onResize);

    // Initialize theme
-    applyTheme($currentTheme)
+    applyTheme($currentTheme);

    try {
-      const health = await healthCheck()
-      apiConfigured = health.api_key_configured
+      const health = await healthCheck();
+      apiConfigured = health.api_key_configured;
    } catch (err) {
-      console.error('Health check failed:', err)
+      console.error("Health check failed:", err);
    }
    return () => {
-      window.removeEventListener('resize', onResize)
-    }
-  })
+      window.removeEventListener("resize", onResize);
+    };
+  });

  // Watch for theme changes
  $: if ($currentTheme) {
-    applyTheme($currentTheme)
+    applyTheme($currentTheme);
  }

  async function checkApiStatus() {
    try {
-      const health = await healthCheck()
-      apiConfigured = health.api_key_configured
+      const health = await healthCheck();
+      apiConfigured = health.api_key_configured;
    } catch (err) {
-      console.error('Health check failed:', err)
+      console.error("Health check failed:", err);
    }
  }

  async function navigateTo(view) {
-    currentView = view
+    currentView = view;
    // Re-check API status when navigating to scanner (in case settings were just saved)
-    if (view === 'scanner') {
-      await checkApiStatus()
+    if (view === "scanner") {
+      await checkApiStatus();
    }
  }

  function handleProcessComplete() {
-    scanPanelKey += 1
+    scanPanelKey += 1;
  }

  function handleSidebarToggle() {
    if (isMobile) {
-      sidebarOpen = !sidebarOpen
+      sidebarOpen = !sidebarOpen;
    } else {
-      sidebarCollapsed = !sidebarCollapsed
+      sidebarCollapsed = !sidebarCollapsed;
    }
  }

  $: sidebarWidth = isMobile
-    ? '15.5rem'
+    ? "15.5rem"
    : sidebarCollapsed
-      ? '3.75rem'
-      : '16rem'
+      ? "3.75rem"
+      : "16rem";
 </script>

-<Sidebar.Provider style={`--sidebar-width: ${sidebarWidth}; --header-height: 4rem;`}>
+<Sidebar.Provider
+  style={`--sidebar-width: ${sidebarWidth}; --header-height: 4rem;`}
+>
  {#if isMobile && sidebarOpen}
    <div
      class="fixed inset-0 z-30 bg-black/40 backdrop-blur-sm"
@@ -141,30 +143,32 @@
          </Button>
        </div>
      {/if}
-      {#if !apiConfigured && currentView === 'scanner'}
+      {#if !apiConfigured && currentView === "scanner"}
        <div class="border-b border-yellow-500/10 bg-yellow-500/5">
          <div class="px-6 md:px-8 py-3">
-            <p class="text-[13px] text-yellow-100">Configure a metadata source in Settings to get started</p>
+            <p class="text-[13px] text-yellow-100">
+              Configure a metadata source in Settings to get started
+            </p>
          </div>
        </div>
      {/if}

      <div class="px-4 sm:px-6 md:px-8 py-6 sm:py-8 md:py-10">
-        {#if currentView === 'settings'}
+        {#if currentView === "settings"}
          <SettingsPanel />
-        {:else if currentView === 'history'}
+        {:else if currentView === "history"}
          <HistoryPanel />
-        {:else if currentView === 'scanner'}
+        {:else if currentView === "scanner"}
          {#key scanPanelKey}
            <ScanPanel
              bind:selectedFilePaths={selectedFiles}
              bind:metadataProvider
-              apiConfigured={apiConfigured}
-              onOpenSettings={() => navigateTo('settings')}
-              onOpenHistory={() => navigateTo('history')}
+              {apiConfigured}
+              onOpenSettings={() => navigateTo("settings")}
+              onOpenHistory={() => navigateTo("history")}
            />
          {/key}
-        {:else if currentView === 'library'}
+        {:else if currentView === "library"}
          <LibraryPanel />
        {/if}
      </div>
@@ -154,7 +154,7 @@
      >
        {#if !collapsed}
          <Badge className="bg-white/10 text-text-secondary"
-            >v1.0.7 Release Candiate</Badge
+            >v1.0.8 Release Candiate</Badge
          >
        {:else}
          <Badge className="bg-white/10 text-text-secondary">v</Badge>
@@ -8,13 +8,23 @@
  let loading = false;
  let error = null;
  let expanded = {};
+  let page = 0;
+  const pageSize = 200;

-  async function loadLibrary() {
+  async function loadLibrary(reset = true) {
    loading = true;
    error = null;
    try {
-      const response = await getLibraryReport();
-      items = response.items || [];
+      if (reset) {
+        page = 0;
+        items = [];
+      }
+      const response = await getLibraryReport(pageSize, page * pageSize);
+      const nextItems = response.items || [];
+      items = reset ? nextItems : [...items, ...nextItems];
+      if (nextItems.length > 0) {
+        page += 1;
+      }
    } catch (err) {
      error = `Failed to load library report: ${err.message}`;
    } finally {
@@ -26,7 +36,7 @@
    expanded = { ...expanded, [key]: !expanded[key] };
  }

-  onMount(loadLibrary);
+  onMount(() => loadLibrary(true));
 </script>

 <div class="space-y-6">
@@ -41,7 +51,7 @@
      variant="outline"
      size="sm"
      className="border-white/15 text-text-secondary hover:bg-white/10"
-      on:click={loadLibrary}
+      on:click={() => loadLibrary(true)}
      disabled={loading}
    >
      <RefreshCcw class="h-4 w-4" />
@@ -148,6 +158,17 @@
          {/if}
        </div>
      {/each}
+      <div class="flex justify-center">
+        <Button
+          variant="outline"
+          size="sm"
+          className="border-white/15 text-text-secondary hover:bg-white/10"
+          on:click={() => loadLibrary(false)}
+          disabled={loading}
+        >
+          Load more
+        </Button>
+      </div>
    </div>
  {/if}
 </div>
@@ -7,6 +7,7 @@
    processFiles,
    clearAllSuggestedMatches,
    getFolderRules,
+    getScanHistory,
  } from "../lib/api.js";
  import ResultsList from "./ResultsList.svelte";
  import TypewriterQuote from "./TypewriterQuote.svelte";
@@ -118,7 +119,11 @@
    filesFound: 0,
    message: "",
    scanning: false,
+    startedAt: null,
+    estimatedFinishAt: null,
  };
+  let scanHistory = [];
+  let expectedTotalFiles = null;

  // Scan cancellation
  let scanAbortController = null;
@@ -166,6 +171,12 @@
      } catch (err) {
        console.error("Failed to load folder rules:", err);
      }
+      try {
+        const historyResponse = await getScanHistory(10);
+        scanHistory = historyResponse.scans || [];
+      } catch (err) {
+        console.error("Failed to load scan history:", err);
+      }
    } catch (err) {
      console.error("Failed to load initial data:", err);
    }
@@ -190,7 +201,19 @@
      filesFound: 0,
      message: "Starting scan...",
      scanning: true,
+      startedAt: new Date(),
+      estimatedFinishAt: null,
    };
+    expectedTotalFiles = null;
+    if (scanHistory.length > 0 && directory) {
+      const normalizedDir = directory.toLowerCase();
+      const lastMatch = scanHistory.find(
+        (scan) => (scan.directory || "").toLowerCase() === normalizedDir,
+      );
+      if (lastMatch && lastMatch.files_found) {
+        expectedTotalFiles = lastMatch.files_found;
+      }
+    }
    addToast({ message: "Scan started.", tone: "info" });

    // Reset files array before starting new scan
@@ -219,6 +242,23 @@
              message: data.message,
              filesFound: data.filesFound,
            };
+            if (
+              scanProgress.startedAt &&
+              expectedTotalFiles &&
+              data.filesFound > 0
+            ) {
+              const elapsedMs =
+                new Date().getTime() - scanProgress.startedAt.getTime();
+              const estimatedTotalMs =
+                (elapsedMs * expectedTotalFiles) / data.filesFound;
+              const estimatedFinish = new Date(
+                scanProgress.startedAt.getTime() + estimatedTotalMs,
+              );
+              scanProgress = {
+                ...scanProgress,
+                estimatedFinishAt: estimatedFinish,
+              };
+            }

            // Incrementally add files as they're found
            const previousLength = files.length;
@@ -244,6 +284,9 @@
            }

            lastScan = new Date().toISOString();
+            if (data.count != null) {
+              expectedTotalFiles = data.count;
+            }

            // Save to store
            scanResults.setScanResults(files, directory);
@@ -343,6 +386,7 @@
    } finally {
      scanning = false;
      scanProgress.scanning = false;
+      scanProgress.estimatedFinishAt = null;
      scanAbortController = null;
    }
  }
@@ -715,6 +759,14 @@
              >
              <span class="text-text-tertiary">Scanning in progress...</span>
            </div>
+            {#if scanProgress.startedAt}
+              <div class="mt-2 text-[11px] text-text-tertiary">
+                Started at {scanProgress.startedAt.toLocaleTimeString()}
+                {#if scanProgress.estimatedFinishAt}
+                  · Estimated finish {scanProgress.estimatedFinishAt.toLocaleTimeString()}
+                {/if}
+              </div>
+            {/if}

            <!-- Progress bar -->
            <div
@@ -338,8 +338,8 @@ export async function getStatistics() {
 * GET /api/library - Get library health report
 * Returns: { success, scans: [...] }
 */
-export async function getLibraryReport(limit = 25) {
-  return apiFetch(`/library?limit=${limit}`)
+export async function getLibraryReport(limit = 200, offset = 0) {
+  return apiFetch(`/library?limit=${limit}&offset=${offset}`)
 }

 // ============ SCHEDULED SCANS API ============