mitsuo_makuda/linutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/linutil.git synced 2025-04-21 11:17:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

implement changes proposed by adam

Browse Source 
Co-authored-by: Adam Perkowski <adas1per@protonmail.com>
This commit is contained in:
nyx 2024-10-02 00:02:14 -04:00
parent 0061868597
commit 92643de3ad
No known key found for this signature in database
GPG Key ID: 9924455A3BB7D06C
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tui/src/state.rs
View File

@ -77,6 +77,13 @@ pub struct ListEntry {
pub has_children: bool, pub has_children: bool,
} }
enum SelectedItem {
UpDir,
Directory,
Command,
None,
}
impl AppState { impl AppState {
pub fn new(theme: Theme, override_validation: bool) -> Self { pub fn new(theme: Theme, override_validation: bool) -> Self {
let tabs = linutil_core::get_tabs(!override_validation); let tabs = linutil_core::get_tabs(!override_validation);
@ -574,9 +581,8 @@ impl AppState {
} }
fn enter_parent_directory(&mut self) { fn enter_parent_directory(&mut self) {
if self.visit_stack.len() > 1 { if let Some(previous_position) = self.position_stack.pop() {
self.visit_stack.pop(); self.visit_stack.pop();
let previous_position = self.position_stack.pop().unwrap_or(0);
self.selection.select(Some(previous_position)); self.selection.select(Some(previous_position));
self.update_items(); self.update_items();
} }
@ -674,26 +680,39 @@ impl AppState {
} }
} }
fn handle_enter(&mut self) { fn get_selected_item_type(&self) -> SelectedItem {
if self.selected_item_is_up_dir() { if self.selected_item_is_up_dir() {
self.enter_parent_directory(); SelectedItem::UpDir
} else if self.selected_item_is_dir() { } else if self.selected_item_is_dir() {
self.go_to_selected_dir(); SelectedItem::Directory
} else if self.selected_item_is_cmd() { } else if self.selected_item_is_cmd() {
if self.selected_commands.is_empty() { SelectedItem::Command
if let Some(node) = self.get_selected_node() { } else {
self.selected_commands.push(node); SelectedItem::None
}
}
fn handle_enter(&mut self) {
match self.get_selected_item_type() {
SelectedItem::UpDir => self.enter_parent_directory(),
SelectedItem::Directory => self.go_to_selected_dir(),
SelectedItem::Command => {
if self.selected_commands.is_empty() {
if let Some(node) = self.get_selected_node() {
self.selected_commands.push(node);
}
} }
let cmd_names = self
.selected_commands
.iter()
.map(|node| node.name.as_str())
.collect::<Vec<_>>();
let prompt = ConfirmPrompt::new(&cmd_names[..]);
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
} }
SelectedItem::None => {}
let cmd_names = self
.selected_commands
.iter()
.map(|node| node.name.as_str())
.collect::<Vec<_>>();
let prompt = ConfirmPrompt::new(&cmd_names[..]);
self.focus = Focus::ConfirmationPrompt(Float::new(Box::new(prompt), 40, 40));
} }
} }
@ -757,4 +776,4 @@ fn get_random_tip() -> &'static str {
let mut rng = rand::thread_rng(); let mut rng = rand::thread_rng();
let random_index = rng.gen_range(0..tips.len()); let random_index = rng.gen_range(0..tips.len());
tips[random_index] tips[random_index]
} }