optimize: speed up fav fetch

CHANGELOG.md

@@ -10,10 +10,11 @@ Note: In this file, do not use the hard wrap in the middle of a sentence for com
 
 ## [Unreleased]
 
-### [0.2.17] - 2024-05-12
+### [0.2.17] - 2024-05-17
 
 - improve: show more infos(timestamp) in `fav -V`.
 - fix: meaningless version message when building without a git tree.
+- optimize: speed up `fav fetch`
 
 ## [0.2.16] - 2024-05-10
 

fav_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fav_core"
-version = "0.0.7"
+version = "0.0.8"
 authors.workspace = true
 description = "Fav's core crate; A collection of traits."
 license.workspace = true

fav_core/src/api.rs

@@ -108,6 +108,7 @@ mod tests {
         }
     }
 
+    #[allow(dead_code)]
     struct LoginApi;
 
     impl Api for LoginApi {

fav_utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fav_utils"
-version = "0.0.3"
+version = "0.0.4"
 authors.workspace = true
 description = "Fav's utils crate; A collection of utilities and data structures for the fav project"
 license.workspace = true
@@ -11,29 +11,31 @@ documentation = "https://docs.rs/fav_utils"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-# Core
+# core
 fav_core.workspace = true
 # CLI
 indicatif = { version = "0.17", features = ["tokio"] }
-# Serde
+# serde
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1" }
-# ProtoBuf
+# protoBuf
 protobuf = { version = "3", features = ["with-bytes"] }
 protobuf-json-mapping = { version = "3" }
-# Net
+# net
 reqwest = { version = "0.12", features = ["json", "cookies"] }
 url = "2.5"
-# Runtime
+# async
 tokio = { version = "1", features = [
     "macros",
     "rt-multi-thread",
     "signal",
     "process",
 ] }
+tokio-stream = { version = "0.1" }
+futures = "0.3"
 # tracing
 tracing = { version = "0.1" }
-# Tools
+# tools
 qrcode = { version = "0.14", default-features = false }
 tempfile = "3.10.1"
 sanitize-filename = "0.5.0"

fav_utils/src/bili/ops.rs

@@ -2,6 +2,7 @@ use super::api::ApiKind;
 use super::{Bili, BiliRes, BiliSet, BiliSets};
 use crate::{utils::qr::show_qr_code, FavUtilsError, FavUtilsResult};
 use fav_core::{prelude::*, status::SetStatusExt as _};
+use futures::StreamExt;
 use reqwest::Response;
 use std::collections::HashMap;
 use tokio::time::{sleep, Duration};
@@ -66,13 +67,16 @@ impl SetOps for Bili {
     async fn fetch_set(&self, set: &mut BiliSet) -> FavCoreResult<()> {
         let id = set.id.to_string();
         info!("Fetching set<{}>", id);
-        for pn in 1..=set.media_count.saturating_sub(1) / 20 + 1 {
-            let pn = pn.to_string();
-            let params = vec![id.clone(), pn, "20".to_string()];
-            *set |= self
-                .request_proto::<BiliSet>(ApiKind::FetchSet, params, "/data")
-                .await?
-                .with_res_status_on(StatusFlags::FAV);
+        let page_count = set.media_count.saturating_sub(1) / 20 + 1;
+        let mut stream = tokio_stream::iter(1..=page_count)
+            .map(|pn| {
+                let pn = pn.to_string();
+                let params = vec![id.clone(), pn, "20".to_string()];
+                self.request_proto::<BiliSet>(ApiKind::FetchSet, params, "/data")
+            })
+            .buffer_unordered(10);
+        while let Some(res) = stream.next().await {
+            *set |= res?.with_res_status_on(StatusFlags::FAV);
         }
         info!("Fetch set<{}> successfully.", id);
         Ok(())