feat: launch from preset settings if the user's config cannot be pars…

…ed (#1832)

Cargo.toml

@@ -10,7 +10,7 @@ panic         = "abort"
 strip         = true
 
 [workspace.dependencies]
-ansi-to-tui   = "6.0.0"
+ansi-to-tui   = "7.0.0"
 anyhow        = "1.0.91"
 arc-swap      = "1.7.1"
 base64        = "0.22.1"
@@ -24,7 +24,7 @@ libc          = "0.2.161"
 md-5          = "0.10.6"
 mlua          = { version = "0.9.9", features = [ "lua54", "serialize", "macros", "async" ] }
 parking_lot   = "0.12.3"
-ratatui       = { version = "0.28.1", features = [ "unstable-rendered-line-info" ] }
+ratatui       = { version = "0.29.0", features = [ "unstable-rendered-line-info" ] }
 regex         = "1.11.1"
 scopeguard    = "1.2.0"
 serde         = { version = "1.0.213", features = [ "derive" ] }

yazi-config/src/keymap/keymap.rs

@@ -1,5 +1,6 @@
 use std::{collections::HashSet, str::FromStr};
 
+use anyhow::Context;
 use indexmap::IndexSet;
 use serde::{Deserialize, Deserializer};
 use yazi_shared::Layer;
@@ -20,7 +21,7 @@ pub struct Keymap {
 
 impl Keymap {
 	#[inline]
-	pub fn get(&self, layer: Layer) -> &Vec<Chord> {
+	pub fn get(&self, layer: Layer) -> &[Chord] {
 		match layer {
 			Layer::App => unreachable!(),
 			Layer::Manager => &self.manager,
@@ -36,9 +37,11 @@ impl Keymap {
 }
 
 impl FromStr for Keymap {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
-	fn from_str(s: &str) -> Result<Self, Self::Err> { toml::from_str(s) }
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		toml::from_str(s).context("Failed to parse your keymap.toml")
+	}
 }
 
 impl<'de> Deserialize<'de> for Keymap {

yazi-config/src/lib.rs

@@ -24,25 +24,25 @@ pub static PICK: RoCell<popup::Pick> = RoCell::new();
 pub static WHICH: RoCell<which::Which> = RoCell::new();
 
 pub fn init() -> anyhow::Result<()> {
-	let config_dir = Xdg::config_dir();
-	let yazi_toml = &Preset::yazi(&config_dir)?;
-	let keymap_toml = &Preset::keymap(&config_dir)?;
-	let theme_toml = &Preset::theme(&config_dir)?;
+	if let Err(e) = try_init(true) {
+		eprintln!("{e}");
+		if let Some(src) = e.source() {
+			eprintln!("\nCaused by:\n{src}");
+		}
 
-	LAYOUT.with(<_>::default);
+		use crossterm::style::{Attribute, Print, SetAttributes};
+		crossterm::execute!(
+			std::io::stderr(),
+			SetAttributes(Attribute::Reverse.into()),
+			SetAttributes(Attribute::Bold.into()),
+			Print("Press <Enter> to continue with preset settings..."),
+			SetAttributes(Attribute::Reset.into()),
+			Print("\n"),
+		)?;
 
-	KEYMAP.init(<_>::from_str(keymap_toml)?);
-	LOG.init(<_>::from_str(yazi_toml)?);
-	MANAGER.init(<_>::from_str(yazi_toml)?);
-	OPEN.init(<_>::from_str(yazi_toml)?);
-	PLUGIN.init(<_>::from_str(yazi_toml)?);
-	PREVIEW.init(<_>::from_str(yazi_toml)?);
-	TASKS.init(<_>::from_str(yazi_toml)?);
-	THEME.init(<_>::from_str(theme_toml)?);
-	INPUT.init(<_>::from_str(yazi_toml)?);
-	CONFIRM.init(<_>::from_str(yazi_toml)?);
-	PICK.init(<_>::from_str(yazi_toml)?);
-	WHICH.init(<_>::from_str(yazi_toml)?);
+		std::io::stdin().read_line(&mut String::new())?;
+		try_init(false)?;
+	}
 
 	// TODO: Remove in v0.3.2
 	for c in &KEYMAP.manager {
@@ -78,3 +78,43 @@ Please change `create_title = "Create:"` to `create_title = ["Create:", "Create
 
 	Ok(())
 }
+
+fn try_init(merge: bool) -> anyhow::Result<()> {
+	let (yazi_toml, keymap_toml, theme_toml) = if merge {
+		let p = Xdg::config_dir();
+		(Preset::yazi(&p)?, Preset::keymap(&p)?, Preset::theme(&p)?)
+	} else {
+		use yazi_macro::config_preset as preset;
+		(preset!("yazi"), preset!("keymap"), preset!("theme"))
+	};
+
+	let keymap = <_>::from_str(&keymap_toml)?;
+	let log = <_>::from_str(&yazi_toml)?;
+	let manager = <_>::from_str(&yazi_toml)?;
+	let open = <_>::from_str(&yazi_toml)?;
+	let plugin = <_>::from_str(&yazi_toml)?;
+	let preview = <_>::from_str(&yazi_toml)?;
+	let tasks = <_>::from_str(&yazi_toml)?;
+	let theme = <_>::from_str(&theme_toml)?;
+	let input = <_>::from_str(&yazi_toml)?;
+	let confirm = <_>::from_str(&yazi_toml)?;
+	let pick = <_>::from_str(&yazi_toml)?;
+	let which = <_>::from_str(&yazi_toml)?;
+
+	LAYOUT.with(<_>::default);
+
+	KEYMAP.init(keymap);
+	LOG.init(log);
+	MANAGER.init(manager);
+	OPEN.init(open);
+	PLUGIN.init(plugin);
+	PREVIEW.init(preview);
+	TASKS.init(tasks);
+	THEME.init(theme);
+	INPUT.init(input);
+	CONFIRM.init(confirm);
+	PICK.init(pick);
+	WHICH.init(which);
+
+	Ok(())
+}

yazi-config/src/log/log.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use anyhow::Context;
 use serde::{Deserialize, Deserializer};
 
 #[derive(Debug)]
@@ -8,9 +9,11 @@ pub struct Log {
 }
 
 impl FromStr for Log {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
-	fn from_str(s: &str) -> Result<Self, Self::Err> { toml::from_str(s) }
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		toml::from_str(s).context("Failed to parse the [log] section in your yazi.toml")
+	}
 }
 
 impl<'de> Deserialize<'de> for Log {

yazi-config/src/manager/manager.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use anyhow::Context;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
@@ -35,9 +36,10 @@ impl FromStr for Manager {
 			manager: Manager,
 		}
 
-		let manager = toml::from_str::<Outer>(s)?.manager;
-		manager.validate()?;
+		let outer = toml::from_str::<Outer>(s)
+			.context("Failed to parse the [manager] section in your yazi.toml")?;
+		outer.manager.validate()?;
 
-		Ok(manager)
+		Ok(outer.manager)
 	}
 }

yazi-config/src/open/open.rs

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, path::Path, str::FromStr};
 
+use anyhow::Context;
 use indexmap::IndexSet;
 use serde::{Deserialize, Deserializer};
 use yazi_shared::MIME_DIR;
@@ -55,9 +56,11 @@ impl Open {
 }
 
 impl FromStr for Open {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
-	fn from_str(s: &str) -> Result<Self, Self::Err> { toml::from_str(s) }
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		toml::from_str(s).context("Failed to parse the [open] or [opener] section in your yazi.toml")
+	}
 }
 
 impl<'de> Deserialize<'de> for Open {

yazi-config/src/plugin/plugin.rs

@@ -1,11 +1,11 @@
 use std::{collections::HashSet, path::Path, str::FromStr};
 
-use serde::Deserialize;
+use anyhow::Context;
+use serde::{Deserialize, Deserializer};
 
 use super::{Fetcher, Preloader, Previewer};
 use crate::{Preset, plugin::MAX_PREWORKERS};
 
-#[derive(Deserialize)]
 pub struct Plugin {
 	pub fetchers:   Vec<Fetcher>,
 	pub preloaders: Vec<Preloader>,
@@ -55,9 +55,18 @@ impl Plugin {
 }
 
 impl FromStr for Plugin {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		toml::from_str(s).context("Failed to parse the [plugin] section in your yazi.toml")
+	}
+}
+
+impl<'de> Deserialize<'de> for Plugin {
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
 		#[derive(Deserialize)]
 		struct Outer {
 			plugin: Shadow,
@@ -84,7 +93,7 @@ impl FromStr for Plugin {
 			append_previewers:  Vec<Previewer>,
 		}
 
-		let mut shadow = toml::from_str::<Outer>(s)?.plugin;
+		let mut shadow = Outer::deserialize(deserializer)?.plugin;
 		if shadow.append_previewers.iter().any(|r| r.any_file()) {
 			shadow.previewers.retain(|r| !r.any_file());
 		}

yazi-config/src/popup/confirm.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use anyhow::Context;
 use serde::Deserialize;
 
 use super::{Offset, Origin};
@@ -30,15 +31,18 @@ pub struct Confirm {
 }
 
 impl FromStr for Confirm {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		#[derive(Deserialize)]
 		struct Outer {
 			confirm: Confirm,
 		}
 
-		Ok(toml::from_str::<Outer>(s)?.confirm)
+		let outer = toml::from_str::<Outer>(s)
+			.context("Failed to parse the [confirm] section in your yazi.toml")?;
+
+		Ok(outer.confirm)
 	}
 }
 

yazi-config/src/popup/input.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use anyhow::Context;
 use serde::Deserialize;
 
 use super::{Offset, Origin};
@@ -49,15 +50,18 @@ impl Input {
 }
 
 impl FromStr for Input {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		#[derive(Deserialize)]
 		struct Outer {
 			input: Input,
 		}
 
-		Ok(toml::from_str::<Outer>(s)?.input)
+		let outer = toml::from_str::<Outer>(s)
+			.context("Failed to parse the [input] section in your yazi.toml")?;
+
+		Ok(outer.input)
 	}
 }
 

yazi-config/src/popup/pick.rs

@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use anyhow::Context;
 use serde::Deserialize;
 
 use super::{Offset, Origin};
@@ -17,14 +18,17 @@ impl Pick {
 }
 
 impl FromStr for Pick {
-	type Err = toml::de::Error;
+	type Err = anyhow::Error;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		#[derive(Deserialize)]
 		struct Outer {
 			pick: Pick,
 		}
 
-		Ok(toml::from_str::<Outer>(s)?.pick)
+		let outer =
+			toml::from_str::<Outer>(s).context("Failed to parse the [pick] section in your yazi.toml")?;
+
+		Ok(outer.pick)
 	}
 }

yazi-config/src/preset.rs

@@ -9,15 +9,15 @@ use crate::theme::Flavor;
 pub(crate) struct Preset;
 
 impl Preset {
-	pub(crate) fn yazi(p: &Path) -> Result<Cow<str>> {
+	pub(crate) fn yazi(p: &Path) -> Result<Cow<'static, str>> {
 		Self::merge_path(p.join("yazi.toml"), preset!("yazi"))
 	}
 
-	pub(crate) fn keymap(p: &Path) -> Result<Cow<str>> {
+	pub(crate) fn keymap(p: &Path) -> Result<Cow<'static, str>> {
 		Self::merge_path(p.join("keymap.toml"), preset!("keymap"))
 	}
 
-	pub(crate) fn theme(p: &Path) -> Result<Cow<str>> {
+	pub(crate) fn theme(p: &Path) -> Result<Cow<'static, str>> {
 		let Ok(user) = std::fs::read_to_string(p.join("theme.toml")) else {
 			return Ok(preset!("theme"));
 		};