Properly raise the window when opening with IPC

Author: trypsynth

src/ipc.rs

@@ -20,7 +20,8 @@ pub fn decode_execute_payload(data: &[u8]) -> Option<IpcCommand> {
 		return None;
 	}
 	let payload = String::from_utf8_lossy(data);
-	let payload = payload.trim_end_matches('\0').trim();
+	let payload = payload.replace('\0', "");
+	let payload = payload.trim();
 	if payload.is_empty() {
 		return None;
 	}
@@ -107,6 +108,15 @@ mod tests {
 		}
 	}
 
+	#[test]
+	fn decode_execute_payload_strips_embedded_nulls() {
+		let cmd = decode_execute_payload(b"C:\\Books\\novel.epub\0\0").expect("expected command");
+		match cmd {
+			IpcCommand::OpenFile(path) => assert_eq!(path, PathBuf::from("C:\\Books\\novel.epub")),
+			_ => panic!("expected OpenFile"),
+		}
+	}
+
 	#[test]
 	fn normalize_cli_path_canonicalizes_existing_path() {
 		let cwd = env::current_dir().expect("cwd").canonicalize().expect("canonical cwd");

src/ui/main_window.rs

@@ -179,6 +179,7 @@ impl MainWindow {
 	fn activate_from_ipc(&self) {
 		self.frame.show(true);
 		self.frame.iconize(false);
+		self.frame.request_user_attention(UserAttentionFlag::Info);
 		self.frame.raise();
 		self.doc_manager.lock().unwrap().restore_focus();
 	}
@@ -1184,14 +1185,37 @@ impl MainWindow {
 }
 
 fn ensure_parser_ready_for_path(frame: &Frame, path: &Path, config: &Rc<Mutex<ConfigManager>>) -> bool {
-	let extension = path.extension().and_then(|ext| ext.to_str()).unwrap_or_default();
-	if extension.is_empty() || parser_supports_extension(extension) {
+	let extension = parser_extension_for_path(path);
+	if extension.is_empty() || parser_supports_extension(&extension) {
 		return true;
 	}
 	let cfg = config.lock().unwrap();
 	ensure_parser_for_unknown_file(frame, path, &cfg)
 }
 
+fn parser_extension_for_path(path: &Path) -> String {
+	let from_path =
+		path.extension().and_then(|ext| ext.to_str()).map(clean_extension_token).unwrap_or_default().to_string();
+	if !from_path.is_empty() {
+		return from_path;
+	}
+	// Fallback for odd IPC/CLI strings that may contain trailing quotes or whitespace.
+	let raw = path.to_string_lossy();
+	let cleaned = raw.trim().trim_matches(['"', '\'', '\0']);
+	let candidate = cleaned
+		.rsplit_once(['/', '\\'])
+		.map_or(cleaned, |(_, file_name)| file_name)
+		.rsplit_once('.')
+		.map_or("", |(_, ext)| ext)
+		.trim();
+	clean_extension_token(candidate)
+}
+
+fn clean_extension_token(raw: &str) -> String {
+	let trimmed = raw.trim().trim_matches(['"', '\'', '\0']);
+	trimmed.chars().take_while(|c| c.is_ascii_alphanumeric()).collect()
+}
+
 fn ensure_parser_for_unknown_file(parent: &Frame, path: &Path, config: &ConfigManager) -> bool {
 	let path_str = path.to_string_lossy();
 	let saved_format = config.get_document_format(&path_str);
@@ -1250,3 +1274,33 @@ fn update_title_from_manager(frame: &Frame, dm: &DocumentManager) {
 		frame.set_status_text(&status_text, 0);
 	}
 }
+
+#[cfg(test)]
+mod tests {
+	use std::path::Path;
+
+	use super::parser_extension_for_path;
+
+	#[test]
+	fn parser_extension_for_path_handles_normal_paths() {
+		assert_eq!(parser_extension_for_path(Path::new("book.epub")), "epub");
+		assert_eq!(parser_extension_for_path(Path::new("C:\\docs\\book.PDF")), "PDF");
+	}
+
+	#[test]
+	fn parser_extension_for_path_strips_quotes_and_whitespace() {
+		assert_eq!(parser_extension_for_path(Path::new("  \"book.epub\"  ")), "epub");
+		assert_eq!(parser_extension_for_path(Path::new("'book.txt'")), "txt");
+	}
+
+	#[test]
+	fn parser_extension_for_path_returns_empty_for_no_extension() {
+		assert_eq!(parser_extension_for_path(Path::new("README")), "");
+	}
+
+	#[test]
+	fn parser_extension_for_path_handles_ipc_artifacts() {
+		assert_eq!(parser_extension_for_path(Path::new("book.epub\u{0}")), "epub");
+		assert_eq!(parser_extension_for_path(Path::new(" \"book.epub\u{0}\" ")), "epub");
+	}
+}