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

fix: match content-type with .starts_with()

Browse source
This commit is contained in:
əlemi 2024-10-21 16:13:41 +02:00
parent e44a69e93b
commit debccaf195
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/model/endpoint.rs
View file

@ -223,11 +223,16 @@ fn replace_recursive(element: toml::Value, from: &str, to: &str) -> toml::Value
async fn format_body(res: reqwest::Response) -> Result<String, PostWomanError> { async fn format_body(res: reqwest::Response) -> Result<String, PostWomanError> {
match res.headers().get("Content-Type") { match res.headers().get("Content-Type") {
None => Ok(res.text().await? + "\n"), None => Ok(res.text().await?),
Some(v) => match v.to_str()? { Some(v) => {
"application/json" => Ok(serde_json::to_string_pretty(&res.json::<serde_json::Value>().await?)? + "\n"), let content_type = v.to_str()?;
"text/plain" | "text/html" => Ok(res.text().await? + "\n"), if content_type.starts_with("application/json") {
_ => Ok(format!("base64({})\n", BASE64_STANDARD.encode(res.bytes().await?))), Ok(serde_json::to_string_pretty(&res.json::<serde_json::Value>().await?)?)
} else if content_type.starts_with("text/plain") || content_type.starts_with("text/html") {
Ok(res.text().await?)
} else {
Ok(format!("base64({})\n", BASE64_STANDARD.encode(res.bytes().await?)))
}
}, },
} }
} }