dirsql 0.4.58__tar.gz → 0.4.59__tar.gz

{dirsql-0.4.58 → dirsql-0.4.59}/Cargo.lock

@@ -552,7 +552,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
 
 [[package]]
 name = "dirsql"
-version = "0.4.58"
+version = "0.4.59"
 dependencies = [
  "assert_cmd",
  "axum",
@@ -601,7 +601,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.58"
+version = "0.4.59"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.58 → dirsql-0.4.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.58
+Version: 0.4.59
 Requires-Dist: bin-shim>=0.1
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.58 → dirsql-0.4.59}/packages/python/Cargo.toml

@@ -4,7 +4,7 @@ name = "dirsql-py-ext"
 # pypi/maturin handler can rewrite it via `write-version` before
 # `maturin build`. `pyproject.toml` declares `dynamic = ["version"]`
 # and maturin reads this field. Mirrors `packages/rust/Cargo.toml`.
-version = "0.4.58"
+version = "0.4.59"
 # abi3 note: the `abi3-py310` pyo3 feature (below) builds ONE stable-ABI
 # `cp310-abi3` wheel per platform that loads on every CPython >= 3.10
 # (matching `pyproject.toml`'s `requires-python = ">=3.10"`), instead of

dirsql-0.4.59/packages/python/e2e-attestations/claude-1184-win-rel-paths.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1790605446,
+  "exit_code": 0,
+  "commit": "ab668f9f958ed79fe0598f6cc494f1d0cc049316",
+  "branch": "claude/1184-win-rel-paths"
+}

dirsql-0.4.59/packages/python/e2e-attestations/claude-1186-win-test-harness.json

@@ -0,0 +1,7 @@
+{
+  "command": "just test-e2e",
+  "ran_at": 1790603833,
+  "exit_code": 0,
+  "commit": "6b84d84d60179482a842b0db205ee257f8e03c11",
+  "branch": "claude/1186-win-test-harness"
+}

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/Cargo.toml

@@ -6,7 +6,7 @@ description = "Ephemeral SQL index over a local directory"
 # version stays for the binding crates (publish = false). The literal
 # intentionally lags the published version: putitoutthere rewrites it to
 # the planned release version at build time and never commits it back.
-version = "0.4.58"
+version = "0.4.59"
 edition.workspace = true
 # Literal `license` (not `license.workspace = true`) because
 # putitoutthere's preflight check reads `[package].license` directly

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/src/db.rs

@@ -655,7 +655,7 @@ impl Db {
     /// Every distinct `(table_name, file_path)` whose file sits beneath the
     /// directory `dir`, ordered by table then path.
     pub fn files_under(&self, dir: &str) -> Result<Vec<(String, String)>> {
-        let prefix = format!("{dir}{}", std::path::MAIN_SEPARATOR);
+        let prefix = format!("{dir}/");
         let mut stmt = self.conn.prepare(
             "SELECT DISTINCT table_name, file_path FROM _dirsql_internal_rows \
              WHERE substr(file_path, 1, length(?1)) = ?1 \

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/src/lib.rs

@@ -571,7 +571,7 @@ impl DirSQL {
         // unspecified. An `on_file` failure produces an error event for that
         // table only; the other matching tables still process the event.
         let matches = self.inner.matcher.match_all(&rel_path_buf);
-        let rel_path = rel_path_buf.to_string_lossy().to_string();
+        let rel_path = scanner::to_slash(&rel_path_buf);
 
         let mut events = Vec::new();
         for m in matches {
@@ -625,11 +625,7 @@ impl DirSQL {
         };
         let mut events = Vec::new();
         for (path, table) in self.inner.fs.scan_subtree(base, dir, &self.inner.matcher) {
-            let rel_path = path
-                .strip_prefix(base)
-                .unwrap_or(&path)
-                .to_string_lossy()
-                .to_string();
+            let rel_path = scanner::to_slash(path.strip_prefix(base).unwrap_or(&path));
             events.extend(self.handle_upsert(&table, &path, &rel_path));
         }
         events
@@ -1836,10 +1832,7 @@ fn run_channel_loop(db: DirSQL, tx: UnboundedSender<RowEvent>) {
 }
 
 fn relative_path(root: &Path, path: &Path) -> String {
-    path.strip_prefix(root)
-        .unwrap_or(path)
-        .to_string_lossy()
-        .to_string()
+    scanner::to_slash(path.strip_prefix(root).unwrap_or(path))
 }
 
 /// Build [`Table`] objects from a parsed config.
@@ -4346,15 +4339,13 @@ mod internal_tests {
     }
 
     /// `{abspath}` is not in the substitution table: it is left literal like any
-    /// unknown `{…}`, so `printf` receives the string `{abspath}` verbatim. The
-    /// template references `{path}` so that arg is the real path (and no path is
-    /// appended), isolating the `{abspath}` behavior in the `q` column.
+    /// unknown `{…}`, so `printf` receives the string `{abspath}` verbatim.
     #[test]
     fn run_on_file_does_not_substitute_abspath() {
         let dir = TempDir::new().unwrap();
         let abs = dir.path().join("f.txt");
         let rows = run_on_file(
-            r#"printf '[{"p":"%s","q":"%s"}]' {path} {abspath}"#,
+            r#"printf '[{"q":"%s"}]' {abspath}"#,
             &abs.to_string_lossy(),
             dir.path(),
             dir.path(),
@@ -4365,25 +4356,23 @@ mod internal_tests {
     }
 
     /// `{path}` interpolates the matched file's **absolute** path (not a
-    /// root-relative one). The command echoes its `{path}` argument back as a
-    /// row value, and we assert it is byte-for-byte the absolute path even when
-    /// the file sits directly under `root` (the case the old `strip_prefix`
-    /// would have shortened to a bare relative path).
+    /// root-relative one), byte-for-byte, even when the file sits directly
+    /// under `root`. The command writes its argument to a side file rather than
+    /// into the JSON payload, where a Windows path's `\` would need escaping.
     #[test]
     fn run_on_file_passes_absolute_path_for_path_placeholder() {
         let dir = TempDir::new().unwrap();
         let abs = dir.path().join("f.txt");
-        let rows = run_on_file(
-            r#"sh -c "printf '[{\"p\":\"%s\"}]' \"$1\"" sh {path}"#,
+        run_on_file(
+            r#"sh -c 'printf %s "$1" > seen; echo "[]"' sh {path}"#,
             &abs.to_string_lossy(),
             dir.path(),
             dir.path(),
         )
         .expect("a well-formed payload parses");
-        assert_eq!(rows.len(), 1);
         assert_eq!(
-            rows[0]["p"],
-            Value::Text(abs.to_string_lossy().into_owned())
+            std::fs::read_to_string(dir.path().join("seen")).unwrap(),
+            abs.to_string_lossy()
         );
     }
 

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/src/parsed_vtab.rs

@@ -36,7 +36,7 @@ use crate::matcher::TableMatcher;
 use crate::parsed_cache::{self, CachedParse, Entry, RowCache, SqliteRowCache};
 use crate::path_table;
 use crate::persist::{FileStat, hash_file, now_ns};
-use crate::scanner::scan_glob;
+use crate::scanner::{scan_glob, to_slash};
 use crate::vtab_scaffold::{self, TableSource};
 
 /// SQL module name a parsed path-table is created with.
@@ -161,7 +161,7 @@ fn collect_rows_cached(
 
     let mut seen: Vec<(String, Parsed)> = Vec::with_capacity(rel_paths.len());
     for rel_path in rel_paths {
-        let key = rel_path.to_string_lossy().into_owned();
+        let key = to_slash(rel_path);
         let Some(live) = fs.stat(rel_path) else {
             // The file vanished between the scan and the stat. Nothing to
             // parse and nothing to cache; the next run decides afresh.
@@ -268,7 +268,7 @@ impl ParsedFs for RootedFs<'_> {
 fn command_skip_message(rel_path: &Path, error: &str) -> String {
     format!(
         "dirsql: skipping `{}`: on-file command failed: {error}",
-        rel_path.display()
+        to_slash(rel_path)
     )
 }
 
@@ -276,7 +276,7 @@ fn command_skip_message(rel_path: &Path, error: &str) -> String {
 fn parse_skip_message(rel_path: &Path, message: &str) -> String {
     format!(
         "dirsql: skipping `{}`: on-file output was not a JSON array of rows: {message}",
-        rel_path.display()
+        to_slash(rel_path)
     )
 }
 
@@ -660,9 +660,12 @@ mod tests {
 
     #[test]
     fn run_parser_substitutes_the_absolute_path_and_the_root() {
-        let payload =
-            run_parser("echo {path} {root}", Path::new("/tmp"), Path::new("a.json")).unwrap();
-        assert_eq!(payload, "/tmp/a.json /tmp");
+        let root = std::env::temp_dir();
+        let payload = run_parser("echo {path} {root}", &root, Path::new("a.json")).unwrap();
+        assert_eq!(
+            payload,
+            format!("{} {}", root.join("a.json").display(), root.display())
+        );
     }
 
     #[test]

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/src/scanner.rs

@@ -10,6 +10,19 @@ use walkdir::WalkDir;
 /// whether persistence is enabled.
 pub const RESERVED_DIR: &str = ".dirsql";
 
+/// A root-relative path as dirsql stores and reports it: `/`-separated on
+/// every platform, so globs, `file_path` keys and `path` columns agree.
+pub(crate) fn to_slash(path: &Path) -> String {
+    with_slashes(&path.to_string_lossy(), std::path::MAIN_SEPARATOR)
+}
+
+fn with_slashes(path: &str, native: char) -> String {
+    if native == '/' {
+        return path.to_owned();
+    }
+    path.replace(native, "/")
+}
+
 /// Walk a directory tree and return all file paths paired with their matching table name.
 /// Ignored paths and directories are skipped. Only files (not directories) are returned.
 ///
@@ -354,6 +367,29 @@ mod tests {
         assert!(!is_glob_match(&set, Path::new("a.md")));
     }
 
+    #[test]
+    fn with_slashes_rewrites_a_backslash_native_separator() {
+        assert_eq!(
+            with_slashes(r"moved\one\mid.txt", '\\'),
+            "moved/one/mid.txt"
+        );
+    }
+
+    #[test]
+    fn with_slashes_keeps_a_mixed_path_slash_separated() {
+        assert_eq!(with_slashes(r"a/b\c.txt", '\\'), "a/b/c.txt");
+    }
+
+    #[test]
+    fn with_slashes_leaves_a_backslash_in_a_unix_file_name() {
+        assert_eq!(with_slashes(r"dir/a\b.txt", '/'), r"dir/a\b.txt");
+    }
+
+    #[test]
+    fn to_slash_keeps_a_native_unix_path() {
+        assert_eq!(to_slash(Path::new("docs/nested/a.md")), "docs/nested/a.md");
+    }
+
     #[test]
     fn compile_glob_rejects_an_invalid_pattern() {
         assert!(compile_glob("[").is_err());

{dirsql-0.4.58 → dirsql-0.4.59}/packages/rust/src/vtab.rs

@@ -9,7 +9,7 @@ use rusqlite::{Connection, Result};
 use crate::compute_stat_virtuals;
 use crate::matcher::TableMatcher;
 use crate::path_table;
-use crate::scanner::scan_glob;
+use crate::scanner::{scan_glob, to_slash};
 use crate::vtab_scaffold::{self, TableSource};
 use crate::{Row, Value};
 
@@ -111,10 +111,15 @@ fn parse_module_args(args: &[&[u8]]) -> Result<ScanSpec> {
 /// The string a matched file is reported under: the relative path as scanned,
 /// under the table's path prefix when it has one.
 fn reported_path(path_prefix: &Path, rel_path: &Path) -> String {
-    if path_prefix.as_os_str().is_empty() {
-        return rel_path.to_string_lossy().into_owned();
+    let rel_path = to_slash(rel_path);
+    let prefix = path_prefix.to_string_lossy();
+    if prefix.is_empty() {
+        return rel_path;
     }
-    path_prefix.join(rel_path).to_string_lossy().into_owned()
+    if prefix.ends_with(['/', std::path::MAIN_SEPARATOR]) {
+        return format!("{prefix}{rel_path}");
+    }
+    format!("{prefix}/{rel_path}")
 }
 
 /// Whether `column` addresses the hidden `content` column.
@@ -388,6 +393,11 @@ mod tests {
         );
     }
 
+    #[test]
+    fn reported_path_under_the_filesystem_root_has_one_separator() {
+        assert_eq!(reported_path(Path::new("/"), Path::new("a.log")), "/a.log");
+    }
+
     #[test]
     fn is_content_column_identifies_only_the_hidden_column() {
         assert!(is_content_column(CONTENT_COLUMN));