chore: merge

Author: CyanChanges

.github/workflows/test.yml

@@ -34,13 +34,13 @@ jobs:
           echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
 
       - name: Test
-        run: cargo test --all --verbose
+        run: cargo test --workspace --all-features --all-targets --verbose
 
       - name: Build
-        run: cargo build --all --verbose
+        run: cargo build --workspace --all-features --all-targets --verbose
 
       - name: Clippy
-        run: cargo clippy --all --verbose -- -Dwarnings
+        run: cargo clippy --workspace --all-features --all-targets --verbose -- -Dwarnings
 
   check-minimal:
     name: Check minimal versions
@@ -63,7 +63,7 @@ jobs:
           echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
 
       - name: Check minimal versions
-        run: cargo check --all --all-targets -Z minimal-versions
+        run: cargo check --workspace --all-features --all-targets -Z minimal-versions
 
   format:
     runs-on: ubuntu-latest
@@ -78,4 +78,4 @@ jobs:
           components: rustfmt
 
       - name: Run rustfmt
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all --check

Cargo.lock

@@ -13,8 +13,8 @@ authors = ["share121 <[email protected]>", "Cyan Changes <[email protected]>"]
 spin = { version = "0.10.0", features = [
     "spin_mutex",
 ], default-features = false }
-fast-pull = { version = "3.0.5", path = "crates/fast-pull" }
-fast-steal = { version = "6.0.5", path = "crates/fast-steal" }
+fast-pull = { version = "4.0.0", path = "crates/fast-pull" }
+fast-steal = { version = "6.0.6", path = "crates/fast-steal" }
 kanal = "0.1.1"
 bytes = { version = "1.10.1", default-features = false }
 futures = { version = "0.3.31", default-features = false }

Cargo.toml

@@ -50,9 +50,13 @@ impl ReadStream for WorkerPuller {
     async fn read_with<'a, F, Fut, Ret>(&'a mut self, read_fn: F) -> Result<Ret, Self::Error>
     where
         F: FnOnce(SliceOrBytes<'a>) -> Fut,
-        Fut: Future<Output=Ret>
+        Fut: Future<Output = Ret>,
     {
-        let data = self.rx_data.recv().await.map_err(|_| io::Error::new(io::ErrorKind::BrokenPipe, "data channel closed"))?;
+        let data = self
+            .rx_data
+            .recv()
+            .await
+            .map_err(|_| io::Error::new(io::ErrorKind::BrokenPipe, "data channel closed"))?;
         Ok(read_fn(data.into()).await)
     }
 }
@@ -64,8 +68,7 @@ impl Puller for WorkerFetcher {
     async fn init_read(
         &self,
         maybe_entry: Option<&ProgressEntry>,
-    ) -> Result<impl ReadStream<Error = Self::StreamError> + Send + Unpin, CreateTaskError>
-    {
+    ) -> Result<impl ReadStream<Error = Self::StreamError> + Send + Unpin, CreateTaskError> {
         let (tx_data, rx_data) = kanal::bounded(self.options.data_channel_cap);
         let signal: Arc<DataSignal> = Default::default();
         let (tx_ret, ret) = oneshot::channel();

crates/fast-down/src/curl/puller.rs

@@ -1,12 +1,26 @@
-use super::puller::ReqwestPuller;
+use std::future::Future;
+
+use crate::UrlInfo;
 use content_disposition;
-use fast_pull::UrlInfo;
 use reqwest::{
     Client, IntoUrl, StatusCode, Url,
     header::{self, HeaderMap},
 };
 use sanitize_filename;
 
+pub trait Prefetch {
+    fn prefetch(
+        &self,
+        url: impl IntoUrl + Send,
+    ) -> impl Future<Output = Result<UrlInfo, reqwest::Error>> + Send;
+}
+
+impl Prefetch for Client {
+    async fn prefetch(&self, url: impl IntoUrl + Send) -> Result<UrlInfo, reqwest::Error> {
+        prefetch(self, url).await
+    }
+}
+
 fn get_file_size(headers: &HeaderMap, status: &StatusCode) -> u64 {
     if *status == StatusCode::PARTIAL_CONTENT {
         headers
@@ -36,12 +50,13 @@ fn get_filename(headers: &HeaderMap, final_url: &Url) -> String {
         .get(header::CONTENT_DISPOSITION)
         .and_then(|hv| hv.to_str().ok())
         .and_then(|s| content_disposition::parse_content_disposition(s).filename_full())
+        .map(|s| urlencoding::decode(&s).map(String::from).unwrap_or(s))
         .filter(|s| !s.trim().is_empty());
 
     let from_url = final_url
         .path_segments()
         .and_then(|mut segments| segments.next_back())
-        .and_then(|s| urlencoding::decode(s).ok())
+        .map(|s| urlencoding::decode(s).unwrap_or(s.into()))
         .filter(|s| !s.trim().is_empty())
         .map(|s| s.to_string());
 
@@ -52,14 +67,14 @@ fn get_filename(headers: &HeaderMap, final_url: &Url) -> String {
     sanitize_filename::sanitize_with_options(
         &raw_name,
         sanitize_filename::Options {
-            windows: true,
-            truncate: true,
+            windows: false,
+            truncate: false,
             replacement: "_",
         },
     )
 }
 
-async fn prefetch(client: &Client, url: impl IntoUrl + Send) -> Result<UrlInfo, reqwest::Error> {
+async fn prefetch(client: &Client, url: impl IntoUrl) -> Result<UrlInfo, reqwest::Error> {
     let url = url.into_url()?;
     let resp = match client.head(url.clone()).send().await {
         Ok(resp) => resp,
@@ -69,23 +84,19 @@ async fn prefetch(client: &Client, url: impl IntoUrl + Send) -> Result<UrlInfo,
         Ok(resp) => resp,
         Err(_) => return prefetch_fallback(url, client).await,
     };
-
-    let status = resp.status();
-    let final_url = resp.url();
-
-    let resp_headers = resp.headers();
-    let size = get_file_size(resp_headers, &status);
-
     let supports_range = match resp.headers().get(header::ACCEPT_RANGES) {
         Some(accept_ranges) => accept_ranges
             .to_str()
             .ok()
             .map(|v| v.split(' '))
             .and_then(|supports| supports.into_iter().find(|&ty| ty == "bytes"))
             .is_some(),
-        None => return prefetch_fallback(url, self).await,
+        None => return prefetch_fallback(url, client).await,
     };
-
+    let status = resp.status();
+    let resp_headers = resp.headers();
+    let size = get_file_size(resp_headers, &status);
+    let final_url = resp.url();
     Ok(UrlInfo {
         final_url: final_url.clone(),
         name: get_filename(resp_headers, final_url),
@@ -105,11 +116,10 @@ async fn prefetch_fallback(url: Url, client: &Client) -> Result<UrlInfo, reqwest
         .await?
         .error_for_status()?;
     let status = resp.status();
-    let final_url = resp.url();
-
     let resp_headers = resp.headers();
     let size = get_file_size(resp_headers, &status);
     let supports_range = status == StatusCode::PARTIAL_CONTENT;
+    let final_url = resp.url();
     Ok(UrlInfo {
         final_url: final_url.clone(),
         name: get_filename(resp_headers, final_url),
@@ -123,8 +133,6 @@ async fn prefetch_fallback(url: Url, client: &Client) -> Result<UrlInfo, reqwest
 
 #[cfg(test)]
 mod tests {
-    use alloc::{format, vec};
-
     use super::*;
 
     #[tokio::test]

crates/fast-down/src/reqwest/prefetch.rs

@@ -1,5 +1,6 @@
 use url::Url;
 
+#[derive(Debug)]
 pub struct UrlInfo {
     pub size: u64,
     pub name: String,

crates/fast-down/src/url_info.rs

@@ -5,8 +5,6 @@ mod progress;
 mod puller;
 mod pusher;
 mod total;
-#[cfg(feature = "reqwest")]
-pub(crate) mod url;
 
 pub use data::SliceOrBytes;
 pub use event::*;

crates/fast-pull/src/base/mod.rs

@@ -1,7 +1,5 @@
 extern crate alloc;
-use crate::{
-    ProgressEntry, Puller, Pusher, ReadStream, SliceOrBytes, WriteStream,
-};
+use crate::{ProgressEntry, Puller, Pusher, ReadStream, SliceOrBytes, WriteStream};
 use alloc::vec;
 use alloc::{sync::Arc, vec::Vec};
 use core::sync::atomic::{AtomicUsize, Ordering};
@@ -31,7 +29,7 @@ impl ReadStream for MockPullStream {
         let start = self.1.fetch_add(1, Ordering::SeqCst);
         let end = core::cmp::min(start + 1, self.2);
         if start >= end {
-            return Ok(read_fn(SliceOrBytes::empty()).await)
+            return Ok(read_fn(SliceOrBytes::empty()).await);
         }
         Ok(read_fn(self.0[start..end].into()).await)
     }
@@ -46,7 +44,9 @@ impl Puller for MockRandPuller {
         Ok(MockPullStream(
             self.0.clone(),
             AtomicUsize::new(maybe_entry.map(|entry| entry.start as usize).unwrap_or(0)),
-            maybe_entry.map(|entry| entry.end as usize).unwrap_or(self.0.len()),
+            maybe_entry
+                .map(|entry| entry.end as usize)
+                .unwrap_or(self.0.len()),
         ))
     }
 }
@@ -67,9 +67,9 @@ impl ReadStream for MockSeqPuller {
     {
         let idx = self.1.fetch_add(1, Ordering::SeqCst);
         if idx >= self.0.len() {
-            return Ok(read_fn(SliceOrBytes::empty()).await)
+            return Ok(read_fn(SliceOrBytes::empty()).await);
         }
-        Ok(read_fn(self.0[idx..(idx+1)].into()).await)
+        Ok(read_fn(self.0[idx..(idx + 1)].into()).await)
     }
 }
 

crates/fast-pull/src/base/url.rs

@@ -1,7 +1,7 @@
 extern crate alloc;
 
-use alloc::boxed::Box;
 use crate::Event;
+use alloc::boxed::Box;
 use alloc::sync::Arc;
 use core::sync::atomic::{AtomicBool, Ordering};
 use kanal::AsyncReceiver;