dirsql 0.4.1__tar.gz → 0.4.2__tar.gz

{dirsql-0.4.1 → dirsql-0.4.2}/Cargo.lock

@@ -500,7 +500,7 @@ dependencies = [
 
 [[package]]
 name = "dirsql-py-ext"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "dirsql",
  "pyo3",

{dirsql-0.4.1 → dirsql-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dirsql
-Version: 0.4.1
+Version: 0.4.2
 Requires-Dist: tomli>=2 ; python_full_version < '3.11'
 Summary: Ephemeral SQL index over a local directory
 Keywords: sql,filesystem,directory,sqlite,index

{dirsql-0.4.1 → dirsql-0.4.2}/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.1"
+version = "0.4.2"
 # 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.2/packages/python/e2e-attestations/claude-710-accumulate-onfile.json

@@ -0,0 +1,7 @@
+{
+  "command": "uv run python -m pytest tests/e2e/ -x -q",
+  "ran_at": 1785444370,
+  "exit_code": 0,
+  "commit": "287fb980b2380a894543a652a0439f6ab8ea71cf",
+  "branch": "claude/710-accumulate-onfile"
+}

dirsql-0.4.2/packages/rust/changelog.d/2026-07-29-on-file-failures-accumulate.md

@@ -0,0 +1,8 @@
+**Changed** — a scan now attempts every matched file instead of stopping at the
+first whose `on-file` hook fails, and reports every failure rather than only the
+first. A single failure still raises `DirSqlError::OnFile` unchanged; several
+now raise a new `DirSqlError::OnFileMany` carrying one `OnFileFailure { path,
+message }` per file.
+
+A scan with failures still fails and still leaves the cache exactly as it was —
+only the reporting improved. Committing a partial index is tracked in #697.

{dirsql-0.4.1 → dirsql-0.4.2}/packages/rust/src/lib.rs

@@ -78,6 +78,16 @@ pub const DEFAULT_CONFIG_TOML: &str = include_str!("default_config.toml");
 type BoxError = Box<dyn StdError + Send + Sync + 'static>;
 type OnFileFn = dyn Fn(&str) -> std::result::Result<Vec<Row>, BoxError> + Send + Sync + 'static;
 
+/// One file whose on-file hook failed, carried so a scan can report every
+/// failure rather than only whichever came first.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct OnFileFailure {
+    /// Path relative to the scan root.
+    pub path: String,
+    /// The hook's error, as rendered by its `Display`.
+    pub message: String,
+}
+
 #[derive(Debug, Error)]
 pub enum DirSqlError {
     #[error(transparent)]
@@ -122,6 +132,20 @@ pub enum DirSqlError {
     #[error("on-file error for {path}: {message}")]
     OnFile { path: String, message: String },
 
+    /// Several files' on-file hooks failed during one scan. A scan attempts
+    /// every matched file, so more than one can fail; reporting only the first
+    /// would make the rest invisible until it was fixed and the scan re-run.
+    #[error(
+        "{} files failed their on-file hook:\n{}",
+        .failures.len(),
+        .failures
+            .iter()
+            .map(|OnFileFailure { path, message }| format!("  {path}: {message}"))
+            .collect::<Vec<_>>()
+            .join("\n")
+    )]
+    OnFileMany { failures: Vec<OnFileFailure> },
+
     #[error("config error: {message}")]
     Config {
         message: String,
@@ -816,6 +840,7 @@ impl DirSQL {
         }
 
         let snapshot_ns = now_ns();
+        let mut on_file_failures: Vec<OnFileFailure> = Vec::new();
         for ScannedFile {
             rel_path,
             table_name,
@@ -827,11 +852,20 @@ impl DirSQL {
             })?;
             let strict = *strict_map.get(&table_name).unwrap_or(&false);
             let abs_path = root.join(&rel_path);
-            let raw_rows =
-                on_file(&abs_path.to_string_lossy()).map_err(|e| DirSqlError::OnFile {
-                    path: rel_path.clone(),
-                    message: e.to_string(),
-                })?;
+            // A hook failure is this file's problem, not the scan's: record it
+            // and keep going, so one unreadable file cannot hide the state of
+            // every file after it. The collected failures still fail the build
+            // below -- whether a partial index commits is dirsql#697.
+            let raw_rows = match on_file(&abs_path.to_string_lossy()) {
+                Ok(rows) => rows,
+                Err(e) => {
+                    on_file_failures.push(OnFileFailure {
+                        path: rel_path.clone(),
+                        message: e.to_string(),
+                    });
+                    continue;
+                }
+            };
 
             // When updating an existing file in the persistent cache, drop
             // its old rows before inserting the new ones.
@@ -870,6 +904,27 @@ impl DirSQL {
             write_meta(db.conn(), meta).map_err(DirSqlError::sqlite)?;
         }
 
+        // Returning before the commit drops `_tx`, so a scan with failures
+        // still leaves the cache exactly as it was -- the pre-existing
+        // behavior. The single-failure case keeps its original error verbatim;
+        // only the multi-failure case reports more than it used to. Whether a
+        // partial index should commit instead is dirsql#697.
+        match on_file_failures.len() {
+            0 => {}
+            1 => {
+                let only = on_file_failures.remove(0);
+                return Err(DirSqlError::OnFile {
+                    path: only.path,
+                    message: only.message,
+                });
+            }
+            _ => {
+                return Err(DirSqlError::OnFileMany {
+                    failures: on_file_failures,
+                });
+            }
+        }
+
         // Commit the ingest transaction.
         _tx.commit().map_err(DirSqlError::sqlite)?;
 

dirsql-0.4.1/packages/python/e2e-attestations/claude-tackle-698-bz6ere.json

@@ -1,7 +0,0 @@
-{
-  "command": "uv run python -m pytest tests/e2e/ -x -q",
-  "ran_at": 1785328821,
-  "exit_code": 0,
-  "commit": "a133d0f16d5e9d1b3892b3854f52eac535a9012f",
-  "branch": "claude/tackle-698-bz6ere"
-}