Merge pull request #77 from axodotdev/zstd

fix: actually compress zstd with zstd

Cargo.toml

@@ -13,7 +13,7 @@ json-serde = ["serde_json", "serde"]
 toml-edit = ["toml_edit"]
 remote = ["reqwest"]
 compression = ["compression-tar", "compression-zip"]
-compression-tar = ["flate2", "tar", "xz2"]
+compression-tar = ["flate2", "tar", "xz2", "zstd"]
 compression-zip = ["zip"]
 
 [dependencies]
@@ -32,6 +32,7 @@ tar = { version = "0.4.38", optional = true }
 zip = { version = "0.6.4", optional = true }
 flate2 = { version = "1.0.25", optional = true }
 xz2 = { version = "0.1.7", optional = true, features = ["static"] }
+zstd = { version = "0.13.0", optional = true }
 toml_edit = { version = "0.21.0", optional = true }
 walkdir = "2.3.3"
 

src/compression.rs

@@ -22,9 +22,10 @@ pub(crate) fn tar_dir(
     compression: &CompressionImpl,
 ) -> crate::error::Result<()> {
     use crate::error::*;
-    use flate2::{write::ZlibEncoder, Compression, GzBuilder};
+    use flate2::{Compression, GzBuilder};
     use std::fs;
     use xz2::write::XzEncoder;
+    use zstd::stream::Encoder as ZstdEncoder;
 
     // Set up the archive/compression
     // dir_name here is a prefix directory/path that the src dir's contents will be stored
@@ -117,7 +118,12 @@ pub(crate) fn tar_dir(
         }
         CompressionImpl::Zstd => {
             // Wrap our file in compression
-            let zip_output = ZlibEncoder::new(final_zip_file, Compression::default());
+            let zip_output = ZstdEncoder::new(final_zip_file, 0).map_err(|details| {
+                AxoassetError::LocalAssetArchive {
+                    reason: format!("failed to create zstd encoder"),
+                    details,
+                }
+            })?;
 
             // Write the tar to the compression stream
             let mut tar = tar::Builder::new(zip_output);