Option to postpone setting the boot partition after update

esp-rs · Sep 21, 2023 · a249859 · a249859
1 parent 8c6f9d6
commit a249859
Showing 1 changed file with 23 additions and 7 deletions.
diff --git a/src/ota.rs b/src/ota.rs
@@ -141,12 +141,16 @@ where
 }
 
 pub trait OtaUpdate: Write {
-    fn complete(&mut self) -> Result<(), Self::Error>;
+    type OtaUpdateFinished: OtaUpdateFinished;
 
-    fn abort(&mut self) -> Result<(), Self::Error>;
+    fn finish(self) -> Result<Self::OtaUpdateFinished, Self::Error>;
+
+    fn complete(self) -> Result<(), Self::Error>;
+
+    fn abort(self) -> Result<(), Self::Error>;
 
     fn update<R>(
-        &mut self,
+        mut self,
         read: R,
         progress: impl Fn(u64, u64),
     ) -> Result<(), CopyError<R::Error, Self::Error>>
@@ -156,7 +160,7 @@ pub trait OtaUpdate: Write {
     {
         let mut buf = [0_u8; 64];
 
-        match copy_len_with_progress(read, &mut *self, &mut buf, u64::MAX, progress) {
+        match copy_len_with_progress(read, &mut self, &mut buf, u64::MAX, progress) {
             Ok(_) => self.complete().map_err(CopyError::Write),
             Err(e) => {
                 self.abort().map_err(CopyError::Write)?;
@@ -167,6 +171,10 @@ pub trait OtaUpdate: Write {
     }
 }
 
+pub trait OtaUpdateFinished: ErrorType {
+    fn activate(self) -> Result<(), Self::Error>;
+}
+
 #[cfg(feature = "nightly")]
 pub mod asynch {
     use crate::io::asynch::{ErrorType, Read, Write};
@@ -236,17 +244,25 @@ pub mod asynch {
     }
 
     pub trait OtaUpdate: Write {
-        async fn complete(&mut self) -> Result<(), Self::Error>;
+        type OtaUpdateFinished: OtaUpdateFinished;
 
-        async fn abort(&mut self) -> Result<(), Self::Error>;
+        async fn finish(self) -> Result<Self::OtaUpdateFinished, Self::Error>;
+
+        async fn complete(self) -> Result<(), Self::Error>;
+
+        async fn abort(self) -> Result<(), Self::Error>;
 
         async fn update<R>(
-            &mut self,
+            self,
             read: R,
             progress: impl Fn(u64, u64),
         ) -> Result<(), CopyError<R::Error, Self::Error>>
         where
             R: Read,
             Self: Sized;
     }
+
+    pub trait OtaUpdateFinished: ErrorType {
+        async fn activate(self) -> Result<(), Self::Error>;
+    }
 }