diff --git a/src/client.rs b/src/client.rs index 6173975..1d5fb87 100644 --- a/src/client.rs +++ b/src/client.rs @@ -227,11 +227,17 @@ impl KeepClient { #[derive(serde::Deserialize)] struct ApiResponse { data: Option, + error: Option, } let response: ApiResponse = self.get_json("/api/status")?; - response - .data - .ok_or_else(|| CoreError::Other(anyhow::anyhow!("No status data returned"))) + response.data.ok_or_else(|| { + CoreError::Other(anyhow::anyhow!( + "{}", + response + .error + .unwrap_or_else(|| "No status data returned".to_string()) + )) + }) } pub fn get_item_info(&self, id: i64) -> Result { diff --git a/src/modes/client/status.rs b/src/modes/client/status.rs index 460774a..59568b4 100644 --- a/src/modes/client/status.rs +++ b/src/modes/client/status.rs @@ -33,7 +33,10 @@ pub fn mode( path_table.add_row(vec!["Data", &status_info.paths.data]); path_table.add_row(vec!["Database", &status_info.paths.database]); println!("PATHS:"); - println!("{path_table}"); + println!( + "{}", + crate::modes::common::trim_lines_end(&path_table.trim_fmt()) + ); println!(); // Configured meta plugins @@ -56,7 +59,10 @@ pub fn mode( ]); } println!("META PLUGINS:"); - println!("{table}"); + println!( + "{}", + crate::modes::common::trim_lines_end(&table.trim_fmt()) + ); println!(); } @@ -78,7 +84,10 @@ pub fn mode( ]); } println!("COMPRESSION:"); - println!("{table}"); + println!( + "{}", + crate::modes::common::trim_lines_end(&table.trim_fmt()) + ); println!(); } }