Skip to content

Add support for unpacking using custom Unpacker API #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alessandrod wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for unpacking using custom Unpacker API #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/archive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::io::{self, SeekFrom};
use std::marker;
use std::path::Path;

use crate::entry::{EntryFields, EntryIo};
use crate::entry::{DefaultUnpacker, EntryFields, EntryIo, Unpacker};
use crate::error::TarError;
use crate::other;
use crate::pax::*;
Expand Down Expand Up @@ -106,8 +106,21 @@ impl<R: Read> Archive<R> {
/// ar.unpack("foo").unwrap();
/// ```
pub fn unpack<P: AsRef<Path>>(&mut self, dst: P) -> io::Result<()> {
self.unpack_with(dst, &mut DefaultUnpacker::new())
}

/// Unpacks the contents tarball into the specified `dst`, using a custom
/// [Unpacker].
///
/// This function is similar to [Archive::unpack], but allows the caller to
/// specify a custom [Unpacker].
pub fn unpack_with<P: AsRef<Path>, U: Unpacker>(
&mut self,
dst: P,
unpacker: &mut U,
) -> io::Result<()> {
let me: &mut Archive<dyn Read> = self;
me._unpack(dst.as_ref())
me._unpack(dst.as_ref(), unpacker)
}

/// Set the mask of the permission bits when unpacking this entry.
Expand Down Expand Up @@ -213,7 +226,7 @@ impl Archive<dyn Read + '_> {
})
}

fn _unpack(&mut self, dst: &Path) -> io::Result<()> {
fn _unpack<U: Unpacker>(&mut self, dst: &Path, unpacker: &mut U) -> io::Result<()> {
if dst.symlink_metadata().is_err() {
fs::create_dir_all(&dst)
.map_err(|e| TarError::new(format!("failed to create `{}`", dst.display()), e))?;
Expand All @@ -235,7 +248,7 @@ impl Archive<dyn Read + '_> {
if file.header().entry_type() == crate::EntryType::Directory {
directories.push(file);
} else {
file.unpack_in(dst)?;
file.unpack_in_with(dst, unpacker)?;
}
}
for mut dir in directories {
Expand Down
Loading