uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-11-30 01:44:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162 from uqbar-dao/hf/prettier-message-print

Browse Source 
types: make message print prettier
This commit is contained in:
dr-frmr 2024-01-17 01:45:06 -03:00 committed by GitHub
commit 0c3138af9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/types.rs
View File

@ -521,54 +521,83 @@ impl OnExit {
impl std::fmt::Display for Message {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Message::Request(request) => write!(
f,
"Request(\n inherit: {},\n expects_response: {:?},\n body: {},\n metadata: {}\n capabilities:\n{}\n)",
request.inherit,
request.expects_response,
match serde_json::from_slice::<serde_json::Value>(&request.body) {
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", request.body),
},
&request.metadata.as_ref().unwrap_or(&"None".into()),
{
let mut caps_string = "[".to_string();
for cap in request.capabilities.iter() {
caps_string += &format!("\n {}", cap.0.to_string());
}
caps_string + "\n ]"
},
),
Message::Response((response, context)) => write!(
f,
"Response(\n inherit: {},\n body: {},\n metadata: {},\n context: {},\n capabilities:\n{}\n)",
response.inherit,
match serde_json::from_slice::<serde_json::Value>(&response.body) {
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", response.body),
},
&response.metadata.as_ref().unwrap_or(&"None".into()),
if context.is_none() {
"None".into()
} else {
match serde_json::from_slice::<serde_json::Value>(context.as_ref().unwrap()) {
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", context.as_ref().unwrap()),
}
},
{
let mut caps_string = "[".to_string();
for cap in response.capabilities.iter() {
caps_string += &format!("\n {}", cap.0.to_string());
}
caps_string + "\n ]"
},
),
}
write!(f, "{}", display_message(self, "\n "))
}
}
fn display_capabilities(capabilities: &Vec<(Capability, Vec<u8>)>, delimiter: &str) -> String {
if capabilities.is_empty() {
return "[],".to_string();
}
let mut caps_string = "[".to_string();
for cap in capabilities.iter() {
caps_string += &format!("{} {}", delimiter, cap.0.to_string());
}
format!("{}{}]", caps_string, delimiter)
}
fn display_message(m: &Message, delimiter: &str) -> String {
let lines = match m {
Message::Request(request) => {
vec![
"Request(".into(),
format!("inherit: {},", request.inherit),
format!("expects_response: {:?},", request.expects_response),
format!(
"body: {},",
match serde_json::from_slice::<serde_json::Value>(&request.body) {
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", request.body),
}
),
format!(
"metadata: {},",
&request.metadata.as_ref().unwrap_or(&"None".into())
),
format!(
"capabilities: {}",
display_capabilities(&request.capabilities, delimiter)
),
]
}
Message::Response((response, context)) => {
vec![
"Response(".into(),
format!("inherit: {},", response.inherit),
format!(
"body: {},",
match serde_json::from_slice::<serde_json::Value>(&response.body) {
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", response.body),
}
),
format!(
"metadata: {},",
&response.metadata.as_ref().unwrap_or(&"None".into())
),
format!(
"context: {},",
if context.is_none() {
"None".into()
} else {
match serde_json::from_slice::<serde_json::Value>(context.as_ref().unwrap())
{
Ok(json) => format!("{}", json),
Err(_) => format!("{:?}", context.as_ref().unwrap()),
}
},
),
format!(
"capabilities: {}",
display_capabilities(&response.capabilities, delimiter)
),
]
}
};
lines.into_iter().collect::<Vec<_>>().join(delimiter) + &delimiter[..delimiter.len() - 4] + ")"
}
//
// conversions between wit types and kernel types (annoying!)
//
@ -836,7 +865,7 @@ impl std::fmt::Display for KernelMessage {
Some(rsvp) => rsvp.to_string(),
None => "None".to_string()
},
self.message,
display_message(&self.message, "\n "),
self.lazy_load_blob.is_some(),
)
}