Show error to user when a file fails to open

Author: azeemba

editor/src/document/document_file.rs

@@ -1,7 +1,7 @@
 pub use super::layer_panel::*;
 use crate::{frontend::layer_panel::*, EditorError};
 use glam::{DAffine2, DVec2};
-use graphene::{document::Document as InternalDocument, LayerId};
+use graphene::{document::Document as InternalDocument, DocumentError, LayerId};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
@@ -201,7 +201,8 @@ impl DocumentMessageHandler {
 				doc.document = handle;
 				Ok(doc)
 			}
-			Err(_) => Err(EditorError::Document(String::from("Failed to parse file content"))),
+			Err(DocumentError::InvalidFile(msg)) => Err(EditorError::Document(msg)),
+			_ => Err(EditorError::Document(String::from("Failed to open file"))),
 		}
 	}
 

editor/src/document/document_message_handler.rs

@@ -191,12 +191,12 @@ impl MessageHandler<DocumentsMessage, &InputPreprocessor> for DocumentsMessageHa
 			}
 			OpenDocument(name, serialized_contents) => {
 				let res = DocumentMessageHandler::with_name_content(name, serialized_contents);
-				if res.is_err() {
-					// how can we show an error message in the UI?
-					return;
+				match res {
+					Ok(doc) => {
+						self.load_document(doc, responses);
+					}
+					Err(e) => responses.push_back(FrontendMessage::DisplayError { description: e.to_string() }.into()),
 				}
-				let doc = res.unwrap();
-				self.load_document(doc, responses);
 			}
 			GetOpenDocumentsList => {
 				// Send the list of document tab names

graphene/src/document.rs

@@ -34,7 +34,7 @@ fn split_path(path: &[LayerId]) -> Result<(&[LayerId], LayerId), DocumentError>
 
 impl Document {
 	pub fn with_content(serialized_content: &String) -> Result<Self, DocumentError> {
-		serde_json::from_str(serialized_content).map_err(|_| DocumentError::InvalidFile)
+		serde_json::from_str(serialized_content).map_err(|e| DocumentError::InvalidFile(e.to_string()))
 	}
 
 	/// Wrapper around render, that returns the whole document as a Response.

graphene/src/lib.rs

@@ -11,13 +11,13 @@ pub use response::DocumentResponse;
 
 pub type LayerId = u64;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, PartialEq)]
 pub enum DocumentError {
 	LayerNotFound,
 	InvalidPath,
 	IndexOutOfBounds,
 	NotAFolder,
 	NonReorderableSelection,
 	NotAShape,
-	InvalidFile,
+	InvalidFile(String),
 }