alemi/postwoman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: respect user agent config

Browse source 
also pass client config to .execute() method so we can configure reqwest
client
This commit is contained in:
əlemi 2024-10-19 04:14:31 +02:00
parent 763fa7fbcb
commit 3a966bdc8b
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -55,7 +55,7 @@ async fn main() -> Result<(), PostWomanError> {
eprintln!("> executing {name}");
let res = endpoint
.fill()
.execute()
.execute(&config.client)
.await?;
println!("{res}");
}

15
src/model.rs
View file

@ -1,6 +1,8 @@
use std::str::FromStr;
use reqwest::{header::{HeaderMap, HeaderName, HeaderValue}};
use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
use crate::APP_USER_AGENT;
#[derive(Debug, thiserror::Error)]
pub enum PostWomanError {
@ -115,7 +117,7 @@ impl Endpoint {
self
}
pub async fn execute(self) -> Result<String, PostWomanError> {
pub async fn execute(self, opts: &PostWomanClient) -> Result<String, PostWomanError> {
let method = match self.method {
Some(m) => reqwest::Method::from_str(&m)?,
None => reqwest::Method::GET,
@ -133,7 +135,12 @@ impl Endpoint {
StringOr::Str(x) => x,
StringOr::T(json) => serde_json::to_string(&json)?,
};
let res = reqwest::Client::new()
let client = reqwest::Client::builder()
.user_agent(opts.user_agent.as_deref().unwrap_or(APP_USER_AGENT))
.build()?;
let res = client
.request(method, self.url)
.headers(headers)
.body(body)
@ -142,7 +149,7 @@ impl Endpoint {
.error_for_status()?;
Ok(match self.extract.unwrap_or_default() {
StringOr::Str(query) => todo!(),
StringOr::Str(_query) => todo!(),
StringOr::T(Extractor::Debug) => format!("{res:#?}"),
StringOr::T(Extractor::Body) => res.text().await?,
StringOr::T(Extractor::Header { key }) => res