Fix naming

Author: timon-schelling

desktop/src/desktop_wrapper.rs

@@ -1,5 +1,48 @@
-mod editor_wrapper;
-pub use editor_wrapper::{DesktopWrapper, NodeGraphExecutionResult};
+use graph_craft::wasm_application_io::WasmApplicationIo;
+use graphite_editor::application::Editor;
 
-pub mod messages;
 pub use wgpu_executor::Context as WgpuContext;
+
+pub mod messages;
+use messages::{DesktopFrontendMessage, DesktopWrapperMessage};
+
+mod message_executor;
+use message_executor::DesktopWrapperMessageExecutor;
+
+mod handle_desktop_wrapper_message;
+mod intercept_frontend_message;
+mod intercept_message;
+
+pub struct DesktopWrapper {
+	editor: Editor,
+}
+
+impl DesktopWrapper {
+	pub fn new() -> Self {
+		Self { editor: Editor::new() }
+	}
+
+	pub fn init(&self, wgpu_context: WgpuContext) {
+		let application_io = WasmApplicationIo::new_with_context(wgpu_context);
+		futures::executor::block_on(graphite_editor::node_graph_executor::replace_application_io(application_io));
+	}
+
+	pub fn dispatch(&mut self, message: DesktopWrapperMessage) -> Vec<DesktopFrontendMessage> {
+		let mut executor = DesktopWrapperMessageExecutor::new(&mut self.editor);
+		executor.queue(message);
+		executor.execute()
+	}
+
+	pub async fn run_node_graph() -> NodeGraphExecutionResult {
+		let result = graphite_editor::node_graph_executor::run_node_graph().await;
+		match result {
+			(true, texture) => NodeGraphExecutionResult::HasRun(texture.map(|t| t.texture)),
+			(false, _) => NodeGraphExecutionResult::NotRun,
+		}
+	}
+}
+
+pub enum NodeGraphExecutionResult {
+	HasRun(Option<wgpu::Texture>),
+	NotRun,
+}

desktop/src/desktop_wrapper/handle_editor_message.rs renamed to desktop/src/desktop_wrapper/handle_desktop_wrapper_message.rs

@@ -1,10 +1,9 @@
 use graphite_editor::messages::prelude::{DocumentMessage, Message, PortfolioMessage};
 
-use crate::desktop_wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, OpenFileDialogContext, SaveFileDialogContext};
+use super::DesktopWrapperMessageExecutor;
+use super::messages::{DesktopFrontendMessage, DesktopWrapperMessage, OpenFileDialogContext, SaveFileDialogContext};
 
-use super::EditorMessageExecutor;
-
-pub(super) fn handle_editor_message(executor: &mut EditorMessageExecutor, message: DesktopWrapperMessage) {
+pub(super) fn handle_desktop_wrapper_message(executor: &mut DesktopWrapperMessageExecutor, message: DesktopWrapperMessage) {
 	match message {
 		DesktopWrapperMessage::FromWeb(data) => {
 			let string = std::str::from_utf8(&data).unwrap();

desktop/src/desktop_wrapper/intercept_frontend_message.rs

@@ -2,11 +2,10 @@ use std::path::PathBuf;
 
 use graphite_editor::messages::prelude::FrontendMessage;
 
-use crate::desktop_wrapper::messages::{DesktopFrontendMessage, FileFilter, OpenFileDialogContext, SaveFileDialogContext};
+use super::DesktopWrapperMessageExecutor;
+use super::messages::{DesktopFrontendMessage, FileFilter, OpenFileDialogContext, SaveFileDialogContext};
 
-use super::EditorMessageExecutor;
-
-pub(super) fn intercept_frontend_message(executor: &mut EditorMessageExecutor, message: FrontendMessage) -> Option<FrontendMessage> {
+pub(super) fn intercept_frontend_message(executor: &mut DesktopWrapperMessageExecutor, message: FrontendMessage) -> Option<FrontendMessage> {
 	match message {
 		FrontendMessage::RenderOverlays(overlay_context) => {
 			executor.respond(DesktopFrontendMessage::UpdateOverlays(overlay_context.take_scene()));

desktop/src/desktop_wrapper/intercept_message.rs

@@ -1,10 +1,9 @@
 use graphite_editor::messages::prelude::{InputPreprocessorMessage, Message};
 
-use crate::desktop_wrapper::messages::DesktopFrontendMessage;
+use super::DesktopWrapperMessageExecutor;
+use super::messages::DesktopFrontendMessage;
 
-use super::EditorMessageExecutor;
-
-pub(super) fn intercept_message(executor: &mut EditorMessageExecutor, message: Message) -> Option<Message> {
+pub(super) fn intercept_message(executor: &mut DesktopWrapperMessageExecutor, message: Message) -> Option<Message> {
 	match message {
 		Message::InputPreprocessor(message) => {
 			if let InputPreprocessorMessage::BoundsOfViewports { bounds_of_viewports } = &message {

desktop/src/desktop_wrapper/editor_wrapper.rs renamed to desktop/src/desktop_wrapper/message_executor.rs

@@ -1,60 +1,19 @@
-use graph_craft::wasm_application_io::WasmApplicationIo;
 use graphite_editor::{application::Editor, messages::prelude::Message};
 use std::collections::VecDeque;
 
-use crate::desktop_wrapper::WgpuContext;
-use crate::desktop_wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage};
+use super::handle_desktop_wrapper_message::handle_desktop_wrapper_message;
+use super::intercept_frontend_message::intercept_frontend_message;
+use super::intercept_message::intercept_message;
+use super::messages::{DesktopFrontendMessage, DesktopWrapperMessage};
 
-#[path = "handle_editor_message.rs"]
-mod handle_editor_message;
-
-#[path = "intercept_frontend_message.rs"]
-mod intercept_frontend_message;
-#[path = "intercept_message.rs"]
-mod intercept_message;
-
-pub struct DesktopWrapper {
-	editor: Editor,
-}
-
-impl DesktopWrapper {
-	pub fn new() -> Self {
-		Self { editor: Editor::new() }
-	}
-
-	pub fn init(&self, wgpu_context: WgpuContext) {
-		let application_io = WasmApplicationIo::new_with_context(wgpu_context);
-		futures::executor::block_on(graphite_editor::node_graph_executor::replace_application_io(application_io));
-	}
-
-	pub fn dispatch(&mut self, message: DesktopWrapperMessage) -> Vec<DesktopFrontendMessage> {
-		let mut executor = EditorMessageExecutor::new(&mut self.editor);
-		executor.queue(message);
-		executor.execute()
-	}
-
-	pub async fn run_node_graph() -> NodeGraphExecutionResult {
-		let result = graphite_editor::node_graph_executor::run_node_graph().await;
-		match result {
-			(true, texture) => NodeGraphExecutionResult::HasRun(texture.map(|t| t.texture)),
-			(false, _) => NodeGraphExecutionResult::NotRun,
-		}
-	}
-}
-
-pub enum NodeGraphExecutionResult {
-	HasRun(Option<wgpu::Texture>),
-	NotRun,
-}
-
-struct EditorMessageExecutor<'a> {
+pub(crate) struct DesktopWrapperMessageExecutor<'a> {
 	editor: &'a mut Editor,
 	queue: VecDeque<DesktopWrapperMessage>,
 	messages: Vec<Message>,
 	responses: Vec<DesktopFrontendMessage>,
 }
 
-impl<'a> EditorMessageExecutor<'a> {
+impl<'a> DesktopWrapperMessageExecutor<'a> {
 	pub(crate) fn new(editor: &'a mut Editor) -> Self {
 		Self {
 			editor,
@@ -74,7 +33,7 @@ impl<'a> EditorMessageExecutor<'a> {
 	}
 
 	pub(super) fn queue_message(&mut self, message: Message) {
-		if let Some(message) = intercept_message::intercept_message(self, message) {
+		if let Some(message) = intercept_message(self, message) {
 			self.messages.push(message);
 		}
 	}
@@ -98,15 +57,15 @@ impl<'a> EditorMessageExecutor<'a> {
 	fn process_queue(&mut self) {
 		while !self.queue.is_empty() || !self.messages.is_empty() {
 			while let Some(message) = self.queue.pop_front() {
-				handle_editor_message::handle_editor_message(self, message);
+				handle_desktop_wrapper_message(self, message);
 			}
 			let frontend_messages = self
 				.editor
 				.handle_message(Message::Batched {
 					messages: std::mem::take(&mut self.messages).into_boxed_slice(),
 				})
 				.into_iter()
-				.filter_map(|m| intercept_frontend_message::intercept_frontend_message(self, m))
+				.filter_map(|m| intercept_frontend_message(self, m))
 				.collect::<Vec<_>>();
 			self.respond(DesktopFrontendMessage::ToWeb(ron::to_string(&frontend_messages).unwrap().into_bytes()));
 		}