From 1a21753831df877caef635f41ac14f54dbd8e75a Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Fri, 20 Sep 2024 17:48:09 +0200 Subject: [PATCH] Moved tips to a feature (#566) --- .github/workflows/linutil.yml | 4 ++-- tui/Cargo.toml | 6 +++++- tui/src/state.rs | 11 ++++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linutil.yml b/.github/workflows/linutil.yml index 94126f64..423d35b1 100644 --- a/.github/workflows/linutil.yml +++ b/.github/workflows/linutil.yml @@ -42,10 +42,10 @@ jobs: run: cargo install cross - name: Build x86_64 binary - run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl + run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl --all-features - name: Build aarch64 binary - run: cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl + run: cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl --all-features - name: Move binaries to build directory run: | diff --git a/tui/Cargo.toml b/tui/Cargo.toml index 6929f00e..b6e57edc 100644 --- a/tui/Cargo.toml +++ b/tui/Cargo.toml @@ -15,6 +15,10 @@ include = [ ] build = "build.rs" +[features] +default = ["tips"] +tips = [] + [dependencies] clap = { version = "4.5.16", features = ["derive"] } crossterm = "0.28.1" @@ -32,4 +36,4 @@ chrono = "0.4.33" [[bin]] name = "linutil" -path = "src/main.rs" \ No newline at end of file +path = "src/main.rs" diff --git a/tui/src/state.rs b/tui/src/state.rs index 9642f884..2a829747 100644 --- a/tui/src/state.rs +++ b/tui/src/state.rs @@ -9,6 +9,7 @@ use crate::{ use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use ego_tree::NodeId; use linutil_core::{Command, ListNode, Tab}; +#[cfg(feature = "tips")] use rand::Rng; use ratatui::{ layout::{Alignment, Constraint, Direction, Layout}, @@ -40,6 +41,7 @@ pub struct AppState { multi_select: bool, selected_commands: Vec, drawable: bool, + #[cfg(feature = "tips")] tip: &'static str, } @@ -71,6 +73,7 @@ impl AppState { multi_select: false, selected_commands: Vec::new(), drawable: false, + #[cfg(feature = "tips")] tip: get_random_line(include_str!("../cool_tips.txt").lines().collect()), }; state.update_items(); @@ -246,6 +249,11 @@ impl AppState { self.multi_select.then(|| "[Multi-Select]").unwrap_or("") ); + #[cfg(feature = "tips")] + let bottom_title = Line::from(self.tip.bold().blue()).right_aligned(); + #[cfg(not(feature = "tips"))] + let bottom_title = ""; + // Create the list widget with items let list = List::new(items) .highlight_style(style) @@ -253,7 +261,7 @@ impl AppState { Block::default() .borders(Borders::ALL) .title(title) - .title_bottom(Line::from(self.tip.bold().blue()).right_aligned()), + .title_bottom(bottom_title), ) .scroll_padding(1); frame.render_stateful_widget(list, chunks[1], &mut self.selection); @@ -534,6 +542,7 @@ impl AppState { } } +#[cfg(feature = "tips")] fn get_random_line(lines: Vec<&str>) -> &str { if lines.is_empty() { return "";