Skip to content

fix: simple .tar files are not extracted properly #7567

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

Merged
jdx merged 1 commit into from
Jan 5, 2026
Merged

fix: simple .tar files are not extracted properly #7567

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
5 changes: 5 additions & 0 deletions src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,8 @@ pub enum TarFormat {
TarBz2,
#[strum(serialize = "tar.zst")]
TarZst,
#[strum(serialize = "tar")]
Tar,
#[strum(serialize = "zip")]
Zip,
#[strum(serialize = "7z")]
Expand All @@ -705,6 +707,7 @@ pub enum TarFormat {
impl TarFormat {
pub fn from_ext(ext: &str) -> Self {
match ext {
"tar" => TarFormat::Tar,
"gz" | "tgz" => TarFormat::TarGz,
"xz" | "txz" => TarFormat::TarXz,
"bz2" | "tbz2" => TarFormat::TarBz2,
Expand Down Expand Up @@ -877,12 +880,14 @@ fn open_tar(format: TarFormat, archive: &Path) -> Result<Box<dyn std::io::Read>>
TarFormat::TarXz => Box::new(xz2::read::XzDecoder::new(f)),
TarFormat::TarBz2 => Box::new(BzDecoder::new(f)),
TarFormat::TarZst => Box::new(zstd::stream::read::Decoder::new(f)?),
TarFormat::Tar => Box::new(f),
Comment thread
roele marked this conversation as resolved.
TarFormat::Zip => bail!("zip format not supported"),
TarFormat::SevenZip => bail!("7z format not supported"),
TarFormat::Auto => match archive.extension().and_then(|s| s.to_str()) {
Some("xz") => open_tar(TarFormat::TarXz, archive)?,
Some("bz2") => open_tar(TarFormat::TarBz2, archive)?,
Some("zst") => open_tar(TarFormat::TarZst, archive)?,
Some("tar") => open_tar(TarFormat::Tar, archive)?,
Some("zip") => bail!("zip format not supported"),
_ => open_tar(TarFormat::TarGz, archive)?,
},
Expand Down
Loading