Change error name from InvalidFileOrDirPath to InvalidPath

Author: Synicix

src/core/crypto.rs

@@ -50,11 +50,9 @@ pub fn hash_buffer(buffer: impl AsRef<[u8]>) -> String {
 ///
 /// Will return error if unable to access file.
 pub fn hash_file(filepath: impl AsRef<Path>) -> Result<String> {
-    hash_stream(
-        &mut File::open(&filepath).context(selector::InvalidFileOrDirPath {
-            path: filepath.as_ref(),
-        })?,
-    )
+    hash_stream(&mut File::open(&filepath).context(selector::InvalidPath {
+        path: filepath.as_ref(),
+    })?)
 }
 /// Evaluate checksum hash of a directory.
 ///
@@ -65,7 +63,7 @@ pub fn hash_dir(dirpath: impl AsRef<Path>) -> Result<String> {
     let summary: BTreeMap<String, String> = dirpath
         .as_ref()
         .read_dir()
-        .context(selector::InvalidFileOrDirPath {
+        .context(selector::InvalidPath {
             path: dirpath.as_ref(),
         })?
         .map(|path| {

src/core/error.rs

@@ -122,7 +122,7 @@ impl fmt::Debug for OrcaError {
         match &self.kind {
             Kind::AgentCommunicationFailure { backtrace, .. }
             | Kind::IncompletePacket { backtrace, .. }
-            | Kind::InvalidFileOrDirPath { backtrace, .. }
+            | Kind::InvalidPath { backtrace, .. }
             | Kind::MissingInfo { backtrace, .. }
             | Kind::BollardError { backtrace, .. }
             | Kind::ChronoParseError { backtrace, .. }

src/core/store/filestore.rs

@@ -194,7 +194,7 @@ impl LocalFileStore {
                 Ok((
                     serde_yaml::from_str(
                         &fs::read_to_string(path.clone())
-                            .context(selector::InvalidFileOrDirPath { path })?,
+                            .context(selector::InvalidPath { path })?,
                     )?,
                     None,
                     hash.to_owned(),

src/uniffi/error.rs

@@ -37,7 +37,7 @@ pub(crate) enum Kind {
         backtrace: Option<Backtrace>,
     },
     #[snafu(display("{source} ({path:?})."))]
-    InvalidFileOrDirPath {
+    InvalidPath {
         path: PathBuf,
         source: io::Error,
         backtrace: Option<Backtrace>,

src/uniffi/orchestrator/docker.rs

@@ -94,7 +94,7 @@ impl Orchestrator for LocalDockerOrchestrator {
                 let location = namespace_lookup[&image_info.namespace].join(&image_info.path);
                 let byte_stream = FramedRead::new(
                     File::open(&location)
-                        .context(selector::InvalidFileOrDirPath { path: &location })
+                        .context(selector::InvalidPath { path: &location })
                         .await?,
                     BytesCodec::new(),
                 )