pinokiod 8.0.49 → 8.0.50

package/package.json

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

package/server/public/vault.css

@@ -473,16 +473,26 @@ body[data-vault-mode="app"] .vault-overview {
 .vault-cloud-warning .vault-text-button { margin-left: auto; }
 .vault-cleanup-notice {
   flex: 0 0 auto;
-  background: color-mix(in srgb, var(--task-accent) 5%, var(--task-panel));
+  border-bottom-color: color-mix(in srgb, var(--vault-warning) 45%, var(--task-border));
+  background: color-mix(in srgb, var(--vault-warning) 16%, var(--task-panel));
 }
-.vault-cleanup-notice > i { color: var(--task-accent); }
+.vault-cleanup-notice > i { color: var(--vault-warning); }
 .vault-cleanup-notice strong { flex: 0 0 auto; font-weight: 650; }
 .vault-cleanup-notice-detail {
   min-width: 0;
   flex: 1 1 auto;
-  color: var(--task-muted);
+  color: color-mix(in srgb, var(--task-text) 78%, var(--vault-warning));
+}
+.vault-cleanup-notice .vault-button {
+  flex: 0 0 auto;
+  margin-left: auto;
+  border-color: color-mix(in srgb, var(--vault-warning) 70%, var(--task-border-strong));
+  background: var(--task-panel);
+  font-weight: 650;
+}
+.vault-cleanup-notice .vault-button:hover {
+  background: color-mix(in srgb, var(--vault-warning) 12%, var(--task-panel));
 }
-.vault-cleanup-notice .vault-button { flex: 0 0 auto; margin-left: auto; }
 .vault-explorer {
   display: grid;
   min-height: 0;

package/server/public/vault.js

@@ -22,11 +22,12 @@ const COPY = {
   external_other_disk: "Added to Locations. It can be scanned, but files on this disk cannot be deduplicated with files in your Pinokio folder.",
   pinokio_folder: "Pinokio folder",
   save_space: "Save space",
-  disk_space_saved: "of disk space saved",
-  saved_for_app: "{size} saved for this app",
-  before: "Before",
-  before_help: "Estimated size of every scanned location if each app stored its own copy. File Explorer may count deduplicated files differently.",
-  after: "After",
+  disk_space_freed: "of disk space freed",
+  sharing_saves_for_app: "Sharing saves {size} for this app",
+  without_sharing: "Without sharing",
+  without_sharing_help: "Estimated size of every scanned location if each app stored its own copy. File Explorer may count deduplicated files differently.",
+  on_disk: "On disk",
+  app_share: "This app’s share",
   effective_help: "For deduplicated files, disk usage is divided evenly among every location using them.",
   nothing_more_to_save: "Nothing else to save",
   more_can_be_saved: "{size} more can be saved",
@@ -36,7 +37,8 @@ const COPY = {
   find_savings: "Scan to find duplicate files and save disk space",
   find_app_savings: "Scan this app to find duplicate files and save disk space",
   storage_details: "Storage details",
-  saved_by_actions: "Saved by your actions",
+  kept_deduplicated: "Kept deduplicated",
+  already_shared: "Already shared before Save space",
   last_scanned: "Last scanned",
   never: "Never",
   scan: "Scan now",
@@ -939,23 +941,31 @@ const renderOverview = () => {
         (!!last || beforeBytes > 0 || afterBytes > 0 || Number(data.pending_bytes) > 0)
     const afterRatio = beforeBytes ? Math.min(100, (afterBytes / beforeBytes) * 100) : 0
     const pendingBytes = Math.max(0, Number(data.pending_bytes) || 0)
+    // The headline reports bytes actually freed by user actions, so it always
+    // survives a comparison against the OS file manager. Sharing that already
+    // existed when a scan adopted it (package-manager hardlinks, earlier runs)
+    // never changed free space and stays out of this number.
+    const freedBytes = Math.max(0, Number(data.lifetime_bytes_saved) || 0)
+    const sharedNow = Math.max(0, Number(data.saved_by_sharing) || 0)
     const headline = hasComparison
       ? (IS_APP_MODE
-          ? COPY.saved_for_app.replace("{size}", fmt(Math.max(0, beforeBytes - afterBytes)))
-          : `${fmt(data.saved_by_sharing)} ${COPY.disk_space_saved}`)
+          ? COPY.sharing_saves_for_app.replace("{size}", fmt(Math.max(0, beforeBytes - afterBytes)))
+          : `${fmt(freedBytes)} ${COPY.disk_space_freed}`)
       : (IS_APP_MODE ? COPY.find_app_savings : COPY.find_savings)
-    const help = IS_APP_MODE ? COPY.effective_help : COPY.before_help
+    const beforeLabel = COPY.without_sharing
+    const afterLabel = IS_APP_MODE ? COPY.app_share : COPY.on_disk
+    const help = IS_APP_MODE ? COPY.effective_help : COPY.without_sharing_help
     const helpId = IS_APP_MODE ? "vault-after-help" : "vault-before-help"
     const helpMarkup = `<span class="vault-compare-info" tabindex="0" aria-describedby="${helpId}"><i class="fa-regular fa-circle-question" aria-hidden="true"></i><span class="vault-compare-tooltip" id="${helpId}" role="tooltip">${esc(help)}</span></span>`
     const comparison = hasComparison ? `
-      <div class="vault-comparison" aria-label="${attr(`${COPY.before}: ${fmt(beforeBytes)}. ${COPY.after}: ${fmt(afterBytes)}.`)}">
+      <div class="vault-comparison" aria-label="${attr(`${beforeLabel}: ${fmt(beforeBytes)}. ${afterLabel}: ${fmt(afterBytes)}.`)}">
         <div class="vault-compare-row">
-          <span class="vault-compare-label">${esc(COPY.before)}${IS_APP_MODE ? "" : helpMarkup}</span>
+          <span class="vault-compare-label">${esc(beforeLabel)}${IS_APP_MODE ? "" : helpMarkup}</span>
           <span class="vault-compare-track"><span class="vault-compare-fill before"></span></span>
           <span class="vault-compare-value">${fmt(beforeBytes)}</span>
         </div>
         <div class="vault-compare-row">
-          <span class="vault-compare-label">${esc(COPY.after)}${IS_APP_MODE ? helpMarkup : ""}</span>
+          <span class="vault-compare-label">${esc(afterLabel)}${IS_APP_MODE ? helpMarkup : ""}</span>
           <span class="vault-compare-track"><span class="vault-compare-fill after" style="--vault-after-ratio:${afterRatio.toFixed(2)}%"></span></span>
           <span class="vault-compare-value">${fmt(afterBytes)}</span>
         </div>
@@ -976,10 +986,14 @@ const renderOverview = () => {
     const storageDetails = !IS_APP_MODE && el("vault-storage-details")
     if (storageDetails) {
       const homeBytes = last ? (last.home_bytes_total == null ? last.bytes_total : last.home_bytes_total) : null
+      // Clamped because deleting linked files later shrinks the live sharing
+      // total without touching the lifetime counter.
+      const alreadyShared = Math.max(0, sharedNow - freedBytes)
       storageDetails.innerHTML = `<div class="vault-advanced-title">${esc(COPY.storage_details)}</div>
         <dl class="vault-storage-list">
           <div><dt>${esc(COPY.pinokio_folder)}</dt><dd>${homeBytes == null ? "—" : fmt(homeBytes)}</dd></div>
-          <div><dt>${esc(COPY.saved_by_actions)}</dt><dd>${fmt(data.lifetime_bytes_saved)}</dd></div>
+          <div><dt>${esc(COPY.kept_deduplicated)}</dt><dd>${fmt(sharedNow)}</dd></div>
+          <div><dt>${esc(COPY.already_shared)}</dt><dd>${fmt(alreadyShared)}</dd></div>
         </dl>`
     }
   }

package/test/vault-ui.test.js

@@ -1260,11 +1260,11 @@ describe('vault dashboard backend (phase 4)', () => {
 
   test('repair is advanced, metrics distinguish detected and explicit savings, and refresh retries', async () => {
     const vaultPage = await vaultPageSource()
-    assert.match(vaultPage, /disk_space_saved:\s*"of disk space saved"/)
-    assert.match(vaultPage, /before_help:\s*"Estimated size of every scanned location if each app stored its own copy\. File Explorer may count deduplicated files differently\."/)
+    assert.match(vaultPage, /disk_space_freed:\s*"of disk space freed"/)
+    assert.match(vaultPage, /without_sharing_help:\s*"Estimated size of every scanned location if each app stored its own copy\. File Explorer may count deduplicated files differently\."/)
     assert.match(vaultPage, /nothing_more_to_save:\s*"Nothing else to save"/)
     assert.match(vaultPage, /more_can_be_saved:\s*"\{size\} more can be saved"/)
-    assert.match(vaultPage, /fmt\(data\.saved_by_sharing\)/)
+    assert.match(vaultPage, /Number\(data\.saved_by_sharing\)/)
     assert.match(vaultPage, /Number\(data\.bytes_without_sharing\)/)
     assert.match(vaultPage, /Number\(data\.bytes_on_disk\)/)
     assert.match(vaultPage, /Number\(data\.pending_bytes\)/)
@@ -1276,7 +1276,8 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.match(vaultPage, /candidate_size:\s*candidateSize\(\)/)
     assert.match(vaultPage, /localStorage\.setItem\(candidateSizeKey/)
     assert.match(vaultPage, /id='vault-storage-details'/)
-    assert.match(vaultPage, /fmt\(data\.lifetime_bytes_saved\)/)
+    assert.match(vaultPage, /Number\(data\.lifetime_bytes_saved\)/)
+    assert.match(vaultPage, /Math\.max\(0, sharedNow - freedBytes\)/)
     assert.match(vaultPage, /repair_index:\s*"Repair index"/)
     assert.match(vaultPage, /<details class='vault-advanced'/)
     assert.doesNotMatch(vaultPage, /id='btn-rebuild'/)
@@ -1525,7 +1526,7 @@ describe('vault dashboard backend (phase 4)', () => {
     await runVaultScript(dom)
     await new Promise((resolve) => setTimeout(resolve, 25))
 
-    assert.strictEqual(dom.window.document.querySelector('.vault-summary-value').textContent, '4.51 GB saved for this app')
+    assert.strictEqual(dom.window.document.querySelector('.vault-summary-value').textContent, 'Sharing saves 4.51 GB for this app')
     assert.deepStrictEqual([...dom.window.document.querySelectorAll('.vault-compare-value')].map((node) => node.textContent), ['7.09 GB', '2.58 GB'])
     assert.match(dom.window.document.querySelector('.vault-compare-fill.after').getAttribute('style'), /--vault-after-ratio:36\.36%/)
     assert.strictEqual(dom.window.document.getElementById('vault-after-help').textContent,
@@ -1601,8 +1602,8 @@ describe('vault dashboard backend (phase 4)', () => {
     await runVaultScript(dom)
     await new Promise((resolve) => setTimeout(resolve, 25))
 
-    assert.strictEqual(dom.window.document.querySelector('.vault-summary-value').textContent, '256.95 GB of disk space saved')
-    assert.deepStrictEqual([...dom.window.document.querySelectorAll('.vault-compare-label')].map((node) => node.firstChild.textContent.trim()), ['Before', 'After'])
+    assert.strictEqual(dom.window.document.querySelector('.vault-summary-value').textContent, '258.77 GB of disk space freed')
+    assert.deepStrictEqual([...dom.window.document.querySelectorAll('.vault-compare-label')].map((node) => node.firstChild.textContent.trim()), ['Without sharing', 'On disk'])
     assert.deepStrictEqual([...dom.window.document.querySelectorAll('.vault-compare-value')].map((node) => node.textContent), ['661.75 GB', '404.8 GB'])
     assert.match(dom.window.document.querySelector('.vault-compare-fill.after').getAttribute('style'), /--vault-after-ratio:61\.17%/)
     assert.strictEqual(dom.window.document.getElementById('vault-before-help').textContent,
@@ -1613,7 +1614,10 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('primary'), true)
     assert.strictEqual(dom.window.document.getElementById('btn-scan').classList.contains('primary'), false)
     assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Pinokio folder\s*166\.22 GB/)
-    assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Saved by your actions\s*258\.77 GB/)
+    assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Kept deduplicated\s*256\.95 GB/)
+    // lifetime (241) exceeds live sharing (239.3) here, so the clamp keeps
+    // the pre-existing figure at zero instead of going negative.
+    assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Already shared before Save space\s*0 B/)
     const cleanupNotice = dom.window.document.getElementById('vault-cleanup-notice')
     assert.strictEqual(cleanupNotice.classList.contains('show'), true)
     assert.match(cleanupNotice.textContent, /ready to clean up/)
@@ -1684,7 +1688,7 @@ describe('vault dashboard backend (phase 4)', () => {
     await new Promise((resolve) => setTimeout(resolve, 25))
 
     assert.strictEqual(dom.window.document.querySelector('.vault-summary-value').textContent,
-      '3 GB of disk space saved')
+      '3 GB of disk space freed')
     assert.deepStrictEqual(
       [...dom.window.document.querySelectorAll('.vault-compare-value')].map((node) => node.textContent),
       ['10 GB', '7 GB'])