Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: 减少并发下载量与 read_timeout 值 #96

Merged
merged 2 commits into from
May 3, 2024
Merged

chore: 减少并发下载量与 read_timeout 值 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6ba99d
chore: 减少并发下载量与 read_timeout 值
amtoaer May 3, 2024
2313d03
chore: 修正注释
amtoaer May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bilibili/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl Client {
.default_headers(headers)
.gzip(true)
.connect_timeout(std::time::Duration::from_secs(10))
.read_timeout(std::time::Duration::from_secs(30))
.read_timeout(std::time::Duration::from_secs(10))
.build()
.unwrap(),
)
Expand Down
8 changes: 4 additions & 4 deletions src/core/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ pub async fn download_unprocessed_videos(
favorite_model.f_id, favorite_model.name
);
let unhandled_videos_pages = unhandled_videos_pages(&favorite_model, connection).await?;
// 对于视频，允许五个同时下载（视频内还有分页、不同分页还有多种下载任务）
let semaphore = Semaphore::new(5);
// 对于视频，允许三个同时下载（视频内还有分页、不同分页还有多种下载任务）
let semaphore = Semaphore::new(3);
let downloader = Downloader::new(bili_client.client.clone());
let mut uppers_mutex: HashMap<i64, (Mutex<()>, Mutex<()>)> = HashMap::new();
for (video_model, _) in &unhandled_videos_pages {
Expand Down Expand Up @@ -312,8 +312,8 @@ pub async fn dispatch_download_page(
if !should_run {
return Ok(());
}
// 对于视频的分页，允许同时下载三个同时下载（绝大部分是单页视频）
let child_semaphore = Semaphore::new(5);
// 对于视频的分页，允许两个同时下载（绝大部分是单页视频）
let child_semaphore = Semaphore::new(2);
let mut tasks = pages
.into_iter()
.map(|page_model| download_page(bili_client, video_model, page_model, &child_semaphore, downloader))
Expand Down