Refactor: Extract download_and_extract_with_filter

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>

src/drivers.rs

@@ -110,7 +110,7 @@ pub async fn fetch_crate_cratesio(
     let main = src.join("main.rs");
     let bin = src.join("bin");
 
-    download_and_extract(
+    download_and_extract_with_filter(
         Url::parse(&crate_url)?,
         PkgFmt::Tgz,
         &temp_dir,

src/fetchers/gh_crate_meta.rs

@@ -43,7 +43,7 @@ impl super::Fetcher for GhCrateMeta {
     async fn fetch_and_extract(&self, dst: &Path) -> Result<(), BinstallError> {
         let url = self.url()?;
         info!("Downloading package from: '{url}'");
-        download_and_extract::<fn(&Path) -> bool, _>(url, self.pkg_fmt(), dst, None).await
+        download_and_extract(url, self.pkg_fmt(), dst).await
     }
 
     fn pkg_fmt(&self) -> PkgFmt {

src/fetchers/quickinstall.rs

@@ -40,8 +40,7 @@ impl super::Fetcher for QuickInstall {
     async fn fetch_and_extract(&self, dst: &Path) -> Result<(), BinstallError> {
         let url = self.package_url();
         info!("Downloading package from: '{url}'");
-        download_and_extract::<fn(&Path) -> bool, _>(Url::parse(&url)?, self.pkg_fmt(), dst, None)
+        download_and_extract(Url::parse(&url)?, self.pkg_fmt(), dst).await
-            .await
     }
 
     fn pkg_fmt(&self) -> PkgFmt {

src/helpers.rs

@@ -43,13 +43,26 @@ pub async fn remote_exists(url: Url, method: Method) -> Result<bool, BinstallErr
     Ok(req.status().is_success())
 }
 
-/// Download a file from the provided URL and extract it to the provided path
+/// Download a file from the provided URL and extract it to the provided path.
+pub async fn download_and_extract<P: AsRef<Path>>(
+    url: Url,
+    fmt: PkgFmt,
+    path: P,
+) -> Result<(), BinstallError> {
+    download_and_extract_with_filter::<fn(&Path) -> bool, _>(url, fmt, path.as_ref(), None).await
+}
+
+/// Download a file from the provided URL and extract part of it to
+/// the provided path.
 ///
 ///  * `filter` - If Some, then it will pass the path of the file to it
 ///    and only extract ones which filter returns `true`.
 ///    Note that this is a best-effort and it only works when `fmt`
 ///    is not `PkgFmt::Bin` or `PkgFmt::Zip`.
-pub async fn download_and_extract<Filter: FnMut(&Path) -> bool + Send + 'static, P: AsRef<Path>>(
+pub async fn download_and_extract_with_filter<
+    Filter: FnMut(&Path) -> bool + Send + 'static,
+    P: AsRef<Path>,
+>(
     url: Url,
     fmt: PkgFmt,
     path: P,