..

sxyazi · Sep 3, 2023 · f2703a3 · f2703a3
1 parent 9b1c605
commit f2703a3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/app/src/manager/folder.rs b/app/src/manager/folder.rs
@@ -1,7 +1,7 @@
 use core::files::File;
 
 use config::{MANAGER, THEME};
-use ratatui::{buffer::Buffer, layout::Rect, style::{Color, Modifier, Style, Stylize}, text::{Line, Span}, widgets::{List, ListItem, Widget}};
+use ratatui::{buffer::Buffer, layout::Rect, style::{Color, Modifier, Style}, text::{Line, Span}, widgets::{List, ListItem, Widget}};
 use shared::readable_path;
 
 use crate::Ctx;
@@ -99,14 +99,16 @@ impl<'a> Widget for Folder<'a> {
 					self.file_style(f)
 				};
 
-				let mut spans = Vec::with_capacity(10);
-
+				let mut spans = Vec::with_capacity(5);
 				spans.push(Span::raw(format!(" {} ", Self::icon(f))));
 				spans.push(Span::raw(readable_path(f.path(), &self.folder.cwd)));
 
 				if let Some(link_to) = f.link_to() {
 					if MANAGER.show_symlink {
-						spans.push(Span::raw(format!(" -> {}", link_to.display())));
+						spans.push(Span::styled(
+							format!(" -> {}", link_to.display()),
+							Style::new().add_modifier(Modifier::ITALIC),
+						));
 					}
 				}
 

diff --git a/config/src/keymap/exec.rs b/config/src/keymap/exec.rs
@@ -89,12 +89,23 @@ impl Exec {
 
 impl Exec {
 	#[inline]
-	pub fn call(cwd: &str, args: Vec<String>) -> Vec<Self> {
-		vec![Exec { cmd: cwd.to_owned(), args, named: Default::default() }]
+	pub fn call(cwd: &str, args: Vec<String>) -> Self {
+		Exec { cmd: cwd.to_owned(), args, named: Default::default() }
 	}
 
 	#[inline]
-	pub fn call_named(cwd: &str, named: BTreeMap<String, String>) -> Vec<Self> {
-		vec![Exec { cmd: cwd.to_owned(), args: Default::default(), named }]
+	pub fn call_named(cwd: &str, named: BTreeMap<String, String>) -> Self {
+		Exec { cmd: cwd.to_owned(), args: Default::default(), named }
+	}
+
+	#[inline]
+	pub fn vec(self) -> Vec<Self> { vec![self] }
+
+	#[inline]
+	pub fn with_bool(mut self, name: &str, state: bool) -> Self {
+		if state {
+			self.named.insert(name.to_string(), "".to_string());
+		}
+		self
 	}
 }
diff --git a/core/src/manager/finder.rs b/core/src/manager/finder.rs
@@ -39,7 +39,6 @@ impl Finder {
 		if self.version == files.version() {
 			return false;
 		}
-
 		self.matched.clear();
 
 		let mut i = 0u8;

diff --git a/core/src/manager/tab.rs b/core/src/manager/tab.rs
@@ -239,7 +239,10 @@ impl Tab {
 
 		tokio::spawn(async move {
 			if let Ok(s) = emit!(Input(InputOpt::top("Find:"))).await {
-				emit!(Call(Exec::call("find", vec![s]), KeymapLayer::Manager));
+				emit!(Call(
+					Exec::call("find", vec![s]).with_bool("previous", prev).vec(),
+					KeymapLayer::Manager
+				));
 			}
 		});
 		false