tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: try splitting the huge func

Browse Source
This commit is contained in:
Joonas Koivunen 2020-08-06 21:48:21 +03:00
parent fdc5f8aa84
commit e38c1ff04c
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
http/src/v0/root_files/add.rs
View File

@ -166,23 +166,9 @@ where
match next {
Some(next) => {
let mut read = 0usize;
let mut saved_any = false;
while read < next.len() {
let (iter, used) = adder.push(&next.slice(read..));
read += used;
let maybe_tuple = import_all(&ipfs, iter).await.map_err(AddError::Persisting)?;
let subtotal = maybe_tuple.map(|t| t.1);
total_written += subtotal.unwrap_or(0);
saved_any |= subtotal.is_some();
}
total_read += read as u64;
let (read, saved_any, written) = push_all(&ipfs, &mut adder, next).await?;
total_written += written;
total_read += read;
if saved_any && opts.progress {
// technically we could just send messages but that'd
@ -295,6 +281,33 @@ where
}
}
async fn push_all(
ipfs: &Ipfs<impl IpfsTypes>,
adder: &mut FileAdder,
next: Bytes,
) -> Result<(u64, bool, u64), AddError> {
let mut read = 0usize;
let mut saved_any = false;
let mut total_written = 0;
while read < next.len() {
let (iter, used) = adder.push(&next.slice(read..));
read += used;
let maybe_tuple = import_all(&ipfs, iter)
.await
.map_err(AddError::Persisting)?;
let subtotal = maybe_tuple.map(|t| t.1);
total_written += subtotal.unwrap_or(0);
saved_any |= subtotal.is_some();
}
Ok((read as u64, saved_any, total_written))
}
async fn import_all(
ipfs: &Ipfs<impl IpfsTypes>,
iter: impl Iterator<Item = (Cid, Vec<u8>)>,