pinokiod 8.0.41 → 8.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "8.0.41",
+  "version": "8.0.42",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/public/vault.js

@@ -26,6 +26,7 @@ const COPY = {
   before_help: "Estimated space if every app stored its own copy.",
   after: "After",
   effective_help: "Shared files are divided evenly among every location using them.",
+  partial_metrics_help: "Based on the latest scan. Unreadable paths may not be included.",
   no_more_matches: "No more matches in files {size} and larger",
   more_can_be_saved: "{size} more can be saved",
   available_to_save: "{size} available to save",
@@ -925,6 +926,8 @@ const renderOverview = () => {
   const lastAttempt = data.last_attempt || last
   const incomplete = !!data.incomplete
   const metricsExact = !!last && !incomplete && data.metrics_exact !== false
+  const metricScan = metricsExact ? last : lastAttempt
+  const metricsAvailable = !!(metricScan && Number.isFinite(metricScan.bytes_total))
   const activeScan = scanActive(data.scan)
   const scanning = scanMatchesContext(data.scan)
   const busyElsewhere = activeScan && !scanning
@@ -934,17 +937,22 @@ const renderOverview = () => {
   {
     const beforeBytes = Math.max(0, Number.isFinite(data.bytes_without_sharing)
       ? data.bytes_without_sharing
-      : (data.last_scan && Number.isFinite(data.last_scan.bytes_total)
-          ? data.last_scan.bytes_total
+      : (metricScan && Number.isFinite(metricScan.bytes_total)
+          ? metricScan.bytes_total
           : 0))
-    const afterBytes = Math.max(0, Number.isFinite(data.bytes_on_disk)
-      ? data.bytes_on_disk
-      : beforeBytes)
-    const afterRatio = beforeBytes ? Math.min(100, (afterBytes / beforeBytes) * 100) : 0
     const pendingBytes = Math.max(0, Number(data.pending_bytes) || 0)
+    const reportedAfterBytes = Number.isFinite(data.bytes_on_disk)
+      ? Math.max(0, data.bytes_on_disk)
+      : null
     const savedBytes = Number.isFinite(data.saved_by_sharing)
       ? Math.max(0, data.saved_by_sharing)
-      : (IS_APP_MODE ? Math.max(0, beforeBytes - afterBytes) : 0)
+      : (IS_APP_MODE && reportedAfterBytes !== null
+          ? Math.max(0, beforeBytes - reportedAfterBytes)
+          : 0)
+    const afterBytes = reportedAfterBytes === null
+      ? Math.max(0, beforeBytes - savedBytes)
+      : reportedAfterBytes
+    const afterRatio = beforeBytes ? Math.min(100, (afterBytes / beforeBytes) * 100) : 0
     const headline = incomplete
       ? (savedBytes
           ? COPY.at_least_saved.replace("{size}", fmt(savedBytes))
@@ -956,10 +964,12 @@ const renderOverview = () => {
               : `${fmt(savedBytes)} ${COPY.disk_space_saved}`)
           : COPY.no_space_saved)
         : (IS_APP_MODE ? COPY.find_app_savings : COPY.find_savings)
-    const help = IS_APP_MODE ? COPY.effective_help : COPY.before_help
+    const help = incomplete
+      ? COPY.partial_metrics_help
+      : IS_APP_MODE ? COPY.effective_help : COPY.before_help
     const helpId = IS_APP_MODE ? "vault-after-help" : "vault-before-help"
     const helpMarkup = `<button class="vault-compare-info" type="button" aria-describedby="${helpId}" aria-label="${attr(help)}"><i class="fa-regular fa-circle-question" aria-hidden="true"></i></button>`
-    const comparison = metricsExact ? `
+    const comparison = metricsAvailable ? `
       <div class="vault-comparison" aria-label="${attr(`${COPY.before}: ${fmt(beforeBytes)}. ${COPY.after}: ${fmt(afterBytes)}.`)}">
         <div class="vault-compare-row">
           <span class="vault-compare-label">${esc(COPY.before)}${IS_APP_MODE ? "" : helpMarkup}</span>
@@ -992,7 +1002,7 @@ const renderOverview = () => {
       </div>
       <div class="vault-summary-side">${opportunity}${opportunity ? `<span class="vault-summary-divider" aria-hidden="true"></span>` : ""}<span class="vault-summary-freshness">${esc(freshness)}</span></div>`
     document.querySelectorAll("body > .vault-compare-tooltip").forEach((tooltip) => tooltip.remove())
-    if (metricsExact) {
+    if (metricsAvailable) {
       const tooltip = document.createElement("span")
       tooltip.id = helpId
       tooltip.className = "vault-compare-tooltip"

package/test/vault-ui.test.js

@@ -1445,6 +1445,65 @@ describe('vault dashboard backend (phase 4)', () => {
     dom.window.close()
   })
 
+  test('an incomplete scan keeps a qualified Before and After comparison', async () => {
+    const views = path.resolve(__dirname, '..', 'server', 'views')
+    const workspace = await ejs.renderFile(
+      path.resolve(views, 'partials', 'vault_workspace.ejs'),
+      { appMode: false }
+    )
+    const dom = new JSDOM(`<body data-vault-mode="global">${workspace}</body>`, {
+      url: 'http://localhost/vault', runScripts: 'dangerously'
+    })
+    const gb = 1024 ** 3
+    dom.window.fetch = async () => ({
+      ok: true,
+      json: async () => ({
+        enabled: true,
+        mode: 'link',
+        scan: { active: false, pending: false, queued: 0, phase: 'incomplete', scope_id: null },
+        last_scan: null,
+        last_attempt: {
+          ts: Date.now(),
+          complete: false,
+          bytes_total: 500 * gb,
+          unreadable: [{ path: '/pinokio/api/app/private', code: 'EACCES' }]
+        },
+        incomplete: true,
+        metrics_exact: false,
+        bytes_on_disk: null,
+        bytes_without_sharing: null,
+        saved_by_sharing: 100 * gb,
+        pending_bytes: 0,
+        reclaimable: 0,
+        activity_error: null,
+        cloud_sync_warning: null,
+        sources: [],
+        blobs: [],
+        duplicates: [],
+        excluded: [],
+        events: [],
+        undo_batches: []
+      })
+    })
+    await runVaultScript(dom)
+    await new Promise((resolve) => setTimeout(resolve, 25))
+
+    assert.strictEqual(
+      dom.window.document.querySelector('.vault-summary-value').textContent,
+      'At least 107.37 GB saved'
+    )
+    assert.deepStrictEqual(
+      [...dom.window.document.querySelectorAll('.vault-compare-value')].map((node) => node.textContent),
+      ['536.87 GB', '429.5 GB']
+    )
+    assert.strictEqual(
+      dom.window.document.getElementById('vault-before-help').textContent,
+      'Based on the latest scan. Unreadable paths may not be included.'
+    )
+    assert.match(dom.window.document.querySelector('.vault-result').textContent, /Scan incomplete/)
+    dom.window.close()
+  })
+
   test('undo sharing explains each safe refusal instead of showing a generic failure', async () => {
     const source = await fs.promises.readFile(path.resolve(__dirname, '..', 'server', 'public', 'vault.js'), 'utf8')
     assert.match(source, /const detachFeedback = \(result\) =>/)