adapt check errors

Author: aawsome

crates/core/src/commands/check.rs

@@ -3,7 +3,6 @@ use std::{
     collections::{BTreeMap, BTreeSet, HashMap},
     fmt::Debug,
     num::ParseIntError,
-    path::PathBuf,
     str::FromStr,
     sync::Mutex,
 };
@@ -35,6 +34,7 @@ use crate::{
         IndexFile, IndexPack, PackHeader, PackHeaderLength, PackHeaderRef, packfile::PackId,
     },
     repository::{Open, Repository},
+    util::SerializablePath,
 };
 
 #[derive(Clone, Copy, Debug, Default)]
@@ -643,22 +643,22 @@ fn check_trees(
                 NodeType::File => node.content.as_ref().map_or_else(
                     || {
                         collector.add_error(CheckError::FileHasNoContent {
-                            file: path.join(node.name()),
+                            file: SerializablePath(path.join(node.name())),
                         });
                     },
                     |content| {
                         for (i, id) in content.iter().enumerate() {
                             if id.is_null() {
                                 collector.add_error(CheckError::FileBlobHasNullId {
-                                    file: path.join(node.name()),
+                                    file: SerializablePath(path.join(node.name())),
                                     blob_num: i,
                                 });
                             }
 
                             match index.get_data(id) {
                                 None => {
                                     collector.add_error(CheckError::FileBlobNotInIndex {
-                                        file: path.join(node.name()),
+                                        file: SerializablePath(path.join(node.name())),
                                         blob_id: *id,
                                     });
                                 }
@@ -673,17 +673,17 @@ fn check_trees(
                 NodeType::Dir => {
                     match node.subtree {
                         None => collector.add_error(CheckError::NoSubTree {
-                            dir: path.join(node.name()),
+                            dir: SerializablePath(path.join(node.name())),
                         }),
                         Some(tree) if tree.is_null() => {
                             collector.add_error(CheckError::NullSubTree {
-                                dir: path.join(node.name()),
+                                dir: SerializablePath(path.join(node.name())),
                             });
                         }
                         Some(id) => match index.get_tree(&id) {
                             None => {
                                 collector.add_error(CheckError::SubTreeMissingInIndex {
-                                    dir: path.join(node.name()),
+                                    dir: SerializablePath(path.join(node.name())),
                                     blob_id: id,
                                 });
                             }
@@ -887,17 +887,26 @@ pub enum CheckError {
     /// pack {id} is referenced by the index but not present! To repair: 'rustic repair index'.
     NoPack { id: PackId },
     /// file {file:?} doesn't have a content
-    FileHasNoContent { file: PathBuf },
+    FileHasNoContent { file: SerializablePath },
     /// file {file:?} blob {blob_num} has null ID
-    FileBlobHasNullId { file: PathBuf, blob_num: usize },
+    FileBlobHasNullId {
+        file: SerializablePath,
+        blob_num: usize,
+    },
     /// file {file:?} blob {blob_id} is missing in index
-    FileBlobNotInIndex { file: PathBuf, blob_id: DataId },
+    FileBlobNotInIndex {
+        file: SerializablePath,
+        blob_id: DataId,
+    },
     /// dir {dir:?} doesn't have a subtree
-    NoSubTree { dir: PathBuf },
+    NoSubTree { dir: SerializablePath },
     /// "dir {dir:?} subtree has null ID
-    NullSubTree { dir: PathBuf },
+    NullSubTree { dir: SerializablePath },
     /// "dir {dir:?} subtree blob {blob_id} is missing in index",
-    SubTreeMissingInIndex { dir: PathBuf, blob_id: TreeId },
+    SubTreeMissingInIndex {
+        dir: SerializablePath,
+        blob_id: TreeId,
+    },
     /// pack {id}: data size does not match expected size. Read: {size} bytes, expected: {expected} bytes
     PackSizeMismatch {
         id: PackId,

crates/core/src/util.rs

@@ -2,6 +2,7 @@
 ///
 use std::{
     borrow::Cow,
+    fmt::Debug,
     path::{Path, PathBuf},
     str::Utf8Error,
 };
@@ -12,9 +13,9 @@ use typed_path::{
     WindowsPrefix,
 };
 
-#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize)]
+#[derive(PartialEq, Eq, PartialOrd, Ord, Serialize)]
 #[serde(transparent)]
-/// Like `UnixPathBuf`, but implements `Serialize`
+/// Like `UnixPathBuf`, but implements `Serialize` and a nicer `Debug`
 pub struct SerializablePath(#[serde(serialize_with = "serialize_unix_path")] pub UnixPathBuf);
 
 fn serialize_unix_path<S>(path: &UnixPath, serializer: S) -> Result<S::Ok, S::Error>
@@ -25,6 +26,12 @@ where
     serializer.serialize_str(&s)
 }
 
+impl Debug for SerializablePath {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0.display())
+    }
+}
+
 /// Converts a [`Path`] to a [`WindowsPath`].
 ///
 /// # Arguments

crates/core/tests/integration/check.rs

@@ -13,7 +13,7 @@ use rustic_core::{CheckOptions, Repository, RepositoryBackends, RepositoryOption
 #[rstest]
 #[case("repo-data-missing.tar.gz")]
 #[case("repo-duplicates.tar.gz")]
-// #[case("repo-index-missing-blob.tar.gz")] TODO: Activate when paths are identical for unix/windows
+#[case("repo-index-missing-blob.tar.gz")]
 #[case("repo-index-missing.tar.gz")]
 #[case("repo-mixed.tar.gz")]
 #[case("repo-obsolete-index.tar.gz")]

crates/core/tests/integration/snapshots/integration__integration__check__repo-index-missing-blob.tar.gz.snap

@@ -2,8 +2,8 @@
 source: crates/core/tests/integration/check.rs
 expression: check_results
 ---
-CheckResults {
-    errors: [
+CheckResults(
+    [
         (
             Warn,
             PackNotReferenced {
@@ -19,11 +19,11 @@ CheckResults {
         (
             Error,
             FileBlobNotInIndex {
-                file: "home/thinkpad/data/test",
+                file: home/thinkpad/data/test,
                 blob_id: DataId(
                     f2ca1bb6c7e907d06dafe4687e579fce76b37e4e93b7605022da52e6ccc26fd2,
                 ),
             },
         ),
     ],
-}
+)

crates/core/tests/integration/snapshots/integration__integration__find__find-matching-nodes-not-found.snap.new renamed to crates/core/tests/integration/snapshots/integration__integration__find__find-matching-nodes-not-found.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/core/tests/integration/find.rs
-assertion_line: 45
 expression: not_found
 ---
 FindMatches {