pinokiod 8.0.107 → 8.0.110

package/kernel/vault/index.js

@@ -1,8 +1,8 @@
 const fs = require("fs")
 const path = require("path")
 const crypto = require("crypto")
-const { execFile } = require("child_process")
 const { Worker } = require("worker_threads")
+const Util = require("../util")
 const Registry = require("./registry")
 const Scanner = require("./scanner")
 const Sweeper = require("./sweeper")
@@ -188,41 +188,11 @@ class FileActionChanges {
   }
 }
 
-const revealInFileManager = (filePath, platform = process.platform) =>
-  new Promise((resolve, reject) => {
-    const command = platform === "darwin"
-      ? "open"
-      : platform === "win32"
-        ? "explorer.exe"
-        : "xdg-open"
-    const args = platform === "darwin"
-      ? ["-R", filePath]
-      : platform === "win32"
-        ? [`/select,${filePath}`]
-        : [path.dirname(filePath)]
-    execFile(command, args, {
-      timeout: 10000,
-      windowsHide: true
-    }, (error) => {
-      // Explorer reports a non-zero exit code even when it opens the folder,
-      // so an exit status alone is not a failure on Windows. A missing binary
-      // or a refused spawn still is.
-      if (error && platform === "win32" && Number.isInteger(error.code)) {
-        resolve()
-        return
-      }
-      error ? reject(error) : resolve()
-    })
-  })
-
 class Vault {
   constructor(kernel) {
     this.kernel = kernel
     this.fileManagerLauncher = (filePath) =>
-      revealInFileManager(
-        filePath,
-        this.kernel.platform || process.platform
-      )
+      Util.openfs(filePath, { action: "view" }, this.kernel)
     this.enabled = false
     this.initialized = false
     this.mode = null
@@ -3320,18 +3290,13 @@ class Vault {
   }
 
   publicDuplicateChildItems(rows) {
-    const publicStatus = {
-      reference: "tracked",
-      duplicate: "duplicate",
-      linked: "shared"
-    }
     return (rows || []).map((row) => Object.assign({
       kind: "duplicate_path",
       path: row.path,
       hash: row.hash,
       size: Number(row.size) || 0,
       app: row.app || null,
-      status: publicStatus[row.status],
+      status: PUBLIC_FILE_STATUS[row.status],
       registry_status: row.status,
       shareable: row.status === "duplicate",
       selectable: !!row.selectable

package/package.json

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

package/server/index.js

@@ -1833,6 +1833,13 @@ class Server {
     const dev_initial_tab = type === "browse" && req.query && req.query.pinokio_dev_tab === "files"
       ? "files"
       : "plugins"
+    // Disk Saver hands one content group to another app: the page opens with
+    // its Disk Saver tab selected and that group already expanded.
+    const vault_initial_group = req.query &&
+      typeof req.query.vault_group === "string" &&
+      /^[a-f0-9]{64}$/i.test(req.query.vault_group)
+      ? req.query.vault_group.toLowerCase()
+      : null
 
     const registryEnabled = await this.isRegistryEnabled().catch(() => false)
     let community_url = ""
@@ -1956,6 +1963,7 @@ class Server {
       tabs: savedTabs,
       editor_tab: editor_tab,
       dev_initial_tab,
+      vault_initial_group,
       config,
       protection_enabled: protectionPreference ? protectionPreference.protection_enabled !== false : false,
       autolaunch_app: autolaunchAppState,

package/server/public/vault.js

@@ -238,7 +238,7 @@ const COPY = {
   show_more_copies: "Show {count} more copies",
   loading_locations: "Loading locations…",
   open_in_disk_saver: "Open this file in Disk Saver",
-  open_location_confirm: "Open Disk Saver for {location}?",
+  open_location_confirm: "Open Disk Saver to review {location}?",
   open_location_accept: "Open",
   show_more_locations: "Show {count} more locations",
   making_separate: "Making file separate",
@@ -658,23 +658,22 @@ const confirmLeave = (message, confirmLabel) => new Promise((resolve) => {
 const openGlobalWorkspace = () => {
   window.parent.location.assign("/vault")
 }
-// A copy that belongs to another app opens that app's own workspace, where it
-// can actually be acted on; caches and external folders have no app page, so
-// they open the global one. Accepting replaces the parent window, because this
-// workspace can be embedded in an app page and navigating in place would nest a
-// second copy of the interface inside that frame.
+// A copy in another app opens that app's page with its Disk Saver tab selected
+// and the group expanded, because an app's workspace only exists inside that
+// page; opening the workspace URL directly strands the user with no navigation.
+// Locations that are not apps have no such page and open the global workspace.
+// The label and kind travel with the row: an app workspace cannot look up
+// sources belonging to other apps.
 const openContentGroup = async (group, kind, label) => {
-  // The label and kind travel with the row: an app workspace cannot look up
-  // sources belonging to other apps, so a lookup here would name every one of
-  // them "unknown" and send them all to the global page.
-  const app = kind === "app" && label ? label : null
-  const name = label || COPY.unknown_location
   const accepted = await confirmLeave(
-    COPY.open_location_confirm.replace("{location}", name),
+    COPY.open_location_confirm.replace(
+      "{location}", label || COPY.unknown_location),
     COPY.open_location_accept)
   if (!accepted) return
-  const base = app ? `/vault/app/${encodeURIComponent(app)}` : "/vault"
-  window.parent.location.assign(`${base}?group=${encodeURIComponent(group)}`)
+  const target = kind === "app" && label
+    ? `/pinokio/browser/${encodeURIComponent(label)}?vault_group=${encodeURIComponent(group)}`
+    : `/vault?group=${encodeURIComponent(group)}`
+  window.parent.location.assign(target)
 }
 const applyAutomaticScanSnapshot = (snapshot) => {
   if (!IS_APP_MODE || !AUTOMATIC_SUPPORTED) return

package/server/views/app.ejs

@@ -8694,7 +8694,7 @@ body.dark .pinokio-custom-terminal-header {
         <% const vaultAutomaticSupported = typeof vault_automatic_supported === 'undefined' || vault_automatic_supported === true %>
         <% const vaultAutomaticResultSignature = vaultAutomaticSupported && typeof vault_automatic_result_signature === 'string' ? vault_automatic_result_signature : '' %>
         <% const vaultSidebarLabel = !vaultGlobalScanReady ? 'Disk Saver — Set up required' : vaultAutomaticSupported ? `Disk Saver — ${vaultAutomaticMode === 'automatic' ? 'Automatic' : 'Manual'} checking${vaultAutomaticResultSignature ? ' — Duplicate files found' : ''}` : 'Disk Saver' %>
-        <a id='save-space-tab' data-mode="refresh" target="app-vault" href="/vault/app/<%=encodeURIComponent(name)%>" class="btn header-item frame-link<%=vaultAutomaticResultSignature ? ' app-vault-result-attention' : ''%>" data-index="vault" data-static="retain" data-tab-link-popover="false" aria-label="<%=vaultSidebarLabel%>">
+        <a id='save-space-tab' data-mode="refresh" target="app-vault" href="/vault/app/<%=encodeURIComponent(name)%><%=typeof vault_initial_group === 'string' && vault_initial_group ? `?group=${vault_initial_group}` : ''%>" class="btn header-item frame-link<%=vaultAutomaticResultSignature ? ' app-vault-result-attention' : ''%>" data-index="vault" data-static="retain" data-tab-link-popover="false" aria-label="<%=vaultSidebarLabel%>">
           <div class='tab'>
             <i class="fa-solid fa-hard-drive menu-action-leading-icon"></i>
             <div class='display'>Disk Saver</div>
@@ -9183,6 +9183,14 @@ body.dark .pinokio-custom-terminal-header {
     window.history.replaceState(window.history.state, "", `${devTabUrl.pathname}${devTabUrl.search}${devTabUrl.hash}`)
   } catch (_) {}
   <% } %>
+  <% if (typeof vault_initial_group === 'string' && vault_initial_group) { %>
+  global_selector = "#save-space-tab.frame-link"
+  try {
+    const vaultTabUrl = new URL(window.location.href)
+    vaultTabUrl.searchParams.delete("vault_group")
+    window.history.replaceState(window.history.state, "", `${vaultTabUrl.pathname}${vaultTabUrl.search}${vaultTabUrl.hash}`)
+  } catch (_) {}
+  <% } %>
   let pendingSelectionRetry = null
   let pendingHomeSelectionRetry = null
   let initialWorkspaceDiskUsageRequested = false

package/test/vault-engine.test.js

@@ -5,6 +5,7 @@ const fs = require("node:fs")
 const os = require("node:os")
 const path = require("node:path")
 const Database = require("better-sqlite3")
+const Util = require("../kernel/util")
 const Vault = require("../kernel/vault")
 const Registry = require("../kernel/vault/registry")
 const {
@@ -105,6 +106,28 @@ describe("Save Space engine", () => {
     }
   })
 
+  test("file reveals reuse the shared file explorer launcher", async () => {
+    const kernel = { homedir: os.tmpdir(), platform: process.platform }
+    const vault = new Vault(kernel)
+    const originalOpenfs = Util.openfs
+    const calls = []
+    Util.openfs = (...args) => {
+      calls.push(args)
+    }
+
+    try {
+      const filePath = path.join(os.tmpdir(), "model with spaces.bin")
+      await vault.fileManagerLauncher(filePath)
+      assert.deepEqual(calls, [[
+        filePath,
+        { action: "view" },
+        kernel
+      ]])
+    } finally {
+      Util.openfs = originalOpenfs
+    }
+  })
+
   test("startup only reads the enable flag and defers Disk Saver storage", async () => {
     const home = await makeHome()
     const vault = new Vault({ homedir: home, platform: process.platform })