Unify file opening, importing, and pasting into a file ingest handler (#4548)

* Unify file and data ingest * Code review --------- Co-authored-by: Keavon Chambers <keavon@keavon.com>
2026-09-20 11:28:30 +08:00 · 2026-09-19 05:47:02 +00:00
parent f90bef159c
commit 7d1303f695
47 changed files with 855 additions and 980 deletions
--- a/desktop/src/app.rs
+++ b/desktop/src/app.rs
@@ -24,7 +24,7 @@ use crate::preferences;
 use crate::render::{RenderError, RenderState};
 use crate::ui::{InputEvent, UiCommand, UiInstance};
 use crate::window::Window;
-use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, Preferences};
+use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, IngestAction, Preferences};
 use crate::wrapper::{DesktopWrapper, MmapResourceStorage, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};

 pub(crate) struct App {
@@ -205,15 +205,15 @@ impl App {
 				};
 				self.send_or_queue_web_message(bytes);
 			}
-			DesktopFrontendMessage::OpenFileDialog { title, filters, multiple, context } => {
+			DesktopFrontendMessage::OpenFileDialog { title, options, action } => {
 				let app_event_scheduler = self.app_event_scheduler.clone();
 				let _ = thread::spawn(move || {
 					let mut dialog = AsyncFileDialog::new().set_title(title);
-					for filter in filters {
+					for filter in options.filters {
 						dialog = dialog.add_filter(filter.name, &filter.extensions);
 					}

-					let handles = if multiple {
+					let handles = if options.multiple {
 						futures::executor::block_on(dialog.pick_files()).unwrap_or_default()
 					} else {
 						futures::executor::block_on(dialog.pick_file()).into_iter().collect()
@@ -223,7 +223,8 @@ impl App {
 						let path = handle.path().to_path_buf();
 						match fs::read(&path) {
 							Ok(content) => {
-								let message = DesktopWrapperMessage::FileDialogResult { path, content, context };
+								let action = action.clone();
+								let message = DesktopWrapperMessage::IngestFile { path, content, action };
 								app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
 							}
 							Err(e) => tracing::error!("Failed to read file {}: {}", path.display(), e),
@@ -520,7 +521,11 @@ impl App {
 					for path in paths {
 						tracing::info!("Opening file: {}", path.display());
 						if let Ok(content) = fs::read(&path) {
-							let message = DesktopWrapperMessage::OpenFile { path, content };
+							let message = DesktopWrapperMessage::IngestFile {
+								path,
+								content,
+								action: IngestAction::Open,
+							};
 							app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
 						} else {
 							tracing::error!("Failed to read file: {}", path.display());
@@ -657,7 +662,11 @@ impl ApplicationHandler for App {
 					for path in paths {
 						match fs::read(&path) {
 							Ok(content) => {
-								let message = DesktopWrapperMessage::ImportFile { path, content };
+								let message = DesktopWrapperMessage::IngestFile {
+									path,
+									content,
+									action: IngestAction::Import,
+								};
 								self.app_event_scheduler.schedule(AppEvent::DesktopWrapperMessage(message));
 							}
 							Err(e) => {
--- a/desktop/wrapper/src/handle_desktop_wrapper_message.rs
+++ b/desktop/wrapper/src/handle_desktop_wrapper_message.rs
@@ -2,7 +2,7 @@ use graphite_editor::messages::clipboard::utility_types::ClipboardContentRaw;
 use graphite_editor::messages::prelude::*;

 use super::DesktopWrapperMessageDispatcher;
-use super::messages::{DesktopFrontendMessage, DesktopWrapperMessage, EditorMessage, OpenFileDialogContext, SaveFileDialogContext};
+use super::messages::{DesktopFrontendMessage, DesktopWrapperMessage, EditorMessage, SaveFileDialogContext};

 pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMessageDispatcher, message: DesktopWrapperMessage) {
 	match message {
@@ -15,19 +15,14 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 		DesktopWrapperMessage::Input(message) => {
 			dispatcher.queue_editor_message(EditorMessage::InputPreprocessor(message));
 		}
-		DesktopWrapperMessage::FileDialogResult { path, content, context } => match context {
-			OpenFileDialogContext::Open => {
-				dispatcher.queue_desktop_wrapper_message(DesktopWrapperMessage::OpenFile { path, content });
-			}
-			OpenFileDialogContext::Import => {
-				dispatcher.queue_desktop_wrapper_message(DesktopWrapperMessage::ImportFile { path, content });
-			}
-			OpenFileDialogContext::UploadResource => {
-				let name = path.file_name().map(|name| name.to_string_lossy().to_string());
-				let message = ResourceUploadMessage::ReceiveUpload { name, data: content.into() };
-				dispatcher.queue_editor_message(message);
-			}
-		},
+		DesktopWrapperMessage::IngestFile { path, content, action } => {
+			dispatcher.queue_editor_message(IngestMessage::Ingest {
+				data: content,
+				action,
+				mime_type: String::new(),
+				path: Some(path),
+			});
+		}
 		DesktopWrapperMessage::SaveFileDialogResult { path, context } => match context {
 			SaveFileDialogContext::Document { document_id, content } => {
 				dispatcher.respond(DesktopFrontendMessage::WriteFile { path: path.clone(), content });
@@ -40,14 +35,6 @@ pub(super) fn handle_desktop_wrapper_message(dispatcher: &mut DesktopWrapperMess
 				dispatcher.respond(DesktopFrontendMessage::WriteFile { path, content });
 			}
 		},
-		DesktopWrapperMessage::OpenFile { path, content } => {
-			let message = PortfolioMessage::OpenFile { path, content };
-			dispatcher.queue_editor_message(message);
-		}
-		DesktopWrapperMessage::ImportFile { path, content } => {
-			let message = PortfolioMessage::ImportFile { path, content };
-			dispatcher.queue_editor_message(message);
-		}
 		DesktopWrapperMessage::PollNodeGraphEvaluation => dispatcher.poll_node_graph_evaluation(),
 		DesktopWrapperMessage::UpdateMaximized { maximized } => {
 			let message = FrontendMessage::UpdateMaximized { maximized };
--- a/desktop/wrapper/src/intercept_frontend_message.rs
+++ b/desktop/wrapper/src/intercept_frontend_message.rs
@@ -3,35 +3,23 @@ use graphite_editor::messages::layout::utility_types::layout_widget::LayoutTarge
 use graphite_editor::messages::prelude::FrontendMessage;

 use super::DesktopWrapperMessageDispatcher;
-use super::messages::{DesktopFrontendMessage, OpenFileDialogContext, SaveFileDialogContext};
+use super::messages::{DesktopFrontendMessage, IngestAction, SaveFileDialogContext};

 pub(super) fn intercept_frontend_message(dispatcher: &mut DesktopWrapperMessageDispatcher, message: FrontendMessage) -> Option<FrontendMessage> {
 	match message {
 		FrontendMessage::RenderOverlays { context } => {
 			dispatcher.respond(DesktopFrontendMessage::UpdateOverlays(context.take_scene()));
 		}
-		FrontendMessage::TriggerOpen { filters } => {
+		FrontendMessage::TriggerBrowse { options, action } => {
+			let title = match action {
+				IngestAction::Open => "Open Document",
+				IngestAction::Import => "Import File",
+				_ => "Select File",
+			};
 			dispatcher.respond(DesktopFrontendMessage::OpenFileDialog {
-				title: "Open Document".to_string(),
-				filters,
-				multiple: true,
-				context: OpenFileDialogContext::Open,
-			});
-		}
-		FrontendMessage::TriggerImport { filters } => {
-			dispatcher.respond(DesktopFrontendMessage::OpenFileDialog {
-				title: "Import File".to_string(),
-				filters,
-				multiple: false,
-				context: OpenFileDialogContext::Import,
-			});
-		}
-		FrontendMessage::TriggerUploadResource { filters } => {
-			dispatcher.respond(DesktopFrontendMessage::OpenFileDialog {
-				title: "Select File".to_string(),
-				filters,
-				multiple: false,
-				context: OpenFileDialogContext::UploadResource,
+				title: title.to_string(),
+				options,
+				action,
 			});
 		}
 		FrontendMessage::TriggerSaveDocument {
--- a/desktop/wrapper/src/messages.rs
+++ b/desktop/wrapper/src/messages.rs
@@ -3,9 +3,10 @@ use std::path::PathBuf;

 pub(crate) use graphite_editor::messages::prelude::Message as EditorMessage;

-pub use graphite_editor::messages::frontend::utility_types::{DocumentInfo, FileFilter, PersistedState};
+pub use graphite_editor::messages::frontend::utility_types::{DocumentInfo, FileDialogOptions, FileFilter, PersistedState};
 pub use graphite_editor::messages::input_mapper::utility_types::keyboard::{Key, ModifierKeys};
 pub use graphite_editor::messages::input_mapper::utility_types::pointer::{EditorPointerState, MouseKeys, ScrollDelta};
+pub use graphite_editor::messages::portfolio::ingest::utility_types::IngestAction;
 pub use graphite_editor::messages::prelude::DocumentId;
 pub use graphite_editor::messages::prelude::InputPreprocessorMessage as InputMessage;
 pub use graphite_editor::messages::prelude::PreferencesMessageHandler as Preferences;
@@ -15,9 +16,8 @@ pub enum DesktopFrontendMessage {
 	OpenLaunchDocuments,
 	OpenFileDialog {
 		title: String,
-		filters: Vec<FileFilter>,
-		multiple: bool,
-		context: OpenFileDialogContext,
+		options: FileDialogOptions,
+		action: IngestAction,
 	},
 	SaveFileDialog {
 		title: String,
@@ -87,10 +87,8 @@ pub enum DesktopWrapperMessage {
 	FromWeb(Box<EditorMessage>),
 	Wake,
 	Input(InputMessage),
-	FileDialogResult { path: PathBuf, content: Vec<u8>, context: OpenFileDialogContext },
+	IngestFile { path: PathBuf, content: Vec<u8>, action: IngestAction },
 	SaveFileDialogResult { path: PathBuf, context: SaveFileDialogContext },
-	OpenFile { path: PathBuf, content: Vec<u8> },
-	ImportFile { path: PathBuf, content: Vec<u8> },
 	PollNodeGraphEvaluation,
 	UpdateMaximized { maximized: bool },
 	UpdateFullscreen { fullscreen: bool },
@@ -103,13 +101,6 @@ pub enum DesktopWrapperMessage {
 	LoadThirdPartyLicenses { text: String },
 }

-#[derive(Clone, Copy)]
-pub enum OpenFileDialogContext {
-	Open,
-	Import,
-	UploadResource,
-}
-
 pub enum SaveFileDialogContext {
 	Document { document_id: DocumentId, content: Vec<u8> },
 	File { content: Vec<u8> },