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

download_fanbox_post now use task manager

Browse Source
This commit is contained in:
lifegpc
2022-07-17 03:16:34 +00:00
committed by GitHub
parent 3808a3c067
commit 969c898586
3 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data/fanbox.rs
View File

@@ -14,7 +14,7 @@ pub struct FanboxData {
/// Raw data
pub raw: JsonValue,
#[cfg(feature = "exif")]
pub exif_data: Option<Box<dyn ExifDataSource>>,
pub exif_data: Option<Box<dyn ExifDataSource + Send + Sync>>,
}
impl FanboxData {

70
src/download.rs
View File

@@ -545,6 +545,8 @@ impl Main {
data_file
.save(&json_file)
.try_err(gettext("Failed to save post data to file."))?;
let tasks = TaskManager::default();
let download_mutiple_images = helper.download_multiple_images();
match post {
FanboxPost::Article(article) => {
let article = Arc::new(article);
@@ -572,14 +574,18 @@ impl Main {
let dh = img
.download_original_url()?
.try_err(gettext("Can not get original url for image"))?;
Self::download_fanbox_image(
dh,
np,
None,
Arc::clone(&datas),
Arc::clone(&base),
)
.await?;
tasks
.add_task(Self::download_fanbox_image(
dh,
np,
Some(get_progress_bar()),
Arc::clone(&datas),
Arc::clone(&base),
))
.await;
if !download_mutiple_images {
tasks.join().await;
}
np += 1;
}
_ => {}
@@ -597,7 +603,16 @@ impl Main {
let dh = f
.download_url()?
.try_err(gettext("Failed to get url of the file."))?;
Self::download_file(dh, None, Arc::clone(&base)).await?;
tasks
.add_task(Self::download_file(
dh,
Some(get_progress_bar()),
Arc::clone(&base),
))
.await;
if !download_mutiple_images {
tasks.join().await;
}
}
}
FanboxPost::Image(img) => {
@@ -617,14 +632,18 @@ impl Main {
let dh = img
.download_original_url()?
.try_err(gettext("Can not get original url for image"))?;
Self::download_fanbox_image(
dh,
np,
None,
Arc::clone(&datas),
Arc::clone(&base),
)
.await?;
tasks
.add_task(Self::download_fanbox_image(
dh,
np,
Some(get_progress_bar()),
Arc::clone(&datas),
Arc::clone(&base),
))
.await;
if !download_mutiple_images {
tasks.join().await;
}
np += 1;
}
}
@@ -634,6 +653,21 @@ impl Main {
)));
}
}
Ok(())
tasks.join().await;
let mut re = Ok(());
let tasks = tasks.take_finished_tasks();
for mut task in tasks {
let task = task.as_any_mut();
if let Some(task) = task.downcast_mut::<JoinHandle<Result<(), PixivDownloaderError>>>()
{
let r = task.await;
let r = match r {
Ok(r) => r,
Err(e) => Err(PixivDownloaderError::from(e)),
};
concat_pixiv_downloader_error!(re, r);
}
}
re
}
}

25
src/downloader/helper.rs
View File

@@ -8,10 +8,8 @@ use crate::gettext;
use crate::webclient::ToHeaders;
use crate::webclient::WebClient;
use reqwest::IntoUrl;
use std::collections::HashMap;
use std::convert::TryFrom;
use std::path::Path;
use std::path::PathBuf;
use std::sync::Arc;
use url::Url;
@@ -22,9 +20,9 @@ pub struct DownloaderHelper {
/// Web client
pub client: Option<Arc<WebClient>>,
/// New headers wants to apply
pub headers: Option<HashMap<String, String>>,
pub headers: Option<Box<dyn ToHeaders + Send + Sync>>,
/// Recommand file name
pub file_name: Option<PathBuf>,
pub file_name: Option<Box<dyn AsRef<Path> + Send + Sync>>,
}
pub struct DownloaderHelperBuilder {
@@ -54,20 +52,19 @@ impl DownloaderHelper {
let file = self
.get_local_file_path(base)
.try_err(gettext("Failed to get file name from url."))?;
let headers = match &self.headers {
Some(headers) => headers.to_headers(),
None => None,
};
match &self.client {
Some(client) => Downloader::<LocalFile>::new2(
Arc::clone(client),
self.url.clone(),
self.headers.clone(),
Some(&file),
overwrite,
),
None => Downloader::<LocalFile>::new(
self.url.clone(),
self.headers.clone(),
headers,
Some(&file),
overwrite,
),
None => Downloader::<LocalFile>::new(self.url.clone(), headers, Some(&file), overwrite),
}
}
@@ -77,7 +74,7 @@ impl DownloaderHelper {
) -> Option<std::path::PathBuf> {
let base = base.as_ref();
match &self.file_name {
Some(file_name) => Some(base.join(file_name)),
Some(file_name) => Some(base.join(file_name.as_ref())),
None => match crate::utils::get_file_name_from_url(self.url.clone()) {
Some(file_name) => Some(base.join(file_name)),
None => None,
@@ -90,12 +87,12 @@ impl DownloaderHelper {
}
pub fn set_file_name<P: AsRef<Path> + ?Sized>(&mut self, p: &P) {
self.file_name.replace(p.as_ref().to_owned());
self.file_name.replace(Box::new(p.as_ref().to_owned()));
}
pub fn set_headers<H: ToHeaders>(&mut self, headers: H) {
self.headers.replace_with(match headers.to_headers() {
Some(headers) => Some(headers),
Some(headers) => Some(Box::new(headers)),
None => None,
});
}