Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions man/linutil.1
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ Possible values:
.br
Defaults to \fIdefault\fR.

.TP
\fB\-y\fR, \fB\-\-skip\-confirmation\fR
Skip confirmation prompt before executing commands.

.TP
\fB\-\-override\-validation\fR
Show all available entries, disregarding compatibility checks. (\fBUNSAFE\fR)
Expand Down
13 changes: 12 additions & 1 deletion tui/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ struct Args {
#[arg(default_value_t = Theme::Default)]
#[arg(help = "Set the theme to use in the application")]
theme: Theme,
#[arg(
short = 'y',
long,
help = "Skip confirmation prompt before executing commands"
)]
skip_confirmation: bool,
#[arg(long, default_value_t = false)]
#[clap(help = "Show all available options, disregarding compatibility checks (UNSAFE)")]
override_validation: bool,
Expand All @@ -45,7 +51,12 @@ struct Args {
fn main() -> io::Result<()> {
let args = Args::parse();

let mut state = AppState::new(args.theme, args.override_validation, args.size_bypass);
let mut state = AppState::new(
args.theme,
args.override_validation,
args.size_bypass,
args.skip_confirmation,
);

stdout().execute(EnterAlternateScreen)?;
enable_raw_mode()?;
Expand Down
29 changes: 20 additions & 9 deletions tui/src/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ pub struct AppState {
#[cfg(feature = "tips")]
tip: String,
size_bypass: bool,
skip_confirmation: bool,
}

pub enum Focus {
Expand All @@ -85,7 +86,12 @@ enum SelectedItem {
}

impl AppState {
pub fn new(theme: Theme, override_validation: bool, size_bypass: bool) -> Self {
pub fn new(
theme: Theme,
override_validation: bool,
size_bypass: bool,
skip_confirmation: bool,
) -> Self {
let tabs = linutil_core::get_tabs(!override_validation);
let root_id = tabs[0].tree.root().id();

Expand All @@ -103,6 +109,7 @@ impl AppState {
#[cfg(feature = "tips")]
tip: get_random_tip(),
size_bypass,
skip_confirmation,
};

state.update_items();
Expand Down Expand Up @@ -756,14 +763,18 @@ impl AppState {
}
}

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));
if self.skip_confirmation {
self.handle_confirm_command();
} else {
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 => {}
}
Expand Down