feat: new load DDS event (#1980)

Cargo.toml

@@ -19,9 +19,9 @@ crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.31"
 globset       = "0.4.15"
-libc          = "0.2.166"
+libc          = "0.2.167"
 md-5          = "0.10.6"
-mlua          = { version = "0.10.1", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serialize" ] }
+mlua          = { version = "0.10.2", features = [ "anyhow", "async", "error-send", "lua54", "macros", "serialize" ] }
 parking_lot   = "0.12.3"
 ratatui       = { version = "0.29.0", features = [ "unstable-rendered-line-info" ] }
 regex         = "1.11.1"

yazi-boot/Cargo.toml

@@ -11,6 +11,7 @@ repository  = "https://github.com/sxyazi/yazi"
 [dependencies]
 yazi-adapter = { path = "../yazi-adapter", version = "0.3.3" }
 yazi-config  = { path = "../yazi-config", version = "0.3.3" }
+yazi-fs      = { path = "../yazi-fs", version = "0.3.3" }
 yazi-macro   = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared  = { path = "../yazi-shared", version = "0.3.3" }
 

yazi-boot/src/actions/clear_cache.rs

@@ -1,5 +1,5 @@
 use yazi_config::PREVIEW;
-use yazi_shared::Xdg;
+use yazi_fs::Xdg;
 
 use super::Actions;
 

yazi-boot/src/boot.rs

@@ -1,7 +1,7 @@
 use std::{collections::HashSet, ffi::OsString, path::PathBuf};
 
 use serde::Serialize;
-use yazi_shared::{Xdg, fs::{current_cwd, expand_path}};
+use yazi_fs::{Xdg, current_cwd, expand_path};
 
 #[derive(Debug, Default, Serialize)]
 pub struct Boot {

yazi-cli/Cargo.toml

@@ -11,6 +11,7 @@ repository  = "https://github.com/sxyazi/yazi"
 [dependencies]
 yazi-boot   = { path = "../yazi-boot", version = "0.3.3" }
 yazi-dds    = { path = "../yazi-dds", version = "0.3.3" }
+yazi-fs     = { path = "../yazi-fs", version = "0.3.3" }
 yazi-macro  = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared = { path = "../yazi-shared", version = "0.3.3" }
 

yazi-cli/src/package/add.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use yazi_shared::fs::must_exists;
+use yazi_fs::must_exists;
 
 use super::{Git, Package};
 

yazi-cli/src/package/deploy.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use anyhow::{Context, Result, bail};
 use tokio::fs;
-use yazi_shared::{Xdg, fs::{maybe_exists, must_exists, remove_dir_clean}};
+use yazi_fs::{Xdg, maybe_exists, must_exists, remove_dir_clean};
 
 use super::Package;
 

yazi-cli/src/package/install.rs

@@ -1,5 +1,5 @@
 use anyhow::Result;
-use yazi_shared::fs::must_exists;
+use yazi_fs::must_exists;
 
 use super::{Git, Package};
 

yazi-cli/src/package/mod.rs

@@ -3,9 +3,10 @@
 yazi_macro::mod_flat!(add deploy git install package parser upgrade);
 
 use anyhow::Context;
+use yazi_fs::Xdg;
 
 pub(super) fn init() -> anyhow::Result<()> {
-	let root = yazi_shared::Xdg::state_dir().join("packages");
+	let root = Xdg::state_dir().join("packages");
 	std::fs::create_dir_all(&root)
 		.with_context(|| format!("failed to create packages directory: {root:?}"))?;
 

yazi-cli/src/package/package.rs

@@ -2,7 +2,7 @@ use std::{borrow::Cow, io::BufWriter, path::PathBuf};
 
 use anyhow::Result;
 use md5::{Digest, Md5};
-use yazi_shared::Xdg;
+use yazi_fs::Xdg;
 
 pub(crate) struct Package {
 	pub(crate) repo:      String,

yazi-cli/src/package/parser.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Result, bail};
 use tokio::fs;
 use toml_edit::{Array, DocumentMut, InlineTable, Item, Value};
-use yazi_shared::Xdg;
+use yazi_fs::Xdg;
 
 use super::Package;
 

yazi-codegen/Cargo.toml

@@ -13,5 +13,5 @@ proc-macro = true
 
 [dependencies]
 # External dependencies
-syn   = "2.0.89"
+syn   = "2.0.90"
 quote = "1.0.37"

yazi-config/Cargo.toml

@@ -9,6 +9,7 @@ homepage    = "https://yazi-rs.github.io"
 repository  = "https://github.com/sxyazi/yazi"
 
 [dependencies]
+yazi-fs     = { path = "../yazi-fs", version = "0.3.3" }
 yazi-macro  = { path = "../yazi-macro", version = "0.3.3" }
 yazi-shared = { path = "../yazi-shared", version = "0.3.3" }
 
@@ -17,7 +18,7 @@ anyhow    = { workspace = true }
 bitflags  = { workspace = true }
 crossterm = { workspace = true }
 globset   = { workspace = true }
-indexmap  = { version = "2.6.0", features = [ "serde" ] }
+indexmap  = { version = "2.7.0", features = [ "serde" ] }
 ratatui   = { workspace = true }
 regex     = { workspace = true }
 serde     = { workspace = true }

yazi-config/src/lib.rs

@@ -6,7 +6,7 @@ yazi_macro::mod_flat!(layout pattern preset priority);
 
 use std::str::FromStr;
 
-use yazi_shared::{RoCell, SyncCell, Xdg};
+use yazi_shared::{RoCell, SyncCell};
 
 pub static KEYMAP: RoCell<keymap::Keymap> = RoCell::new();
 pub static MANAGER: RoCell<manager::Manager> = RoCell::new();
@@ -74,15 +74,15 @@ pub fn init_flavor(light: bool) -> anyhow::Result<()> {
 	theme.manager.syntect_theme = theme
 		.flavor
 		.syntect_path(light)
-		.unwrap_or_else(|| yazi_shared::fs::expand_path(&theme.manager.syntect_theme));
+		.unwrap_or_else(|| yazi_fs::expand_path(&theme.manager.syntect_theme));
 
 	THEME.init(theme);
 	Ok(())
 }
 
 fn try_init(merge: bool) -> anyhow::Result<()> {
 	let (yazi_toml, keymap_toml) = if merge {
-		let p = Xdg::config_dir();
+		let p = yazi_fs::Xdg::config_dir();
 		(Preset::yazi(&p)?, Preset::keymap(&p)?)
 	} else {
 		(yazi_macro::config_preset!("yazi"), yazi_macro::config_preset!("keymap"))

yazi-config/src/manager/manager.rs

@@ -3,8 +3,9 @@ use std::str::FromStr;
 use anyhow::Context;
 use serde::{Deserialize, Serialize};
 use validator::Validate;
+use yazi_fs::SortBy;
 
-use super::{ManagerRatio, MouseEvents, SortBy};
+use super::{ManagerRatio, MouseEvents};
 
 #[derive(Debug, Deserialize, Serialize, Validate)]
 pub struct Manager {

yazi-config/src/manager/mod.rs

@@ -1 +1 @@
-yazi_macro::mod_flat!(manager mouse ratio sorting);
+yazi_macro::mod_flat!(manager mouse ratio);

yazi-config/src/pattern.rs

@@ -29,7 +29,7 @@ impl Pattern {
 
 		#[cfg(windows)]
 		let path = if self.sep_lit {
-			yazi_shared::fs::backslash_to_slash(path.as_ref())
+			yazi_fs::backslash_to_slash(path.as_ref())
 		} else {
 			std::borrow::Cow::Borrowed(path.as_ref())
 		};

yazi-config/src/plugin/plugin.rs

@@ -3,7 +3,7 @@ use std::{collections::HashSet, path::Path, str::FromStr};
 use anyhow::Context;
 use serde::{Deserialize, Deserializer};
 use tracing::warn;
-use yazi_shared::fs::File;
+use yazi_fs::File;
 
 use super::{Fetcher, Preloader, Previewer, Spotter};
 use crate::{Preset, plugin::MAX_PREWORKERS};

yazi-config/src/popup/options.rs

@@ -1,5 +1,5 @@
 use ratatui::{text::Text, widgets::{Paragraph, Wrap}};
-use yazi_shared::fs::Url;
+use yazi_shared::url::Url;
 
 use super::{Offset, Origin, Position};
 use crate::{CONFIRM, INPUT, PICK};
@@ -119,7 +119,7 @@ impl ConfirmCfg {
 		}
 	}
 
-	pub fn trash(urls: &[yazi_shared::fs::Url]) -> Self {
+	pub fn trash(urls: &[yazi_shared::url::Url]) -> Self {
 		Self::new(
 			Self::replace_number(&CONFIRM.trash_title, urls.len()),
 			(CONFIRM.trash_origin, CONFIRM.trash_offset),
@@ -128,7 +128,7 @@ impl ConfirmCfg {
 		)
 	}
 
-	pub fn delete(urls: &[yazi_shared::fs::Url]) -> Self {
+	pub fn delete(urls: &[yazi_shared::url::Url]) -> Self {
 		Self::new(
 			Self::replace_number(&CONFIRM.delete_title, urls.len()),
 			(CONFIRM.delete_origin, CONFIRM.delete_offset),

yazi-config/src/preset.rs

@@ -2,7 +2,7 @@ use std::{borrow::Cow, path::{Path, PathBuf}, str::FromStr};
 
 use anyhow::{Context, Result};
 use toml::{Table, Value};
-use yazi_shared::Xdg;
+use yazi_fs::Xdg;
 
 use crate::theme::Flavor;
 

yazi-config/src/preview/preview.rs

@@ -3,10 +3,10 @@ use std::{borrow::Cow, path::PathBuf, str::FromStr};
 use anyhow::Context;
 use serde::{Deserialize, Deserializer, Serialize};
 use validator::Validate;
-use yazi_shared::{fs::expand_path, timestamp_us};
+use yazi_fs::{Xdg, expand_path};
+use yazi_shared::timestamp_us;
 
 use super::PreviewWrap;
-use crate::Xdg;
 
 #[rustfmt::skip]
 const TABS: &[&str] = &["", " ", "  ", "   ", "    ", "     ", "      ", "       ", "        ", "         ", "          ", "           ", "            ", "             ", "              ", "               ", "                "];

yazi-config/src/theme/filetype.rs

@@ -1,5 +1,6 @@
 use serde::{Deserialize, Deserializer};
-use yazi_shared::{fs::File, theme::{Color, Style, StyleShadow}};
+use yazi_fs::File;
+use yazi_shared::theme::{Color, Style, StyleShadow};
 
 use super::Is;
 use crate::Pattern;

yazi-config/src/theme/flavor.rs

@@ -2,7 +2,7 @@ use std::{borrow::Cow, path::PathBuf, str::FromStr};
 
 use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
-use yazi_shared::Xdg;
+use yazi_fs::Xdg;
 
 #[derive(Default, Deserialize, Serialize)]
 pub struct Flavor {

yazi-config/src/theme/icons.rs

@@ -2,7 +2,8 @@ use std::collections::HashMap;
 
 use anyhow::Result;
 use serde::{Deserialize, Deserializer};
-use yazi_shared::{Condition, fs::File, theme::{Color, Icon, Style}};
+use yazi_fs::File;
+use yazi_shared::{Condition, theme::{Color, Icon, Style}};
 
 use crate::{Pattern, Preset};
 

yazi-config/src/theme/is.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use anyhow::bail;
 use serde::Deserialize;
-use yazi_shared::fs::Cha;
+use yazi_fs::Cha;
 
 #[derive(Default, Deserialize)]
 #[serde(try_from = "String")]

yazi-core/src/manager/commands/bulk_rename.rs

@@ -5,8 +5,9 @@ use scopeguard::defer;
 use tokio::{fs::{self, OpenOptions}, io::{AsyncReadExt, AsyncWriteExt, stdin}};
 use yazi_config::{OPEN, PREVIEW};
 use yazi_dds::Pubsub;
+use yazi_fs::{File, FilesOp, max_common_root, maybe_exists, paths_to_same_file};
 use yazi_proxy::{AppProxy, HIDER, TasksProxy, WATCHER};
-use yazi_shared::{fs::{File, FilesOp, Url, max_common_root, maybe_exists, paths_to_same_file}, terminal_clear};
+use yazi_shared::{terminal_clear, url::Url};
 
 use crate::manager::Manager;
 

yazi-core/src/manager/commands/create.rs

@@ -3,8 +3,9 @@ use std::collections::{HashMap, HashSet};
 use anyhow::Result;
 use tokio::fs;
 use yazi_config::popup::{ConfirmCfg, InputCfg};
+use yazi_fs::{File, FilesOp, maybe_exists, ok_or_not_found, realname};
 use yazi_proxy::{ConfirmProxy, InputProxy, TabProxy, WATCHER};
-use yazi_shared::{event::CmdCow, fs::{File, FilesOp, Url, UrnBuf, maybe_exists, ok_or_not_found, realname}};
+use yazi_shared::{event::CmdCow, url::{Url, UrnBuf}};
 
 use crate::manager::Manager;
 

yazi-core/src/manager/commands/hover.rs

@@ -2,7 +2,7 @@ use std::{collections::HashSet, path::PathBuf};
 
 use yazi_dds::Pubsub;
 use yazi_macro::render;
-use yazi_shared::{Id, event::{CmdCow, Data}, fs::{Url, Urn}};
+use yazi_shared::{Id, event::{CmdCow, Data}, url::{Url, Urn}};
 
 use crate::manager::Manager;
 

yazi-core/src/manager/commands/open.rs

@@ -3,13 +3,13 @@ use std::{borrow::Cow, ffi::OsString};
 use tracing::error;
 use yazi_boot::ARGS;
 use yazi_config::{OPEN, PLUGIN, popup::PickCfg};
-use yazi_fs::Folder;
+use yazi_fs::File;
 use yazi_macro::emit;
 use yazi_plugin::isolate;
 use yazi_proxy::{ManagerProxy, TasksProxy, options::OpenDoOpt};
-use yazi_shared::{MIME_DIR, event::{CmdCow, EventQuit}, fs::{File, Url}};
+use yazi_shared::{MIME_DIR, event::{CmdCow, EventQuit}, url::Url};
 
-use crate::{manager::Manager, tasks::Tasks};
+use crate::{manager::Manager, tab::Folder, tasks::Tasks};
 
 #[derive(Clone, Copy)]
 struct Opt {

yazi-core/src/manager/commands/peek.rs

@@ -1,5 +1,5 @@
 use yazi_proxy::HIDER;
-use yazi_shared::{event::{CmdCow, Data}, fs::Url};
+use yazi_shared::{event::{CmdCow, Data}, url::Url};
 
 use crate::manager::Manager;
 

yazi-core/src/manager/commands/remove.rs

@@ -1,6 +1,6 @@
 use yazi_config::popup::ConfirmCfg;
 use yazi_proxy::{ConfirmProxy, ManagerProxy};
-use yazi_shared::{event::CmdCow, fs::Url};
+use yazi_shared::{event::CmdCow, url::Url};
 
 use crate::{manager::Manager, tasks::Tasks};
 

yazi-core/src/manager/commands/rename.rs

@@ -4,8 +4,9 @@ use anyhow::Result;
 use tokio::fs;
 use yazi_config::popup::{ConfirmCfg, InputCfg};
 use yazi_dds::Pubsub;
+use yazi_fs::{File, FilesOp, maybe_exists, ok_or_not_found, paths_to_same_file, realname};
 use yazi_proxy::{ConfirmProxy, InputProxy, TabProxy, WATCHER};
-use yazi_shared::{event::CmdCow, fs::{File, FilesOp, Url, UrnBuf, maybe_exists, ok_or_not_found, paths_to_same_file, realname}};
+use yazi_shared::{Id, event::CmdCow, url::{Url, UrnBuf}};
 
 use crate::manager::Manager;
 
@@ -53,7 +54,7 @@ impl Manager {
 			_ => None,
 		};
 
-		let tab = self.tabs.cursor;
+		let tab = self.tabs.active().id;
 		tokio::spawn(async move {
 			let mut result = InputProxy::show(InputCfg::rename().with_value(name).with_cursor(cursor));
 			let Some(Ok(name)) = result.recv().await else {
@@ -73,7 +74,7 @@ impl Manager {
 		});
 	}
 
-	async fn rename_do(tab: usize, old: Url, new: Url) -> Result<()> {
+	async fn rename_do(tab: Id, old: Url, new: Url) -> Result<()> {
 		let Some((p_old, n_old)) = old.pair() else { return Ok(()) };
 		let Some((p_new, n_new)) = new.pair() else { return Ok(()) };
 		let _permit = WATCHER.acquire().await.unwrap();

yazi-core/src/manager/commands/tab_create.rs

@@ -1,7 +1,7 @@
 use yazi_boot::BOOT;
 use yazi_macro::render;
 use yazi_proxy::AppProxy;
-use yazi_shared::{event::CmdCow, fs::Url};
+use yazi_shared::{event::CmdCow, url::Url};
 
 use crate::{manager::Tabs, tab::Tab};