Skip to content

Cleaner and saner http request parsing. #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2022
Merged

Cleaner and saner http request parsing. #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ use std::io::Write;

#[derive(Deserialize)]
struct RequestOptions {
#[serde(default)]
output_filename: Option<String>,
#[serde(default)]
body_filename: Option<String>,
}

Expand All @@ -22,8 +24,8 @@ struct Response<'a> {

// If the response can be deserialized -> success.
// If the response can't be deserialized -> failure.
byond_fn!(fn http_request_blocking(method, url, body, headers, ...rest) {
let req = match construct_request(method, url, body, headers, rest.first().map(|x| &**x)) {
byond_fn!(fn http_request_blocking(method, url, body, headers, options) {
let req = match construct_request(method, url, body, headers, options) {
Ok(r) => r,
Err(e) => return Some(e.to_string())
};
Expand All @@ -35,8 +37,8 @@ byond_fn!(fn http_request_blocking(method, url, body, headers, ...rest) {
});

// Returns new job-id.
byond_fn!(fn http_request_async(method, url, body, headers, ...rest) {
let req = match construct_request(method, url, body, headers, rest.first().map(|x| &**x)) {
byond_fn!(fn http_request_async(method, url, body, headers, options) {
let req = match construct_request(method, url, body, headers, options) {
Ok(r) => r,
Err(e) => return Some(e.to_string())
};
Expand Down Expand Up @@ -91,7 +93,7 @@ fn construct_request(
url: &str,
body: &str,
headers: &str,
options: Option<&str>,
options: &str,
) -> Result<RequestPrep> {
let mut req = match method {
"post" => HTTP_CLIENT.post(url),
Expand All @@ -114,7 +116,7 @@ fn construct_request(
}

let mut output_filename = None;
if let Some(options) = options {
if !options.is_empty() {
let options: RequestOptions = serde_json::from_str(options)?;
output_filename = options.output_filename;
if let Some(fname) = options.body_filename {
Expand Down