Merge pull request #429 from joebonrichie/draft-infer-extension

boulder/draft: Use infer to get extension type to perform extraction

Cargo.toml

@@ -81,6 +81,7 @@ xxhash-rust = { version = "0.8.11", features = ["xxh3"] }
 zstd = { version = "0.13.2", features = ["zstdmt"] }
 mailparse = "0.15.0"
 zbus = "5.1.1"
+infer = "0.19.0"
 
 [workspace.lints.rust]
 rust_2018_idioms = { level = "warn", priority = -1 }

boulder/Cargo.toml

@@ -49,6 +49,7 @@ thread-priority.workspace = true
 tokio.workspace = true
 url.workspace = true
 mailparse.workspace = true
+infer.workspace = true
 
 [lints]
 workspace = true

boulder/src/draft/upstream.rs

@@ -81,37 +81,49 @@ async fn fetch(url: &Url, output: &Path) -> Result<String, Error> {
 }
 
 async fn extract(archive: &Path, destination: &Path) -> Result<(), Error> {
-    let extension = archive
-        .extension()
-        .map(|e| e.to_string_lossy().to_string())
-        .unwrap_or_else(|| "tar".to_owned());
-
-    // If we can't specialise (.zip, etc) assume its a tar
-    let result = match extension.as_str() {
-        "zip" => {
-            Command::new("unzip")
-                .arg(archive)
-                .arg("-d")
-                .arg(destination)
-                .output()
-                .await?
+    if let Some(kind) = infer::get_from_path(archive)? {
+        println!("Detected type: {} ({})", kind.mime_type(), kind.extension());
+        // If we can't specialise (.zip, etc) assume its a tar
+        let result = match kind.extension() {
+            "zip" => {
+                Command::new("unzip")
+                    .arg(archive)
+                    .arg("-d")
+                    .arg(destination)
+                    .output()
+                    .await?
+            }
+            _ => {
+                Command::new("tar")
+                    .arg("xf")
+                    .arg(archive)
+                    .arg("-C")
+                    .arg(destination)
+                    .output()
+                    .await?
+            }
+        };
+        if result.status.success() {
+            Ok(())
+        } else {
+            eprintln!("Command exited with: {}", String::from_utf8_lossy(&result.stderr));
+            Err(Error::Extract(result.status))
         }
-        _ => {
-            Command::new("tar")
-                .arg("xf")
-                .arg(archive)
-                .arg("-C")
-                .arg(destination)
-                .output()
-                .await?
-        }
-    };
-
-    if result.status.success() {
-        Ok(())
     } else {
-        eprintln!("Command exited with: {}", String::from_utf8_lossy(&result.stderr));
-        Err(Error::Extract(result.status))
+        println!("Unknown file type, attempting tar extraction");
+        let result = Command::new("tar")
+            .arg("xf")
+            .arg(archive)
+            .arg("-C")
+            .arg(destination)
+            .output()
+            .await?;
+        if result.status.success() {
+            Ok(())
+        } else {
+            eprintln!("Command exited with: {}", String::from_utf8_lossy(&result.stderr));
+            Err(Error::Extract(result.status))
+        }
     }
 }