From bbb8c3c036f783be446e2c78824e68aa6bbe43ca Mon Sep 17 00:00:00 2001 From: sxyazi Date: Wed, 10 Apr 2024 08:42:06 +0800 Subject: [PATCH] .. --- yazi-dds/src/body/delete.rs | 10 +++++----- yazi-dds/src/pubsub.rs | 8 ++++---- yazi-dds/src/pump.rs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/yazi-dds/src/body/delete.rs b/yazi-dds/src/body/delete.rs index c5dd3f6e..323a51ce 100644 --- a/yazi-dds/src/body/delete.rs +++ b/yazi-dds/src/body/delete.rs @@ -8,19 +8,19 @@ use super::Body; #[derive(Debug, Serialize, Deserialize)] pub struct BodyDelete<'a> { - pub targets: Cow<'a, Vec>, + pub urls: Cow<'a, Vec>, } impl<'a> BodyDelete<'a> { #[inline] pub fn borrowed(targets: &'a Vec) -> Body<'a> { - Self { targets: Cow::Borrowed(targets) }.into() + Self { urls: Cow::Borrowed(targets) }.into() } } impl BodyDelete<'static> { #[inline] - pub fn owned(targets: Vec) -> Body<'static> { Self { targets: Cow::Owned(targets) }.into() } + pub fn owned(targets: Vec) -> Body<'static> { Self { urls: Cow::Owned(targets) }.into() } } impl<'a> From> for Body<'a> { @@ -29,8 +29,8 @@ impl<'a> From> for Body<'a> { impl IntoLua<'_> for BodyDelete<'static> { fn into_lua(self, lua: &Lua) -> mlua::Result> { - let t = lua.create_table_with_capacity(self.targets.len(), 0)?; - for (i, url) in self.targets.into_owned().into_iter().enumerate() { + let t = lua.create_table_with_capacity(self.urls.len(), 0)?; + for (i, url) in self.urls.into_owned().into_iter().enumerate() { t.raw_set(i + 1, lua.create_any_userdata(url)?)?; } t.into_lua(lua) diff --git a/yazi-dds/src/pubsub.rs b/yazi-dds/src/pubsub.rs index 8a6912bd..0120a1e9 100644 --- a/yazi-dds/src/pubsub.rs +++ b/yazi-dds/src/pubsub.rs @@ -155,15 +155,15 @@ impl Pubsub { } } - pub(super) fn pub_from_delete(targets: Vec) { + pub(super) fn pub_from_delete(urls: Vec) { if PEERS.read().values().any(|p| p.able("delete")) { - Client::push(BodyDelete::borrowed(&targets)); + Client::push(BodyDelete::borrowed(&urls)); } if BOOT.local_events.contains("delete") { - BodyDelete::borrowed(&targets).with_receiver(*ID).flush(); + BodyDelete::borrowed(&urls).with_receiver(*ID).flush(); } if LOCAL.read().contains_key("delete") { - Self::pub_(BodyDelete::owned(targets)); + Self::pub_(BodyDelete::owned(urls)); } } } diff --git a/yazi-dds/src/pump.rs b/yazi-dds/src/pump.rs index afabdadc..740c9e1a 100644 --- a/yazi-dds/src/pump.rs +++ b/yazi-dds/src/pump.rs @@ -49,7 +49,7 @@ impl Pump { loop { select! { Some(items) = move_rx.next() => Pubsub::pub_from_move(items), - Some(targets) = delete_rx.next() => Pubsub::pub_from_delete(targets), + Some(urls) = delete_rx.next() => Pubsub::pub_from_delete(urls), else => { CT.cancel(); break;