This commit is contained in:
Franklin 2022-09-20 00:49:48 -04:00
parent a0beba17a0
commit 6b5fa82486
3 changed files with 16 additions and 10 deletions

2
Cargo.lock generated
View File

@ -183,7 +183,7 @@ dependencies = [
[[package]] [[package]]
name = "actix-web-utils" name = "actix-web-utils"
version = "0.2.19" version = "0.2.20"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"log", "log",

View File

@ -1,6 +1,6 @@
[package] [package]
name = "actix-web-utils" name = "actix-web-utils"
version = "0.2.19" version = "0.2.20"
edition = "2021" edition = "2021"
authors = ["Franklin E. Blanco"] authors = ["Franklin E. Blanco"]
description = "Just some useful addons for actix web." description = "Just some useful addons for actix web."

View File

@ -46,8 +46,9 @@ impl FromStr for Error {
None => return Err(Error::Unspecified), None => return Err(Error::Unspecified),
}; };
if error_name_whole.starts_with("Unspecified") { if error_name_whole.starts_with("Unspecified") {
return Err(Self::Unspecified) return Ok(Self::Unspecified)
} else if error_name_whole.contains("UnexpectedStatusCode") { }
if error_name_whole.contains("UnexpectedStatusCode") {
let expected_str_index = string.find("Expected: ").unwrap() + 10; let expected_str_index = string.find("Expected: ").unwrap() + 10;
let actual_str_index = string.find("Actual: ").unwrap() + 8; let actual_str_index = string.find("Actual: ").unwrap() + 8;
let expected_status_code = string.get(expected_str_index..expected_str_index+3).unwrap(); let expected_status_code = string.get(expected_str_index..expected_str_index+3).unwrap();
@ -55,16 +56,21 @@ impl FromStr for Error {
let message_resources_string = string.get(string.find("receivedMessageResources").unwrap() + 26..string.len() - 1).unwrap(); let message_resources_string = string.get(string.find("receivedMessageResources").unwrap() + 26..string.len() - 1).unwrap();
let message_resources: Vec<MessageResource> = serde_json::from_str(message_resources_string).unwrap(); let message_resources: Vec<MessageResource> = serde_json::from_str(message_resources_string).unwrap();
return Err(Self::UnexpectedStatusCode(expected_status_code.parse().unwrap(), actual_status_code.parse().unwrap(), message_resources)); return Ok(Self::UnexpectedStatusCode(expected_status_code.parse().unwrap(), actual_status_code.parse().unwrap(), message_resources));
} else if error_name_whole.starts_with("Client") { }
if error_name_whole.starts_with("Client") {
} else if error_name_whole.starts_with("Network") { }
if error_name_whole.starts_with("Network") {
} else if error_name_whole.starts_with("Serialization") { }
if error_name_whole.starts_with("Serialization") {
} else if error_name_whole.starts_with("Database") { }
if error_name_whole.starts_with("Database") {
} else if error_name_whole.starts_with("Compute") { }
if error_name_whole.starts_with("Compute") {
} }