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

add logging framework

Browse Source
This commit is contained in:
lifegpc
2023-10-30 03:48:30 +00:00
committed by GitHub
parent 97a3f7742a
commit 38e7b4f7ef
11 changed files with 336 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/webclient.rs
View File

@@ -13,7 +13,6 @@ use reqwest::{Client, ClientBuilder, IntoUrl, Request, Response};
use serde::ser::Serialize;
use std::collections::HashMap;
use std::default::Default;
use std::sync::atomic::AtomicBool;
use std::sync::atomic::AtomicI64;
use std::sync::Arc;
use std::sync::RwLock;
@@ -96,8 +95,6 @@ pub struct WebClient {
headers: RwLock<HashMap<String, String>>,
/// Cookies
cookies: RwLock<ManagedCookieJar>,
/// Verbose logging
verbose: Arc<AtomicBool>,
/// Retry times, 0 means disable, < 0 means always retry
retry: Arc<AtomicI64>,
/// Retry interval
@@ -115,7 +112,6 @@ impl WebClient {
client,
headers: RwLock::new(HashMap::new()),
cookies: RwLock::new(ManagedCookieJar::new()),
verbose: Arc::new(AtomicBool::new(false)),
retry: Arc::new(AtomicI64::new(3)),
retry_interval: RwLock::new(None),
req_middlewares: RwLock::new(Vec::new()),
@@ -165,10 +161,6 @@ impl WebClient {
self.retry_interval.get_ref()
}
pub fn get_verbose(&self) -> bool {
self.verbose.qload()
}
/// Used to handle Set-Cookie header in an [Response]
/// * `r` - reference to an [Response]
pub fn handle_set_cookie(&self, r: &Response) {
@@ -226,10 +218,6 @@ impl WebClient {
self.retry.qstore(retry)
}
pub fn set_verbose(&self, verbose: bool) {
self.verbose.qstore(verbose)
}
/// Send GET requests with parameters
/// * `param` - GET parameters. Should be a JSON object/array. If value in map is not a string, will dump it
/// # Examples
@@ -357,9 +345,7 @@ impl WebClient {
);
let r = print_error!(gettext("Error when request:"), self.client.execute(r).await);
self.handle_set_cookie(&r);
if self.get_verbose() {
println!("{}", r.status());
}
log::debug!(target: "webclient", "{}", r.status());
Some(r)
}
@@ -370,9 +356,7 @@ impl WebClient {
headers: H,
) -> Result<Request, PixivDownloaderError> {
let s = url.as_str();
if self.get_verbose() {
println!("GET {}", s);
}
log::debug!(target: "webclient", "GET {}", s);
let mut r = self.client.get(s);
for (k, v) in self.get_headers().iter() {
r = r.header(k, v);
@@ -442,9 +426,7 @@ impl WebClient {
);
let r = print_error!(gettext("Error when request:"), self.client.execute(r).await);
self.handle_set_cookie(&r);
if self.get_verbose() {
println!("{}", r.status());
}
log::debug!(target: "webclient","{}", r.status());
Some(r)
}
@@ -456,9 +438,7 @@ impl WebClient {
form: Option<S>,
) -> Result<Request, PixivDownloaderError> {
let s = url.as_str();
if self.get_verbose() {
println!("POST {}", s);
}
log::debug!(target: "webclient", "POST {}", s);
let mut r = self.client.post(s);
for (k, v) in self.get_headers().iter() {
r = r.header(k, v);
@@ -494,7 +474,6 @@ impl Default for WebClient {
}
let c = c.build().unwrap();
let c = Self::new(c);
c.set_verbose(opt.verbose());
match opt.retry() {
Some(retry) => c.set_retry(retry),
None => {}