mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: fix incorrect warning when plugin doesn't exist

Browse source 
Fixes #2415.
This commit is contained in:
hankertrix 2025-02-28 22:09:21 +08:00
parent 84d71bfa39
commit b04e8382d0
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
yazi-plugin/src/loader/loader.rs
View file

@ -20,7 +20,9 @@ impl Deref for Loader {
type Target = RwLock<HashMap<String, Chunk>>; type Target = RwLock<HashMap<String, Chunk>>;
#[inline] #[inline]
fn deref(&self) -> &Self::Target { &self.cache } fn deref(&self) -> &Self::Target {
&self.cache
}
} }
impl Default for Loader { impl Default for Loader {
@ -61,21 +63,28 @@ impl Loader {
Ok(b) => b, Ok(b) => b,
Err(e) if e.kind() == std::io::ErrorKind::NotFound => { Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
static WARNED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false); static WARNED: std::sync::atomic::AtomicBool = std::sync::atomic::AtomicBool::new(false);
if !WARNED.swap(true, std::sync::atomic::Ordering::Relaxed) {
yazi_proxy::AppProxy::notify(yazi_proxy::options::NotifyOpt {
title: "Deprecated entry file".to_owned(),
content: format!(
"The plugin's entry file `init.lua` has been deprecated in favor of the new `main.lua` (user's own `init.lua` remains unchanged).
Please run `ya pack -m` to automatically migrate all plugins, or manually rename your `{name}.yazi/init.lua` to `{name}.yazi/main.lua`."
),
level: yazi_proxy::options::NotifyLevel::Warn,
timeout: std::time::Duration::from_secs(25),
});
}
let p = BOOT.plugin_dir.join(format!("{name}.yazi/init.lua")); let p = BOOT.plugin_dir.join(format!("{name}.yazi/init.lua"));
fs::read(&p).await.with_context(|| format!("Failed to load plugin from {p:?}"))?
match fs::read(&p).await {
Err(e) => Err(e).with_context(|| format!("Failed to load plugin from {p:?}"))?,
Ok(b) => {
if !WARNED.swap(true, std::sync::atomic::Ordering::Relaxed) {
yazi_proxy::AppProxy::notify(yazi_proxy::options::NotifyOpt {
title: "Deprecated entry file".to_owned(),
content: format!(
"The plugin's entry file `init.lua` has been deprecated in favor of the new `main.lua` (user's own `init.lua` remains unchanged).
Please run `ya pack -m` to automatically migrate all plugins, or manually rename your `{name}.yazi/init.lua` to `{name}.yazi/main.lua`."
),
level: yazi_proxy::options::NotifyLevel::Warn,
timeout: std::time::Duration::from_secs(25),
});
}
b
}
}
} }
Err(e) => Err(e).with_context(|| format!("Failed to load plugin from {p:?}"))?, Err(e) => Err(e).with_context(|| format!("Failed to load plugin from {p:?}"))?,
}; };