pass params by ref to recurse_files

gets rid of the return value and moving around of the zip
and decoder data
avoids cloning the path prefix on every recursion

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 3cb52a4cc5ea7361531033c752395e7fdbca61c7..38f54090035f9b1ce7349922ac5346f31bcee5c6 100644 (file)
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -2,7 +2,7 @@ use std::collections::{HashSet, HashMap};
 use std::ffi::OsStr;
 use std::os::unix::ffi::OsStrExt;
 use std::sync::{Arc, Mutex};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::pin::Pin;
 
 use anyhow::{bail, format_err, Error};
@@ -1248,12 +1248,12 @@ fn catalog(
     Ok(res.into())
 }
 
-fn recurse_files<T, W>(
-    mut zip: ZipEncoder<W>,
-    mut decoder: Accessor<T>,
-    prefix: PathBuf,
+fn recurse_files<'a, T, W>(
+    zip: &'a mut ZipEncoder<W>,
+    decoder: &'a mut Accessor<T>,
+    prefix: &'a Path,
     file: FileEntry<T>,
-) -> Pin<Box<dyn Future<Output = Result<(ZipEncoder<W>, Accessor<T>), Error>> + Send + 'static>>
+) -> Pin<Box<dyn Future<Output = Result<(), Error>> + Send + 'a>>
 where
     T: Clone + pxar::accessor::ReadAt + Unpin + Send + Sync + 'static,
     W: tokio::io::AsyncWrite + Unpin + Send + 'static,
@@ -1298,16 +1298,13 @@ where
                 zip.add_entry::<FileContents<T>>(entry, None).await?;
                 while let Some(entry) = readdir.next().await {
                     let entry = entry?.decode_entry().await?;
-                    let (zip_tmp, decoder_tmp) =
-                        recurse_files(zip, decoder, prefix.clone(), entry).await?;
-                    zip = zip_tmp;
-                    decoder = decoder_tmp;
+                    recurse_files(zip, decoder, prefix, entry).await?;
                 }
             }
             _ => {} // ignore all else
         };
 
-        Ok((zip, decoder))
+        Ok(())
     })
 }
 
@@ -1420,10 +1417,11 @@ fn pxar_file_download(
                 }
 
                 let channelwriter = AsyncChannelWriter::new(sender, 1024 * 1024);
-                let zipencoder = ZipEncoder::new(channelwriter);
 
                 crate::server::spawn_internal_task(async move {
-                    let (mut zipencoder, _) = recurse_files(zipencoder, decoder, prefix, file)
+                    let mut zipencoder = ZipEncoder::new(channelwriter);
+                    let mut decoder = decoder;
+                    recurse_files(&mut zipencoder, &mut decoder, &prefix, file)
                         .await
                         .map_err(|err| eprintln!("error during creating of zip: {}", err))?;