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

Use better way to print Cookie header

Browse Source
This commit is contained in:
lifegpc
2024-07-03 02:14:44 +00:00
committed by GitHub
parent ee79a97a66
commit a4a8f25ab2
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cookies.rs
View File

@@ -197,6 +197,10 @@ impl Cookie {
)) ))
} }
pub fn name(&self) -> &str {
&self._name
}
/// Get name and value string: name=value; /// Get name and value string: name=value;
pub fn get_name_value(&self) -> String { pub fn get_name_value(&self) -> String {
format!("{}={};", self._name.as_str(), self._value.as_str()) format!("{}={};", self._name.as_str(), self._value.as_str())

7
src/webclient.rs
View File

@@ -62,15 +62,19 @@ impl ToHeaders for JsonValue {
pub fn gen_cookie_header<U: IntoUrl>(c: &WebClient, url: U) -> String { pub fn gen_cookie_header<U: IntoUrl>(c: &WebClient, url: U) -> String {
c.get_cookies_as_mut().jar.get_mut().check_expired(); c.get_cookies_as_mut().jar.get_mut().check_expired();
let mut s = String::from(""); let mut s = String::from("");
let mut k = String::from("");
let u = url.as_str(); let u = url.as_str();
for a in c.get_cookies().jar.get_ref().iter() { for a in c.get_cookies().jar.get_ref().iter() {
if a.matched(u) { if a.matched(u) {
if s.len() > 0 { if s.len() > 0 {
s += " "; s += " ";
k += ", ";
} }
s += a.get_name_value().as_str(); s += a.get_name_value().as_str();
k += a.name();
} }
} }
log::debug!(target: "webclient", "Cookie List: {}", k);
s s
} }
@@ -373,7 +377,6 @@ impl WebClient {
let c = gen_cookie_header(&self, s); let c = gen_cookie_header(&self, s);
if c.len() > 0 { if c.len() > 0 {
r = r.header("Cookie", c.as_str()); r = r.header("Cookie", c.as_str());
log::debug!(target: "webclient", "Cookie: {}", c.as_str());
} }
self.handle_req_middlewares(r.build()?) self.handle_req_middlewares(r.build()?)
} }
@@ -445,12 +448,14 @@ impl WebClient {
let mut r = self.client.post(s); let mut r = self.client.post(s);
for (k, v) in self.get_headers().iter() { for (k, v) in self.get_headers().iter() {
r = r.header(k, v); r = r.header(k, v);
log::debug!(target: "webclient", "{}: {}", k, v);
} }
let headers = headers.to_headers(); let headers = headers.to_headers();
if headers.is_some() { if headers.is_some() {
let h = headers.unwrap(); let h = headers.unwrap();
for (k, v) in h.iter() { for (k, v) in h.iter() {
r = r.header(k, v); r = r.header(k, v);
log::debug!(target: "webclient", "{}: {}", k, v);
} }
} }
let c = gen_cookie_header(&self, s); let c = gen_cookie_header(&self, s);