starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-19 15:21:23 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Set filename on Multipart part

Browse Source
This commit is contained in:
Gregory Schier
2024-03-18 13:24:27 -07:00
parent 93f9eee884
commit fa46611d76
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src-tauri/src/http.rs
View File

@@ -278,7 +278,7 @@ pub async fn send_http_request(
continue; continue;
} }
let file = p let file_path = p
.get("file") .get("file")
.unwrap_or(empty_string) .unwrap_or(empty_string)
.as_str() .as_str()
@@ -290,14 +290,14 @@ pub async fn send_http_request(
.unwrap_or_default(); .unwrap_or_default();
let name = render::render(name_raw, &workspace, environment_ref); let name = render::render(name_raw, &workspace, environment_ref);
let part = if file.is_empty() { let part = if file_path.is_empty() {
multipart::Part::text(render::render( multipart::Part::text(render::render(
value_raw, value_raw,
&workspace, &workspace,
environment_ref, environment_ref,
)) ))
} else { } else {
match fs::read(file) { match fs::read(file_path) {
Ok(f) => multipart::Part::bytes(f), Ok(f) => multipart::Part::bytes(f),
Err(e) => { Err(e) => {
return response_err(response, e.to_string(), window).await; return response_err(response, e.to_string(), window).await;
@@ -311,12 +311,23 @@ pub async fn send_http_request(
.as_str() .as_str()
.unwrap_or_default(); .unwrap_or_default();
multipart_form = multipart_form.part(name, if ct_raw.is_empty() { multipart_form = multipart_form.part(
part name,
} else { if ct_raw.is_empty() {
let ct = render::render(ct_raw, &workspace, environment_ref); part
part.mime_str(ct.as_str()).map_err(|e| e.to_string())? } else {
}); let content_type = render::render(ct_raw, &workspace, environment_ref);
let filename = PathBuf::from(file_path)
.file_name()
.unwrap_or_default()
.to_str()
.unwrap_or_default()
.to_string();
part.file_name(filename)
.mime_str(content_type.as_str())
.map_err(|e| e.to_string())?
},
);
} }
} }
headers.remove("Content-Type"); // reqwest will add this automatically headers.remove("Content-Type"); // reqwest will add this automatically