Review

Author: timon-schelling

editor/src/application.rs

@@ -28,6 +28,10 @@ impl Editor {
 			dispatcher: Dispatcher::with_executor(executor),
 		};
 
+		futures::executor::block_on(async {
+			editor.replace_application_io(PlatformApplicationIo::new().await).await;
+		});
+
 		(editor, runtime)
 	}
 

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -109,8 +109,8 @@ pub struct DocumentMessageHandler {
 	pub graph_view_overlay_open: bool,
 	/// The current opacity of the faded node graph background that covers up the artwork.
 	pub graph_fade_artwork_percentage: f64,
-	/// The resources that are currently used by the document.
-	#[serde(skip_serializing_if = "Option::is_none", rename = "resources")]
+	/// Resources embedded in the document.
+	#[serde(rename = "resources", skip_serializing_if = "Option::is_none")]
 	pub embedded_resources: Option<EmbeddedResources>,
 
 	// =============================================
@@ -930,9 +930,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageContext<'_>> for DocumentMes
 				if !embedded.is_empty() {
 					self.embedded_resources = Some(embedded);
 				}
-
 				let content = self.serialize_document();
-
 				self.embedded_resources = None;
 
 				responses.add(FrontendMessage::TriggerSaveDocument {

editor/src/messages/portfolio/document/utility_types/embedded_resources.rs

@@ -4,52 +4,22 @@ use graph_craft::application_io::{Resource, ResourceHash};
 use std::collections::HashMap;
 use std::fmt;
 
-#[derive(Clone, Default, Debug, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct EmbeddedResources {
 	resources: HashMap<ResourceHash, Resource>,
 }
 
 impl EmbeddedResources {
-	pub fn new() -> Self {
-		Self::default()
-	}
-
-	pub fn insert(&mut self, hash: ResourceHash, resource: Resource) -> Option<Resource> {
-		self.resources.insert(hash, resource)
-	}
-
-	pub fn get(&self, hash: &ResourceHash) -> Option<&Resource> {
-		self.resources.get(hash)
-	}
-
-	pub fn remove(&mut self, hash: &ResourceHash) -> Option<Resource> {
-		self.resources.remove(hash)
-	}
-
-	pub fn contains(&self, hash: &ResourceHash) -> bool {
-		self.resources.contains_key(hash)
-	}
-
-	pub fn len(&self) -> usize {
-		self.resources.len()
-	}
-
 	pub fn is_empty(&self) -> bool {
 		self.resources.is_empty()
 	}
-
-	pub fn iter(&self) -> impl Iterator<Item = (&ResourceHash, &Resource)> {
-		self.resources.iter()
-	}
-
-	pub fn hashes(&self) -> impl Iterator<Item = &ResourceHash> {
-		self.resources.keys()
-	}
 }
 
 impl FromIterator<(ResourceHash, Resource)> for EmbeddedResources {
 	fn from_iter<T: IntoIterator<Item = (ResourceHash, Resource)>>(iter: T) -> Self {
-		Self { resources: iter.into_iter().collect() }
+		Self {
+			resources: iter.into_iter().collect(),
+		}
 	}
 }