pinokiod 8.0.111 → 8.0.112

package/kernel/vault/index.js

@@ -3408,7 +3408,10 @@ class Vault {
       .replace(/[\\/]+$/, "")
       .slice(0, 4096)
     const root = source.root.replace(/[\\/]+$/, "")
-    const separator = root.includes("\\") && !root.includes("/") ? "\\" : "/"
+    // Every source root is produced by path.resolve, so it is already native
+    // and the platform separator is the right one -- no need to infer it from
+    // the string, which a directory named with a backslash would fool.
+    const separator = path.sep
     const prefix = parent
       ? `${root}${separator}${parent.split("/").join(separator)}${separator}`
       : `${root}${separator}`
@@ -3419,6 +3422,7 @@ class Vault {
     const level = await this.registry.treeLevel({
       sourceId: source.id,
       prefix,
+      separator,
       view,
       statusFilter,
       query,
@@ -3438,7 +3442,10 @@ class Vault {
       // A run of folders holding nothing but one another reads as one row.
       // The shared prefix of the first and last path underneath is exactly
       // that run, because the two are the extremes of a sorted list.
-      const shared = commonDirectory(row.lo || "", row.hi || "")
+      const native = (value) => separator === "/"
+        ? String(value || "")
+        : String(value || "").split(separator).join("/")
+      const shared = commonDirectory(native(row.lo), native(row.hi))
       const label = shared && shared.startsWith(`${row.name}/`)
         ? shared
         : row.name

package/kernel/vault/registry_core.js

@@ -22,7 +22,9 @@ const canonicalPathKey = (value) => {
 // user cannot see a reason for. This narrows the match to the last segment.
 const pathNameKey = (value) => {
   const filePath = String(value || "")
-  const cut = Math.max(filePath.lastIndexOf("/"), filePath.lastIndexOf("\\"))
+  // Only the platform's own separator: registry paths are always native, and
+  // on POSIX a backslash is an ordinary character in a file name.
+  const cut = filePath.lastIndexOf(path.sep)
   return (cut < 0 ? filePath : filePath.slice(cut + 1)).toLowerCase()
 }
 
@@ -5175,7 +5177,8 @@ class RegistryCore {
       limit,
       externalSourceIds,
       nameOnly,
-      parentPrefix
+      parentPrefix,
+      parentSeparator
     } = options
     const where = ["unavailable_reason IS NOT 'stale'"]
     const values = []
@@ -5202,8 +5205,8 @@ class RegistryCore {
       const [low, high] = this.prefixRange(parentPrefix)
       where.push("path >= ? AND path < ?")
       values.push(low, high)
-      where.push("instr(replace(substr(path, ?), '\\', '/'), '/') = 0")
-      values.push(String(parentPrefix).length + 1)
+      where.push("instr(substr(path, ?), ?) = 0")
+      values.push(String(parentPrefix).length + 1, parentSeparator)
     }
     if (cursor && typeof cursor.path === "string") {
       if (sort === "asc" && Number.isFinite(cursor.size)) {
@@ -5246,7 +5249,8 @@ class RegistryCore {
       pageSize,
       externalSourceIds,
       nameOnly,
-      parentPrefix
+      parentPrefix,
+      parentSeparator
     } = options
     const sources = unrestricted
       ? [null]
@@ -5282,7 +5286,8 @@ class RegistryCore {
         limit,
         externalSourceIds,
         nameOnly,
-        parentPrefix
+        parentPrefix,
+        parentSeparator
       })
       stream.rows.push(...rows)
       if (rows.length < limit) stream.exhausted = true
@@ -5356,6 +5361,7 @@ class RegistryCore {
       statuses,
       query,
       nameOnly,
+      separator,
       sizeSort,
       nameSort,
       limit,
@@ -5382,14 +5388,16 @@ class RegistryCore {
       : sizeSort === "desc"
         ? "bytes DESC, name ASC"
         : nameSort === "desc" ? "name DESC" : "name ASC"
+    // Values bind in the order the placeholders appear: the CTE's substr, then
+    // its WHERE, then the two separators in the outer select and filter.
     return this.database.prepare(`
       WITH scoped AS (
-        SELECT replace(substr(path, ?), '\', '/') AS rel, size, status
+        SELECT substr(path, ?) AS rel, size, status
         FROM files
         WHERE ${where.join(" AND ")}
       )
       SELECT
-        substr(rel, 1, instr(rel, '/') - 1) AS name,
+        substr(rel, 1, instr(rel, ?) - 1) AS name,
         COUNT(*) AS file_count,
         SUM(size) AS bytes,
         SUM(CASE WHEN status = 'duplicate' THEN 1 ELSE 0 END)
@@ -5401,13 +5409,15 @@ class RegistryCore {
         MIN(rel) AS lo,
         MAX(rel) AS hi
       FROM scoped
-      WHERE instr(rel, '/') > 0
+      WHERE instr(rel, ?) > 0
       GROUP BY name
       ORDER BY ${order}
       LIMIT ? OFFSET ?
     `).all(
       String(prefix).length + 1,
       ...values,
+      separator,
+      separator,
       limit,
       Math.max(0, Number(offset) || 0)
     )
@@ -5495,6 +5505,7 @@ class RegistryCore {
     const {
       sourceId,
       prefix,
+      separator,
       view,
       statusFilter,
       query,
@@ -5510,6 +5521,7 @@ class RegistryCore {
       directories: this.treeDirectoryRows({
         sourceId,
         prefix,
+        separator,
         statuses: this.statusesForView(view, statusFilter),
         query,
         nameOnly,
@@ -5530,7 +5542,8 @@ class RegistryCore {
         unrestricted: false,
         externalSourceIds,
         nameOnly,
-        parentPrefix: prefix
+        parentPrefix: prefix,
+        parentSeparator: separator
       })
     }
   }
@@ -5548,7 +5561,8 @@ class RegistryCore {
       unrestricted,
       externalSourceIds,
       nameOnly,
-      parentPrefix
+      parentPrefix,
+      parentSeparator
     } = options
     // Size and name sorting are one server-side order, so only one can win.
     const sort = sizeSort === "asc" || sizeSort === "desc"
@@ -5564,7 +5578,8 @@ class RegistryCore {
       pageSize,
       externalSourceIds,
       nameOnly,
-      parentPrefix
+      parentPrefix,
+      parentSeparator
     })
     const hasMore = rows.length > pageSize
     if (hasMore) rows.pop()

package/package.json

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

package/test/vault-engine.test.js

@@ -375,6 +375,57 @@ describe("Save Space engine", () => {
     await close(reopened)
   })
 
+  test("the folder tree reads Windows paths", async () => {
+    // Backslash separators cannot be exercised through the filesystem on a
+    // POSIX runner, so this drives the registry with Windows-shaped rows. It
+    // guards the separator, which used to be written into the SQL text where
+    // JavaScript and SQLite escaped it differently and neither matched.
+    const home = await makeHome()
+    const RegistryCore = require("../kernel/vault/registry_core")
+    const core = new RegistryCore(home)
+    await core.load()
+    const root = "C:\\Users\\x\\pinokio\\api\\demo"
+    const insert = core.database.prepare(`INSERT INTO files
+      (path, hash, size, mtime, ctime, dev, ino, mode, uid, gid,
+       source_id, app, status, updated_at)
+      VALUES (?, ?, ?, 0, 0, 1, ?, 0, 0, 0, 'app:demo', 'demo',
+        'reference', 0)`);
+    [
+      [`${root}\\app\\models\\big.bin`, 4000],
+      [`${root}\\app\\models\\small.bin`, 10],
+      [`${root}\\cache\\only\\deep\\x.bin`, 50],
+      [`${root}\\loose.bin`, 700]
+    ].forEach(([filePath, size], index) =>
+      insert.run(filePath, `h${index}`, size, index + 1))
+
+    const directories = core.treeDirectoryRows({
+      sourceId: "app:demo",
+      prefix: `${root}\\`,
+      separator: "\\",
+      statuses: [],
+      query: "",
+      nameOnly: false,
+      sizeSort: "desc",
+      limit: 50,
+      offset: 0
+    })
+    assert.deepEqual(directories.map((row) => row.name), ["app", "cache"])
+    assert.equal(directories[0].bytes, 4010)
+    // The collapse reads these, so they have to carry the whole subpath.
+    assert.equal(directories[1].lo, "cache\\only\\deep\\x.bin")
+
+    const files = core.fileStreamRows({
+      sourceId: "app:demo",
+      query: "",
+      sort: "path",
+      limit: 50,
+      parentPrefix: `${root}\\`,
+      parentSeparator: "\\"
+    })
+    assert.deepEqual(files.map((row) => row.path), [`${root}\\loose.bin`])
+    core.database.close()
+  })
+
   test("the folder tree resolves a group of locations to its members", async () => {
     const { home, vault } = await makeVault()
     await writeCandidate(