rebased and compiling again

libs/helpers/Cargo.toml

@@ -8,13 +8,13 @@ edition = "2021"
 [dependencies]
 async-trait = "0.1.64"
 color-eyre = "0.6.2"
-futures = "0.3.21"
+futures = "0.3.28"
 lazy_async_pool = "0.3.3"
 models = { path = "../models" }
-pin-project = "1.0.11"
+pin-project = "1.1.3"
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
-tokio = { version = "1.23", features = ["full"] }
-tokio-stream = { version = "0.1.9", features = ["io-util", "sync"] }
-tracing = "0.1.35"
+tokio = { version = "1", features = ["full"] }
+tokio-stream = { version = "0.1.14", features = ["io-util", "sync"] }
+tracing = "0.1.39"
 yajrc = { version = "*", git = "https://github.com/dr-bonez/yajrc.git", branch = "develop" }

libs/helpers/src/lib.rs

@@ -72,11 +72,29 @@ pub async fn canonicalize(
 
 #[pin_project::pin_project(PinnedDrop)]
 pub struct NonDetachingJoinHandle<T>(#[pin] JoinHandle<T>);
+impl<T> NonDetachingJoinHandle<T> {
+    pub async fn wait_for_abort(self) -> Result<T, JoinError> {
+        self.abort();
+        self.await
+    }
+}
 impl<T> From<JoinHandle<T>> for NonDetachingJoinHandle<T> {
     fn from(t: JoinHandle<T>) -> Self {
         NonDetachingJoinHandle(t)
     }
 }
+
+impl<T> Deref for NonDetachingJoinHandle<T> {
+    type Target = JoinHandle<T>;
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+impl<T> DerefMut for NonDetachingJoinHandle<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
 #[pin_project::pinned_drop]
 impl<T> PinnedDrop for NonDetachingJoinHandle<T> {
     fn drop(self: std::pin::Pin<&mut Self>) {
@@ -94,17 +112,6 @@ impl<T> Future for NonDetachingJoinHandle<T> {
         this.0.poll(cx)
     }
 }
-impl<T> Deref for NonDetachingJoinHandle<T> {
-    type Target = JoinHandle<T>;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-impl<T> DerefMut for NonDetachingJoinHandle<T> {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
 
 pub struct AtomicFile {
     tmp_path: PathBuf,

libs/helpers/src/rsync.rs

@@ -74,7 +74,7 @@ impl Rsync {
             cmd.arg("--no-perms");
         }
         let mut command = cmd
-            .arg("-acAXH")
+            .arg("-actAXH")
             .arg("--info=progress2")
             .arg("--no-inc-recursive")
             .arg(src.as_ref())