From 42c89fcdd201a2002f0dc090c915f4385c844264 Mon Sep 17 00:00:00 2001
From: hinto-janaiyo <hinto.janaiyo@protonmail.com>
Date: Sun, 20 Nov 2022 14:46:43 -0500
Subject: [PATCH] node: handle [write!] error

---
 src/disk.rs | 18 +++++++++++++-----
 src/main.rs |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/disk.rs b/src/disk.rs
index 264742e..77433c3 100644
--- a/src/disk.rs
+++ b/src/disk.rs
@@ -314,7 +314,7 @@ impl Node {
 
 	// Convert [Vec<(String, Self)>] into [String]
 	// that can be written as a proper TOML file
-	pub fn to_string(vec: &Vec<(String, Self)>) -> String {
+	pub fn to_string(vec: &Vec<(String, Self)>) -> Result<String, TomlError> {
 		let mut toml = String::new();
 		for (key, value) in vec.iter() {
 			write!(
@@ -324,9 +324,9 @@ impl Node {
 				value.ip,
 				value.rpc,
 				value.zmq,
-			);
+			)?;
 		}
-		toml
+		Ok(toml)
 	}
 
 	// Combination of multiple functions:
@@ -354,7 +354,7 @@ impl Node {
 	pub fn create_new(path: &PathBuf) -> Result<Vec<(String, Self)>, TomlError> {
 		info!("Node | Creating new default...");
 		let new = Self::new_vec();
-		let string = Self::to_string(&Self::new_vec());
+		let string = Self::to_string(&Self::new_vec())?;
 		fs::write(&path, &string)?;
 		info!("Node | Write ... OK");
 		Ok(new)
@@ -363,7 +363,7 @@ impl Node {
 	// Save [Node] onto disk file [node.toml]
 	pub fn save(vec: &Vec<(String, Self)>, path: &PathBuf) -> Result<(), TomlError> {
 		info!("Node | Saving to disk...");
-		let string = Self::to_string(vec);
+		let string = Self::to_string(vec)?;
 		match fs::write(path, string) {
 			Ok(_) => { info!("TOML save ... OK"); Ok(()) },
 			Err(err) => { error!("Couldn't overwrite TOML file"); Err(TomlError::Io(err)) },
@@ -394,6 +394,7 @@ pub enum TomlError {
 	Serialize(toml::ser::Error),
 	Deserialize(toml::de::Error),
 	Merge(figment::Error),
+	Format(std::fmt::Error),
 }
 
 impl Display for TomlError {
@@ -405,6 +406,7 @@ impl Display for TomlError {
 			Serialize(err)   => write!(f, "{}: Serialize | {}", ERROR, err),
 			Deserialize(err) => write!(f, "{}: Deserialize | {}", ERROR, err),
 			Merge(err)       => write!(f, "{}: Merge | {}", ERROR, err),
+			Format(err)      => write!(f, "{}: Format | {}", ERROR, err),
 		}
 	}
 }
@@ -415,6 +417,12 @@ impl From<std::io::Error> for TomlError {
 	}
 }
 
+impl From<std::fmt::Error> for TomlError {
+	fn from(err: std::fmt::Error) -> Self {
+		TomlError::Format(err)
+	}
+}
+
 //---------------------------------------------------------------------------------------------------- Const
 // State file
 const ERROR: &'static str = "Disk error";
diff --git a/src/main.rs b/src/main.rs
index 463832e..73aa073 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -184,6 +184,7 @@ impl App {
 					Path(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Serialize(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Deserialize(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
+					Format(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Merge(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Error, ErrorButtons::ResetState),
 				};
 				State::new()
@@ -200,6 +201,7 @@ impl App {
 					Path(e) => app.error_state.set(format!("Node list: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Serialize(e) => app.error_state.set(format!("Node list: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Deserialize(e) => app.error_state.set(format!("Node list: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
+					Format(e) => app.error_state.set(format!("State file: {}", e), ErrorFerris::Panic, ErrorButtons::Quit),
 					Merge(e) => app.error_state.set(format!("Node list: {}", e), ErrorFerris::Error, ErrorButtons::ResetState),
 				};
 				Node::new_vec()