feat(core): add copy&rename to error_context layer

Signed-off-by: suyanhanx <suyanhanx@gmail.com>

core/src/layers/error_context.rs

@@ -138,6 +138,30 @@ impl<A: Accessor> LayeredAccessor for ErrorContextAccessor<A> {
  .await
  }
 
+ async fn copy(&self, from: &str, to: &str, args: OpCopy) -> Result<RpCopy> {
+ self.inner
+ .copy(from, to, args)
+ .map_err(|err| {
+ err.with_operation(Operation::Copy)
+ .with_context("service", self.meta.scheme())
+ .with_context("from", from)
+ .with_context("to", to)
+ })
+ .await
+ }
+
+ async fn rename(&self, from: &str, to: &str, args: OpRename) -> Result<RpRename> {
+ self.inner
+ .rename(from, to, args)
+ .map_err(|err| {
+ err.with_operation(Operation::Rename)
+ .with_context("service", self.meta.scheme())
+ .with_context("from", from)
+ .with_context("to", to)
+ })
+ .await
+ }
+
  async fn stat(&self, path: &str, args: OpStat) -> Result<RpStat> {
  self.inner
  .stat(path, args)
@@ -284,6 +308,24 @@ impl<A: Accessor> LayeredAccessor for ErrorContextAccessor<A> {
  })
  }
 
+ fn blocking_copy(&self, from: &str, to: &str, args: OpCopy) -> Result<RpCopy> {
+ self.inner.blocking_copy(from, to, args).map_err(|err| {
+ err.with_operation(Operation::BlockingCopy)
+ .with_context("service", self.meta.scheme())
+ .with_context("from", from)
+ .with_context("to", to)
+ })
+ }
+
+ fn blocking_rename(&self, from: &str, to: &str, args: OpRename) -> Result<RpRename> {
+ self.inner.blocking_rename(from, to, args).map_err(|err| {
+ err.with_operation(Operation::BlockingRename)
+ .with_context("service", self.meta.scheme())
+ .with_context("from", from)
+ .with_context("to", to)
+ })
+ }
+
  fn blocking_stat(&self, path: &str, args: OpStat) -> Result<RpStat> {
  self.inner.blocking_stat(path, args).map_err(|err| {
  err.with_operation(Operation::BlockingStat)

core/src/layers/logging.rs

@@ -827,7 +827,7 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
  target: LOGGING_TARGET,
  "service={} operation={} from={} to={} -> started",
  self.scheme,
- Operation::BlockingMove,
+ Operation::BlockingRename,
  from,
  to,
  );
@@ -839,7 +839,7 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
  target: LOGGING_TARGET,
  "service={} operation={} from={} to={} -> finished",
  self.scheme,
- Operation::BlockingMove,
+ Operation::BlockingRename,
  from,
  to,
  );
@@ -852,7 +852,7 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
  lvl,
  "service={} operation={} from={} to={} -> {}: {err:?}",
  self.scheme,
- Operation::BlockingMove,
+ Operation::BlockingRename,
  from,
  to,
  self.err_status(&err)

core/src/raw/operation.rs

@@ -56,7 +56,7 @@ pub enum Operation {
  /// Operation for [`crate::raw::Accessor::blocking_copy`]
  BlockingCopy,
  /// Operation for [`crate::raw::Accessor::blocking_rename`]
- BlockingMove,
+ BlockingRename,
  /// Operation for [`crate::raw::Accessor::blocking_stat`]
  BlockingStat,
  /// Operation for [`crate::raw::Accessor::blocking_delete`]
@@ -99,7 +99,7 @@ impl From<Operation> for &'static str {
  Operation::BlockingRead => "blocking_read",
  Operation::BlockingWrite => "blocking_write",
  Operation::BlockingCopy => "blocking_copy",
- Operation::BlockingMove => "blocking_rename",
+ Operation::BlockingRename => "blocking_rename",
  Operation::BlockingStat => "blocking_stat",
  Operation::BlockingDelete => "blocking_delete",
  Operation::BlockingList => "blocking_list",

core/tests/behavior/README.md

@@ -38,7 +38,7 @@ Test specific backend(such as `fs`).
 cargo test services_fs
 ```
 
-As `cargo test` only run tests containing the following string in their names, we use `services-fs` to run all tests under `services::fs`.
+As `cargo test` only run tests containing the following string in their names, we use `services_fs` to run all tests under `services::fs`.
 
 To run all tests under `tests/behavior/write.rs` for `fs`, we use `services_fs_write`.