From 058d3f9c4e8d51ccb87f4807a869a28dbd44695f Mon Sep 17 00:00:00 2001 From: sxyazi Date: Wed, 27 Mar 2024 23:35:23 +0800 Subject: [PATCH] feat: time-based selection order preservation --- yazi-core/src/tab/commands/select_all.rs | 2 +- yazi-core/src/tab/selected.rs | 18 +++++++++--------- yazi-fm/src/lives/file.rs | 2 +- yazi-fm/src/lives/selected.rs | 16 +++++++++------- yazi-shared/src/throttle.rs | 8 ++++---- yazi-shared/src/time.rs | 4 ++-- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/yazi-core/src/tab/commands/select_all.rs b/yazi-core/src/tab/commands/select_all.rs index 7e7399ae..f081bbde 100644 --- a/yazi-core/src/tab/commands/select_all.rs +++ b/yazi-core/src/tab/commands/select_all.rs @@ -28,7 +28,7 @@ impl Tab { let (removal, addition): (Vec<_>, Vec<_>) = match opt.into().state { Some(true) => (vec![], iter.collect()), Some(false) => (iter.collect(), vec![]), - None => iter.partition(|&u| self.selected.contains(u)), + None => iter.partition(|&u| self.selected.contains_key(u)), }; let same = !self.current.cwd.is_search(); diff --git a/yazi-core/src/tab/selected.rs b/yazi-core/src/tab/selected.rs index 375fe011..8f6f3c06 100644 --- a/yazi-core/src/tab/selected.rs +++ b/yazi-core/src/tab/selected.rs @@ -1,15 +1,15 @@ -use std::{collections::{BTreeSet, HashMap}, ops::Deref}; +use std::{collections::HashMap, ops::Deref}; -use yazi_shared::fs::{FilesOp, Url}; +use yazi_shared::{fs::{FilesOp, Url}, timestamp_us}; #[derive(Default)] pub struct Selected { - inner: BTreeSet, + inner: HashMap, parents: HashMap, } impl Deref for Selected { - type Target = BTreeSet; + type Target = HashMap; fn deref(&self) -> &Self::Target { &self.inner } } @@ -43,7 +43,7 @@ impl Selected { let mut parent = urls[0].parent_url(); let mut parents = vec![]; while let Some(u) = parent { - if self.inner.contains(&u) { + if self.inner.contains_key(&u) { return 0; } @@ -51,8 +51,8 @@ impl Selected { parents.push(u); } - let len = self.inner.len(); - self.inner.extend(urls.iter().map(|&&u| u.clone())); + let (now, len) = (timestamp_us(), self.inner.len()); + self.inner.extend(urls.iter().enumerate().map(|(i, &&u)| (u.clone(), now + i as u64))); for u in parents { *self.parents.entry(u).or_insert(0) += self.inner.len() - len; @@ -78,7 +78,7 @@ impl Selected { } fn remove_same(&mut self, urls: &[impl AsRef]) -> usize { - let count = urls.iter().map(|u| self.inner.remove(u.as_ref())).filter(|&b| b).count(); + let count = urls.iter().map(|u| self.inner.remove(u.as_ref())).filter_map(|v| v).count(); if count == 0 { return 0; } @@ -106,7 +106,7 @@ impl Selected { let (removal, addition) = match op { FilesOp::Deleting(_, urls) => (urls.iter().collect(), vec![]), FilesOp::Updating(_, urls) | FilesOp::Upserting(_, urls) => { - urls.iter().filter(|(u, _)| self.contains(u)).map(|(u, f)| (u, &f.url)).unzip() + urls.iter().filter(|&(u, _)| self.contains_key(u)).map(|(u, f)| (u, &f.url)).unzip() } _ => (vec![], vec![]), }; diff --git a/yazi-fm/src/lives/file.rs b/yazi-fm/src/lives/file.rs index e8c46cc4..a257d3a7 100644 --- a/yazi-fm/src/lives/file.rs +++ b/yazi-fm/src/lives/file.rs @@ -90,7 +90,7 @@ impl File { _ => 0u8, }) }); - reg.add_method("is_selected", |_, me, ()| Ok(me.tab().selected.contains(&me.url))); + reg.add_method("is_selected", |_, me, ()| Ok(me.tab().selected.contains_key(&me.url))); reg.add_method("in_parent", |_, me, ()| { Ok(me.tab().parent.as_ref().is_some_and(|f| me.folder().cwd == f.cwd)) }); diff --git a/yazi-fm/src/lives/selected.rs b/yazi-fm/src/lives/selected.rs index f2e8937c..6310e147 100644 --- a/yazi-fm/src/lives/selected.rs +++ b/yazi-fm/src/lives/selected.rs @@ -1,4 +1,4 @@ -use std::{collections::{btree_set, BTreeSet}, ops::Deref}; +use std::{collections::{hash_map, HashMap}, ops::Deref}; use mlua::{AnyUserData, IntoLuaMulti, Lua, MetaMethod, UserDataMethods, UserDataRefMut}; use yazi_plugin::{bindings::Cast, url::Url}; @@ -7,18 +7,20 @@ use super::{Iter, SCOPE}; #[derive(Clone, Copy)] pub(super) struct Selected { - inner: *const BTreeSet, + inner: *const HashMap, } impl Deref for Selected { - type Target = BTreeSet; + type Target = HashMap; fn deref(&self) -> &Self::Target { self.inner() } } impl Selected { #[inline] - pub(super) fn make(inner: &BTreeSet) -> mlua::Result> { + pub(super) fn make( + inner: &HashMap, + ) -> mlua::Result> { SCOPE.create_any_userdata(Self { inner }) } @@ -28,7 +30,7 @@ impl Selected { reg.add_meta_method(MetaMethod::Pairs, |lua, me, ()| { let iter = lua.create_function( - |lua, mut iter: UserDataRefMut, _>>| { + |lua, mut iter: UserDataRefMut, _>>| { if let Some(next) = iter.next() { (next.0, Url::cast(lua, next.1.clone())?).into_lua_multi(lua) } else { @@ -37,7 +39,7 @@ impl Selected { }, )?; - Ok((iter, Iter::make(me.inner().iter()))) + Ok((iter, Iter::make(me.inner().keys()))) }); })?; @@ -45,5 +47,5 @@ impl Selected { } #[inline] - fn inner(&self) -> &'static BTreeSet { unsafe { &*self.inner } } + fn inner(&self) -> &'static HashMap { unsafe { &*self.inner } } } diff --git a/yazi-shared/src/throttle.rs b/yazi-shared/src/throttle.rs index 8ffb29af..0f5e2612 100644 --- a/yazi-shared/src/throttle.rs +++ b/yazi-shared/src/throttle.rs @@ -2,7 +2,7 @@ use std::{fmt::Debug, mem, sync::atomic::{AtomicU64, AtomicUsize, Ordering}, tim use parking_lot::Mutex; -use crate::timestamp_ms; +use crate::timestamp_us; #[derive(Debug)] pub struct Throttle { @@ -17,7 +17,7 @@ impl Throttle { Self { total: AtomicUsize::new(total), interval, - last: AtomicU64::new(timestamp_ms() - interval.as_millis() as u64), + last: AtomicU64::new(timestamp_us() - interval.as_micros() as u64), buf: Default::default(), } } @@ -32,8 +32,8 @@ impl Throttle { } let last = self.last.load(Ordering::Relaxed); - let now = timestamp_ms(); - if now > self.interval.as_millis() as u64 + last { + let now = timestamp_us(); + if now > self.interval.as_micros() as u64 + last { self.last.store(now, Ordering::Relaxed); return self.flush(data, f); } diff --git a/yazi-shared/src/time.rs b/yazi-shared/src/time.rs index 580605e2..6a75756a 100644 --- a/yazi-shared/src/time.rs +++ b/yazi-shared/src/time.rs @@ -1,5 +1,5 @@ use std::time::{self, SystemTime}; -pub fn timestamp_ms() -> u64 { - SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap().as_millis() as u64 +pub fn timestamp_us() -> u64 { + SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap().as_micros() as u64 }