pinokiod 8.0.108 → 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.108",
+  "version": "8.0.110",
   "description": "",
   "main": "index.js",
   "scripts": {

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 })