fix not counted progress

docker2fl/src/docker2fl.rs

@@ -117,14 +117,14 @@ impl DockerImageToFlist {
         .await
         .context("failed to pack flist")?;
 
+        log::info!("flist has been created successfully");
         Ok(())
     }
 
     pub async fn convert<S: Store>(&mut self, store: S, sender: Option<Sender<i32>>) -> Result<()> {
         self.prepare().await?;
         self.pack(store, sender).await?;
 
-        log::info!("flist has been created successfully");
         Ok(())
     }
 }

fl-server/src/handlers.rs

@@ -61,7 +61,7 @@ pub enum FlistState {
 #[derive(Debug, Clone, Serialize)]
 pub struct FlistStateInfo {
     msg: String,
-    progress: usize,
+    progress: f32,
 }
 
 #[utoipa::path(
@@ -221,9 +221,7 @@ pub async fn create_flist_handler(
         );
 
         let res = docker_to_fl.prepare().await;
-        // remove the file created with the writer if fl creation failed
         if res.is_err() {
-            let _ = tokio::fs::remove_file(&fl_path).await;
             state.jobs_state.lock().unwrap().insert(
                 job.id.clone(),
                 FlistState::Failed(format!("flist preparing '{}' has failed", fl_name)),
@@ -232,17 +230,21 @@ pub async fn create_flist_handler(
         }
 
         let files_count = docker_to_fl.files_count();
+        let st = state.clone();
+        let job_id = job.id.clone();
         tokio::spawn(async move {
-            for _ in 0..files_count {
-                let step = rx.recv().unwrap() as usize;
-                // state.jobs_state.lock().unwrap().insert(
-                //     job.id.clone(),
-                //     FlistState::InProgress(FlistStateInfo {
-                //         msg: "flist is in progress".to_string(),
-                //         progress: step / files_count * 100,
-                //     }),
-                // ); //TODO:
-                log::info!("val '{}'", step / files_count * 100);
+            let mut progress: f32 = 0.0;
+
+            for _ in 0..files_count - 1 {
+                let step = rx.recv().unwrap() as f32;
+                progress += step;
+                st.jobs_state.lock().unwrap().insert(
+                    job_id.clone(),
+                    FlistState::InProgress(FlistStateInfo {
+                        msg: "flist is in progress".to_string(),
+                        progress: progress / files_count as f32 * 100.0,
+                    }),
+                );
             }
         });
 

rfs/src/main.rs

@@ -124,7 +124,7 @@ fn pack(opts: PackOptions) -> Result<()> {
     rt.block_on(async move {
         let store = store::parse_router(opts.store.as_slice()).await?;
         let meta = fungi::Writer::new(opts.meta).await?;
-        rfs::pack(meta, store, opts.target, !opts.no_strip_password).await?;
+        rfs::pack(meta, store, opts.target, !opts.no_strip_password, None).await?;
 
         Ok(())
     })

rfs/src/pack.rs

@@ -139,6 +139,14 @@ async fn pack_one<S: Store>(
         let meta = child.metadata().await?;
         let child_path = path.join(&name);
 
+        if sender.is_some() {
+            sender
+                .clone()
+                .unwrap()
+                .send(1)
+                .context("failed to send progress")?;
+        }
+
         // if this child a directory we add to the tail of the list
         if meta.is_dir() {
             list.push_back(Item(current, child_path.clone(), name, meta));
@@ -178,14 +186,6 @@ async fn pack_one<S: Store>(
         worker
             .send((child_ino, child_path))
             .context("failed to schedule file upload")?;
-
-        if sender.is_some() {
-            sender
-                .clone()
-                .unwrap()
-                .send(1)
-                .context("failed to send progress")?;
-        }
     }
     Ok(())
 }