Add support for the .bz2 and .tar.bz2 file extensions

Cargo.toml

@@ -29,6 +29,7 @@ result = "1.0.0"
 serde = { version = "1.0.202", features = ["derive"] }
 strum = { version = "0.26.2", features = ["derive"] }
 tempfile = "3.10.1"
+test-case = "3.3.1"
 thiserror = "1.0.61"
 tokio = { version = "1.37.0", default-features = false, features = ["macros", "rt"] }
 url = { version = "2.5.0", features = ["serde"] }

Changes.md

@@ -1,3 +1,5 @@
+- Added support for the `.bz2` and `.tar.bz2 file extensions.
+
 ## 0.0.30 - 2024-05-11
 
 - When a project's releases contain a mix of file names with and without an architecture, `ubi` will

src/extension.rs

@@ -1,12 +1,14 @@
 use itertools::Itertools;
 use strum::{EnumIter, IntoEnumIterator};
 
-#[derive(Debug, EnumIter)]
+#[derive(Debug, EnumIter, PartialEq, Eq)]
 pub(crate) enum Extension {
     Bz,
+    Bz2,
     Exe,
     Gz,
     TarBz,
+    TarBz2,
     TarGz,
     TarXz,
     Tbz,
@@ -20,9 +22,11 @@ impl Extension {
     pub(crate) fn extension(&self) -> &'static str {
         match self {
             Extension::Bz => ".bz",
+            Extension::Bz2 => ".bz2",
             Extension::Exe => ".exe",
             Extension::Gz => ".gz",
             Extension::TarBz => ".tar.bz",
+            Extension::TarBz2 => ".tar.bz2",
             Extension::TarGz => ".tar.gz",
             Extension::TarXz => ".tar.xz",
             Extension::Tbz => ".tbz",

src/installer.rs

@@ -48,12 +48,13 @@ impl Installer {
             .to_string_lossy();
         match Extension::from_path(filename) {
             Some(Extension::TarBz)
+            | Some(Extension::TarBz2)
             | Some(Extension::TarGz)
             | Some(Extension::TarXz)
             | Some(Extension::Tbz)
             | Some(Extension::Tgz)
             | Some(Extension::Txz) => self.extract_tarball(downloaded_file),
-            Some(Extension::Bz) => self.unbzip(downloaded_file),
+            Some(Extension::Bz) | Some(Extension::Bz2) => self.unbzip(downloaded_file),
             Some(Extension::Gz) => self.ungzip(downloaded_file),
             Some(Extension::Xz) => self.unxz(downloaded_file),
             Some(Extension::Zip) => self.extract_zip(downloaded_file),
@@ -170,7 +171,9 @@ fn tar_reader_for(downloaded_file: PathBuf) -> Result<Archive<Box<dyn Read>>> {
     let ext = downloaded_file.extension();
     match ext {
         Some(ext) => match ext.to_str() {
-            Some("bz") | Some("tbz") => Ok(Archive::new(Box::new(BzDecoder::new(file)))),
+            Some("bz") | Some("tbz") | Some("bz2") | Some("tbz2") => {
+                Ok(Archive::new(Box::new(BzDecoder::new(file))))
+            }
             Some("gz") | Some("tgz") => Ok(Archive::new(Box::new(GzDecoder::new(file)))),
             Some("xz") | Some("txz") => Ok(Archive::new(Box::new(XzDecoder::new(file)))),
             Some(e) => Err(anyhow!(