lifegpc/pixiv_downloader
1
0
Fork 0
mirror of https://github.com/lifegpc/pixiv_downloader.git synced 2026-07-08 01:32:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove all spin_on

Browse Source
This commit is contained in:
lifegpc
2022-06-18 15:09:09 +00:00
committed by GitHub
parent 6f9b6ef254
commit 5cecdd4359
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/downloader/tasks.rs
View File

@@ -2,13 +2,14 @@ use super::downloader::DownloaderInternal;
use super::downloader::GetTargetFileName;
use super::error::DownloaderError;
use crate::ext::io::ClearFile;
use crate::ext::replace::ReplaceWith2;
use crate::ext::rw_lock::GetRwLock;
use crate::ext::try_err::TryErr;
use crate::gettext;
use futures_util::StreamExt;
use http_content_range::ContentRange;
use itertools::partition;
use reqwest::Response;
use spin_on::spin_on;
use std::io::Seek;
use std::io::SeekFrom;
use std::io::Write;
@@ -230,35 +231,34 @@ pub async fn check_tasks<
let mut need_break = false;
let mut dur = None;
{
let mut tasks = d.tasks.get_mut();
tasks.retain_mut(|task| {
if task.is_finished() {
let re = spin_on(task).unwrap();
match re {
Ok(_) => {
if !d.is_multi_threads() {
d.set_downloaded();
need_break = true;
}
let mut tasks = d.tasks.replace_with2(Vec::new());
let mut index = partition(&mut tasks, |s| s.is_finished());
while index > 0 {
let task = tasks.remove(0);
let re = task.await.unwrap();
match re {
Ok(_) => {
if !d.is_multi_threads() {
d.set_downloaded();
need_break = true;
}
Err(e) => {
println!("{}", e);
if !d.is_multi_threads() {
match d.get_retry_duration() {
Some(d) => dur = Some(d),
None => {
d.set_panic(e);
need_break = true;
}
}
Err(e) => {
println!("{}", e);
if !d.is_multi_threads() {
match d.get_retry_duration() {
Some(d) => dur = Some(d),
None => {
d.set_panic(e);
need_break = true;
}
}
}
}
false
} else {
true
}
});
index -= 1;
}
d.tasks.replace_with2(tasks);
}
if !d.is_multi_threads() && dur.is_some() {
let dur = dur.unwrap();

1
src/main.rs
View File

@@ -11,6 +11,7 @@ extern crate http;
extern crate http_content_range;
extern crate indicatif;
extern crate int_enum;
extern crate itertools;
extern crate json;
#[macro_use]
extern crate lazy_static;