Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Multi selection and installation #338

Merged
merged 7 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions core/src/inner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,29 @@ pub fn get_tabs(validate: bool) -> Vec<Tab> {
});

let tabs: Vec<Tab> = tabs
.map(|(TabEntry { name, data }, directory)| {
let mut tree = Tree::new(ListNode {
name: "root".to_string(),
description: "".to_string(),
command: Command::None,
});
let mut root = tree.root_mut();
create_directory(data, &mut root, &directory);
Tab { name, tree }
})
.map(
|(
TabEntry {
name,
data,
multi_selectable,
},
directory,
)| {
let mut tree = Tree::new(ListNode {
name: "root".to_string(),
description: "".to_string(),
command: Command::None,
});
let mut root = tree.root_mut();
create_directory(data, &mut root, &directory);
Tab {
name,
tree,
multi_selectable,
}
},
)
.collect();

if tabs.is_empty() {
Expand All @@ -48,6 +61,12 @@ struct TabList {
struct TabEntry {
name: String,
data: Vec<Entry>,
#[serde(default = "default_multi_selectable")]
multi_selectable: bool,
}

fn default_multi_selectable() -> bool {
true
}

#[derive(Deserialize)]
Expand Down
1 change: 1 addition & 0 deletions core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ pub enum Command {
pub struct Tab {
pub name: String,
pub tree: Tree<ListNode>,
pub multi_selectable: bool,
}

#[derive(Clone, Hash, Eq, PartialEq)]
Expand Down
1 change: 1 addition & 0 deletions tabs/utils/tab_data.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name = "Utilities"
multi_selectable = false

[[data]]
name = "WiFi Manager"
Expand Down
2 changes: 1 addition & 1 deletion tui/src/floating_text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl FloatContent for FloatingText {
let inner_area = block.inner(area);

// Create the list of lines to be displayed
let mut lines: Vec<Line> = self
let lines: Vec<Line> = self
.text
.iter()
.skip(self.scroll)
Expand Down
4 changes: 4 additions & 0 deletions tui/src/hint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ pub fn draw_shortcuts(state: &AppState, frame: &mut Frame, area: Rect) {
hints.push(Shortcut::new(vec!["j", "Down"], "Select item below"));
hints.push(Shortcut::new(vec!["t"], "Next theme"));
hints.push(Shortcut::new(vec!["T"], "Previous theme"));
if state.is_current_tab_multi_selectable() {
hints.push(Shortcut::new(vec!["v"], "Toggle multi-selection mode"));
hints.push(Shortcut::new(vec!["Space"], "Select multiple commands"));
}
hints.push(Shortcut::new(vec!["Tab"], "Next tab"));
hints.push(Shortcut::new(vec!["Shift-Tab"], "Previous tab"));
ShortcutList {
Expand Down
32 changes: 19 additions & 13 deletions tui/src/running_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,25 +136,31 @@ impl FloatContent for RunningCommand {
}

impl RunningCommand {
pub fn new(command: Command) -> Self {
pub fn new(commands: Vec<Command>) -> Self {
let pty_system = NativePtySystem::default();

// Build the command based on the provided Command enum variant
let mut cmd = CommandBuilder::new("sh");
match command {
Command::Raw(prompt) => {
cmd.arg("-c");
cmd.arg(prompt);
}
Command::LocalFile(file) => {
cmd.arg(&file);
if let Some(parent) = file.parent() {
cmd.cwd(parent);
// Create a command to execute all the selected commands
let mut cmd: CommandBuilder = CommandBuilder::new("sh");
cmd.arg("-c");

// Initialize an empty string to hold the merged commands
// All the merged commands are passed as a single argument to reduce the overhead of rebuilding the command arguments for each and every command
let mut script = String::new();
for command in commands {
match command {
Command::Raw(prompt) => script.push_str(&format!("{}\n", prompt)), // Merge raw commands
Command::LocalFile(file) => {
if let Some(parent) = file.parent() {
script.push_str(&format!("cd {}\n", parent.display())); // Merge local file path
}
script.push_str(&format!("sh {}\n", file.display()));
}
Command::None => panic!("Command::None was treated as a command"),
}
Command::None => panic!("Command::None was treated as a command"),
}

cmd.arg(script);

// Open a pseudo-terminal with initial size
let pair = pty_system
.openpty(PtySize {
Expand Down
84 changes: 72 additions & 12 deletions tui/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ pub struct AppState {
/// widget
selection: ListState,
filter: Filter,
multi_select: bool,
selected_commands: Vec<Command>,
drawable: bool,
}

Expand Down Expand Up @@ -61,6 +63,8 @@ impl AppState {
visit_stack: vec![root_id],
selection: ListState::default().with_selected(Some(0)),
filter: Filter::new(),
multi_select: false,
selected_commands: Vec::new(),
drawable: false,
};
state.update_items();
Expand Down Expand Up @@ -199,12 +203,29 @@ impl AppState {
|ListEntry {
node, has_children, ..
}| {
let is_selected = self.selected_commands.contains(&node.command);
let (indicator, style) = if is_selected {
(self.theme.multi_select_icon(), Style::default().bold())
} else {
("", Style::new())
};
if *has_children {
Line::from(format!("{} {}", self.theme.dir_icon(), node.name))
.style(self.theme.dir_color())
Line::from(format!(
"{} {} {}",
self.theme.dir_icon(),
node.name,
indicator
))
.style(self.theme.dir_color())
} else {
Line::from(format!("{} {}", self.theme.cmd_icon(), node.name))
.style(self.theme.cmd_color())
Line::from(format!(
"{} {} {}",
self.theme.cmd_icon(),
node.name,
indicator
))
.style(self.theme.cmd_color())
.patch_style(style)
}
},
));
Expand All @@ -216,11 +237,15 @@ impl AppState {
} else {
Style::new()
})
.block(
Block::default()
.borders(Borders::ALL)
.title(format!("Linux Toolbox - {}", env!("BUILD_DATE"))),
)
.block(Block::default().borders(Borders::ALL).title(format!(
"Linux Toolbox - {} {}",
env!("BUILD_DATE"),
if self.multi_select {
"[Multi-Select]"
} else {
""
}
)))
.scroll_padding(1);
frame.render_stateful_widget(list, chunks[1], &mut self.selection);

Expand Down Expand Up @@ -329,20 +354,48 @@ impl AppState {
KeyCode::Char('/') => self.enter_search(),
KeyCode::Char('t') => self.theme.next(),
KeyCode::Char('T') => self.theme.prev(),
KeyCode::Char('v') | KeyCode::Char('V') => self.toggle_multi_select(),
KeyCode::Char(' ') if self.multi_select => self.toggle_selection(),
_ => {}
},

_ => (),
};
true
}

fn toggle_multi_select(&mut self) {
if self.is_current_tab_multi_selectable() {
self.multi_select = !self.multi_select;
if !self.multi_select {
self.selected_commands.clear();
}
}
}
fn toggle_selection(&mut self) {
if let Some(command) = self.get_selected_command() {
if self.selected_commands.contains(&command) {
self.selected_commands.retain(|c| c != &command);
} else {
self.selected_commands.push(command);
}
}
}
pub fn is_current_tab_multi_selectable(&self) -> bool {
let index = self.current_tab.selected().unwrap_or(0);
self.tabs
.get(index)
.map_or(false, |tab| tab.multi_selectable)
}
fn update_items(&mut self) {
self.filter.update_items(
&self.tabs,
self.current_tab.selected().unwrap(),
*self.visit_stack.last().unwrap(),
);
if !self.is_current_tab_multi_selectable() {
self.multi_select = false;
self.selected_commands.clear();
}
}

/// Checks either the current tree node is the root node (can we go up the tree or no)
Expand Down Expand Up @@ -471,9 +524,16 @@ impl AppState {
}

fn handle_enter(&mut self) {
if let Some(cmd) = self.get_selected_command() {
let command = RunningCommand::new(cmd);
if self.selected_item_is_cmd() {
// If no commands are selected, run the selected by pushing them into vector
if self.selected_commands.is_empty() {
if let Some(cmd) = self.get_selected_command() {
self.selected_commands.push(cmd);
}
}
let command = RunningCommand::new(self.selected_commands.clone());
self.spawn_float(command, 80, 80);
self.selected_commands.clear();
} else {
self.go_to_selected_dir();
}
Expand Down
7 changes: 7 additions & 0 deletions tui/src/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ impl Theme {
}
}

pub fn multi_select_icon(&self) -> &'static str {
match self {
Theme::Default => "",
Theme::Compatible => "*",
}
}

pub fn success_color(&self) -> Color {
match self {
Theme::Default => Color::Rgb(199, 55, 44),
Expand Down
Loading