pinokiod 8.0.46 → 8.0.47

package/kernel/vault/constants.js

@@ -1,5 +1,11 @@
+const CANDIDATE_SIZE_BASE = process.platform === "win32" ? 1024 : 1000
+const CANDIDATE_SIZE_OPTIONS = [10, 50, 100, 500]
+  .map((value) => value * CANDIDATE_SIZE_BASE ** 2)
+  .concat(CANDIDATE_SIZE_BASE ** 3)
+
 module.exports = {
-  SIZE_THRESHOLD: 100 * 1024 * 1024,
+  SIZE_THRESHOLD: CANDIDATE_SIZE_OPTIONS[2],
+  CANDIDATE_SIZE_OPTIONS,
   TMP_SUFFIX: ".pinokio-dedup-tmp",
   SHA256_RE: /^[0-9a-f]{64}$/,
   ENTRY_BATCH_SIZE: 256,

package/kernel/vault/index.js

@@ -7,8 +7,8 @@ const Sweeper = require('./sweeper')
 const { walkBatches, statMany } = require('./walker')
 const { fileSnapshot, sameSnapshot, sameContentState } = require('./snapshot')
 const {
-  SIZE_THRESHOLD, TMP_SUFFIX, SHA256_RE, DIR_CONCURRENCY, STAT_CONCURRENCY,
-  HASH_INACTIVITY_MS
+  SIZE_THRESHOLD, CANDIDATE_SIZE_OPTIONS, TMP_SUFFIX, SHA256_RE,
+  DIR_CONCURRENCY, STAT_CONCURRENCY, HASH_INACTIVITY_MS
 } = require('./constants')
 
 // Shared model store engine (spec/requirements/shared-model-store.md).
@@ -171,9 +171,10 @@ class Vault {
       if (this.fileActionProgress === progress) this.fileActionProgress = null
     }
   }
-  startScan(scopeId = null) {
+  startScan(scopeId = null, sizeThreshold = this.sizeThreshold) {
     if (!this.enabled || !this.sweeper) return { started: false, disabled: true }
     if (this.scanPromise) return { started: false, already_running: true }
+    this.sizeThreshold = sizeThreshold
     this.scanError = null
     this.scanScopeId = scopeId
     this.scanPromise = this.runExclusive(() => this.sweeper.scan(scopeId))
@@ -204,11 +205,19 @@ class Vault {
           }
         }
       }
-      case "scan":
+      case "scan": {
         if (payload.scope_id && !this.scanSource(payload.scope_id)) {
           return { error: "That scan location is no longer available." }
         }
-        return this.startScan(payload.scope_id || null)
+        let sizeThreshold = this.sizeThreshold
+        if (payload.candidate_size != null) {
+          if (!CANDIDATE_SIZE_OPTIONS.includes(payload.candidate_size)) {
+            return { error: "Choose a valid minimum file size." }
+          }
+          sizeThreshold = payload.candidate_size
+        }
+        return this.startScan(payload.scope_id || null, sizeThreshold)
+      }
       case "deduplicate":
         if (typeof payload.path === "string" && payload.path) {
           return this.runMutation(() => this.runFileAction({

package/package.json

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

package/server/public/vault.css

@@ -29,7 +29,10 @@ body.dark.vault-page {
   min-height: 0;
   overflow: hidden;
 }
-.vault-embed-main .vault-shell { width: 100%; }
+.vault-embed-main .vault-shell {
+  width: 100%;
+  height: 100%;
+}
 body.vault-page .task-container {
   display: flex;
   min-height: 0;
@@ -924,6 +927,8 @@ body.dark .vault-row-action .vault-text-button:hover:not(:disabled) {
 }
 @media (max-width: 820px) {
   body.vault-page .task-container { display: block; overflow-y: auto; }
+  .vault-embed-main { overflow-y: auto; }
+  .vault-embed-main .vault-shell { height: auto; }
   .vault-shell,
   .vault-shell .task-shell-body,
   .vault-body { height: auto; overflow: visible; }

package/server/public/vault.js

@@ -42,6 +42,7 @@ const COPY = {
   scan_app: "Scan this app",
   scan_again: "Scan again",
   scanning: "Scanning…",
+  minimum_file_size: "Minimum file size to scan",
   scanning_elsewhere: "Another location is being scanned",
   scanning_elsewhere_hint: "This app can be scanned when the current scan finishes.",
   vault_options: "Save space options",
@@ -168,7 +169,7 @@ const COPY = {
   no_activity_hint: "Scans and actions will be recorded here.",
   view_all: "View all files",
   show_all_locations: "Show all locations",
-  tracked_note: "Only files 100 MB and larger appear here. Files keep their current locations.",
+  tracked_note: "Only files {size} and larger appear here. Files keep their current locations.",
   duplicate_note: "Only files waiting for review are shown.",
   reclaimable_note: "These copies are no longer used by any configured location. Deleting them frees disk space.",
   converted: "Deduplicated",
@@ -197,6 +198,11 @@ const statusUrl = (progress = false) => {
   return `/info/dedup${suffix ? `?${suffix}` : ""}`
 }
 const reviewedScanKey = `pinokio:vault:reviewed-scan:${SCOPE_ID || "global"}`
+const candidateSizeKey = "pinokio:vault:candidate-size"
+const candidateSizeBase = document.body.dataset.platform === "win32" ? 1024 : 1000
+const candidateSizeOptions = [10, 50, 100, 500]
+  .map((value) => value * candidateSizeBase ** 2)
+  .concat(candidateSizeBase ** 3)
 
 const state = {
   data: null,
@@ -224,6 +230,10 @@ const esc = (value) => String(value == null ? "" : value).replace(/[&<>"']/g, (c
 }[char]))
 const attr = esc
 const fmt = window.PinokioFormatStorageSize
+const candidateSize = () => {
+  const value = Number(el("vault-candidate-size").value)
+  return candidateSizeOptions.includes(value) ? value : candidateSizeOptions[2]
+}
 const countLabel = (count, singular = COPY.file, plural = COPY.files) => `${count} ${count === 1 ? singular : plural}`
 const basename = (value) => String(value || "").split(/[\\/]/).filter(Boolean).pop() || ""
 const dirname = (value) => {
@@ -875,6 +885,7 @@ const renderOverview = () => {
     ? `<i class="fa-solid fa-circle-notch fa-spin"></i>${esc(COPY.scanning)}`
     : `<i class="fa-solid fa-rotate"></i>${esc(last ? COPY.scan_again : (IS_APP_MODE ? COPY.scan_app : COPY.scan))}`
   el("btn-scan").disabled = activeScan
+  el("vault-candidate-size").disabled = activeScan
   const optionsButton = el("btn-vault-options")
   const repairTitle = el("vault-repair-title")
   const repairDescription = el("vault-repair-description")
@@ -1114,7 +1125,7 @@ const render = () => {
     el("vault-explorer").style.display = "none"
     return
   }
-  el("vault-explorer").style.display = "grid"
+  el("vault-explorer").style.display = ""
   const items = buildItems()
   renderViews(items)
   renderLocations(items)
@@ -1133,7 +1144,9 @@ const render = () => {
   } else {
     el("vault-pane-footer").textContent = state.view === "duplicates"
       ? COPY.duplicate_note
-      : state.view === "reclaimable" ? COPY.reclaimable_note : COPY.tracked_note
+      : state.view === "reclaimable"
+        ? COPY.reclaimable_note
+        : COPY.tracked_note.replace("{size}", fmt(candidateSize()))
   }
 }
 
@@ -1468,7 +1481,11 @@ document.addEventListener("click", async (event) => {
     state.scanProblemsOpen = false
     state.feedback = null
     try {
-      const result = await post({ action: "scan", scope_id: SCOPE_ID })
+      const result = await post({
+        action: "scan",
+        scope_id: SCOPE_ID,
+        candidate_size: candidateSize()
+      })
       if (result.error) throw new Error(result.error)
       await refresh()
     } catch (error) {
@@ -1584,12 +1601,29 @@ document.addEventListener("input", (event) => {
   renderActionProgress()
 })
 document.addEventListener("change", (event) => {
+  if (event.target.id === "vault-candidate-size") {
+    try { localStorage.setItem(candidateSizeKey, String(candidateSize())) } catch (error) {}
+    render()
+    return
+  }
   if (event.target.id !== "vault-status-filter") return
   state.statusFilter = event.target.value
   render()
 })
 
 el("btn-scan").textContent = COPY.scan
+const candidateSizeSelect = el("vault-candidate-size")
+candidateSizeSelect.setAttribute("aria-label", COPY.minimum_file_size)
+candidateSizeSelect.innerHTML = candidateSizeOptions
+  .map((size) => `<option value="${size}">${fmt(size)}+</option>`)
+  .join("")
+candidateSizeSelect.value = String(candidateSizeOptions[2])
+try {
+  const storedCandidateSize = Number(localStorage.getItem(candidateSizeKey))
+  if (candidateSizeOptions.includes(storedCandidateSize)) {
+    candidateSizeSelect.value = String(storedCandidateSize)
+  }
+} catch (error) {}
 const addSourceButton = el("btn-add-source")
 if (addSourceButton) {
   addSourceButton.setAttribute("aria-label", COPY.add_external_folder)

package/server/views/partials/vault_workspace.ejs

@@ -4,6 +4,7 @@
       <section class='vault-overview'>
         <div class='vault-metrics' id='vault-metrics'></div>
         <div class='vault-overview-actions'>
+          <select class='vault-select' id='vault-candidate-size'></select>
           <button class='vault-button' id='btn-scan' type='button'></button>
           <% if (!appMode) { %>
           <details class='vault-advanced' id='vault-advanced'>

package/test/vault-ui.test.js

@@ -7,6 +7,7 @@ const crypto = require('crypto')
 const ejs = require('ejs')
 const { JSDOM } = require('jsdom')
 const Vault = require('../kernel/vault')
+const { CANDIDATE_SIZE_OPTIONS } = require('../kernel/vault/constants')
 
 const sha256 = (buf) => crypto.createHash('sha256').update(buf).digest('hex')
 
@@ -66,6 +67,29 @@ describe('vault dashboard backend (phase 4)', () => {
     return { content, hash, a, b }
   }
 
+  test('scan requests accept only supported minimum file sizes', async () => {
+    const { vault } = await makeEnv()
+    let startedWith = null
+    vault.startScan = (scopeId, sizeThreshold) => {
+      startedWith = { scopeId, sizeThreshold }
+      return { started: true }
+    }
+
+    const accepted = await vault.perform('scan', {
+      candidate_size: CANDIDATE_SIZE_OPTIONS[1]
+    })
+    assert.deepStrictEqual(accepted, { started: true })
+    assert.deepStrictEqual(startedWith, {
+      scopeId: null,
+      sizeThreshold: CANDIDATE_SIZE_OPTIONS[1]
+    })
+
+    startedWith = null
+    const rejected = await vault.perform('scan', { candidate_size: 1 })
+    assert.deepStrictEqual(rejected, { error: 'Choose a valid minimum file size.' })
+    assert.strictEqual(startedWith, null)
+  })
+
   test('item 15: undo of a conversion batch restores independent files', async () => {
     const { home, vault } = await makeEnv()
     const { content, a, b } = await makeSharedPair(home, vault)
@@ -1090,6 +1114,9 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.match(vaultPage, /\.vault-button\.primary \{[\s\S]*?background:\s*var\(--task-accent-contrast\)[\s\S]*?color:\s*#101828/)
     assert.match(vaultPage, /id="btn-review-result"/)
     assert.match(vaultPage, /class='vault-button' id='btn-scan'/)
+    assert.match(vaultPage, /id='vault-candidate-size'/)
+    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, /repair_index:\s*"Repair index"/)
@@ -1201,6 +1228,18 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.ok(appTemplate.indexOf("id='save-space-tab'") < appTemplate.indexOf('class="app-autolaunch"'))
     assert.match(globalTemplate, /include\('partials\/vault_workspace', \{ appMode: false \}\)/)
     assert.match(embeddedTemplate, /include\('partials\/vault_workspace', \{ appMode: true \}\)/)
+    const vaultStyles = await fs.promises.readFile(
+      path.resolve(__dirname, '..', 'server', 'public', 'vault.css'), 'utf8')
+    assert.match(vaultStyles, /\.vault-embed-main \.vault-shell \{[\s\S]*?height:\s*100%;[\s\S]*?\}/)
+    const compactStart = vaultStyles.indexOf('@media (max-width: 820px)')
+    const compactEnd = vaultStyles.indexOf('@media (pointer: coarse)', compactStart)
+    assert.ok(compactStart >= 0 && compactEnd > compactStart)
+    const compactStyles = vaultStyles.slice(compactStart, compactEnd)
+    assert.match(compactStyles, /\.vault-embed-main \{ overflow-y: auto; \}/)
+    assert.match(compactStyles, /\.vault-embed-main \.vault-shell \{ height: auto; \}/)
+    const vaultScript = await fs.promises.readFile(
+      path.resolve(__dirname, '..', 'server', 'public', 'vault.js'), 'utf8')
+    assert.match(vaultScript, /el\("vault-explorer"\)\.style\.display = ""/)
 
     const html = await ejs.renderFile(path.resolve(views, 'vault_app.ejs'), {
       theme: 'light', platform: 'darwin', agent: 'electron', scope_id: 'app:appB'
@@ -1282,6 +1321,15 @@ describe('vault dashboard backend (phase 4)', () => {
 
     assert.deepStrictEqual(requests, ['/info/dedup?scope_id=app%3AappB'])
     assert.match(dom.window.document.getElementById('btn-scan').textContent, /Scan this app/)
+    const candidateSize = dom.window.document.getElementById('vault-candidate-size')
+    assert.deepStrictEqual([...candidateSize.options].map((option) => option.textContent),
+      ['10 MB+', '50 MB+', '100 MB+', '500 MB+', '1 GB+'])
+    assert.strictEqual(candidateSize.value, '100000000')
+    candidateSize.value = '50000000'
+    candidateSize.dispatchEvent(new dom.window.Event('change', { bubbles: true }))
+    assert.strictEqual(dom.window.localStorage.getItem('pinokio:vault:candidate-size'), '50000000')
+    assert.match(dom.window.document.getElementById('vault-pane-footer').textContent,
+      /Only files 50 MB and larger/)
     assert.strictEqual(dom.window.document.querySelector('[data-source="app:appB"]').getAttribute('aria-current'), 'page')
     assert.strictEqual(dom.window.document.getElementById('btn-add-source'), null)
     assert.strictEqual(dom.window.document.getElementById('btn-repair'), null)