mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-24 14:11:55 +00:00
implement word wrapping functionality (#755)
* implement dynamic auto updating word wrapping functionality * run fmt * remove dupe space * run fmt * add remove comments back * fix compilation errors * run fmt * run docgen * run docgen * fix conflicts * run cargo xtask docgen * use boolean rather than enum --------- Co-authored-by: nyx <nnyyxxxx@users.noreply.github.com>
This commit is contained in:
nyx
GitHub
parent
88d6fd12a2
commit
565f507190
24
Cargo.lock
generated
24
Cargo.lock
generated
|
|
@ -443,6 +443,7 @@ dependencies = [
|
|||
"rand",
|
||||
"ratatui",
|
||||
"temp-dir",
|
||||
"textwrap",
|
||||
"tree-sitter-bash",
|
||||
"tree-sitter-highlight",
|
||||
"tui-term",
|
||||
|
|
@ -889,6 +890,12 @@ version = "1.13.2"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
|
||||
|
||||
[[package]]
|
||||
name = "smawk"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
|
||||
|
||||
[[package]]
|
||||
name = "static_assertions"
|
||||
version = "1.1.0"
|
||||
|
|
@ -955,6 +962,17 @@ dependencies = [
|
|||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "textwrap"
|
||||
version = "0.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
|
||||
dependencies = [
|
||||
"smawk",
|
||||
"unicode-linebreak",
|
||||
"unicode-width 0.1.14",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.64"
|
||||
|
|
@ -1067,6 +1085,12 @@ version = "1.0.13"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-linebreak"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
version = "1.11.0"
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ task_list = "FI"
|
|||
|
||||
[[data]]
|
||||
name = "Alacritty"
|
||||
description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.\nThis command installs and condifures alacritty terminal emulator."
|
||||
description = "Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows. This command installs and configures alacritty terminal emulator."
|
||||
script = "alacritty-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
||||
|
|
@ -212,13 +212,13 @@ task_list = "I"
|
|||
|
||||
[[data]]
|
||||
name = "Bash Prompt"
|
||||
description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems.\nIt is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful.\nThis command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
|
||||
description = "The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
|
||||
script = "mybash-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
||||
[[data]]
|
||||
name = "Bottles"
|
||||
description = "Bottles allows Windows software, like applications and games, to run on Linux.\nBottles also provides tools to categorize, organize and optimize your applications."
|
||||
description = "Bottles allows Windows software, like applications and games, to run on Linux. Bottles also provides tools to categorize, organize and optimize your applications."
|
||||
script = "bottles-setup.sh"
|
||||
task_list = "FI"
|
||||
|
||||
|
|
@ -236,13 +236,13 @@ task_list = "I PFM SS"
|
|||
|
||||
[[data]]
|
||||
name = "Fastfetch"
|
||||
description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.\nIt is written mainly in C, with performance and customizability in mind.\nThis command installs fastfetch and configures from CTT's mybash repository.\nhttps://github.com/ChrisTitusTech/mybash"
|
||||
description = "Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. This command installs fastfetch and configures from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash"
|
||||
script = "fastfetch-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
||||
[[data]]
|
||||
name = "Flatpak / Flathub"
|
||||
description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.\nThis command installs Flatpak and adds the Flathub repository"
|
||||
description = "Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns. This command installs Flatpak and adds the Flathub repository"
|
||||
script = "setup-flatpak.sh"
|
||||
task_list = "I"
|
||||
|
||||
|
|
@ -254,7 +254,7 @@ task_list = "PFM"
|
|||
|
||||
[[data]]
|
||||
name = "Kitty"
|
||||
description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.\nkitty is written in a mix of C and Python programming languages.\n This command installs and configures kitty."
|
||||
description = "kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features. kitty is written in a mix of C and Python programming languages. This command installs and configures kitty."
|
||||
script = "kitty-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
||||
|
|
@ -282,7 +282,7 @@ values = [ "linutil" ]
|
|||
|
||||
[[data]]
|
||||
name = "Rofi"
|
||||
description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport.\nThis command installs and configures rofi with configuration from CTT's DWM repo.\nhttps://github.com/ChrisTitusTech/dwm-titus"
|
||||
description = "Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport. This command installs and configures rofi with configuration from CTT's DWM repo. https://github.com/ChrisTitusTech/dwm-titus"
|
||||
script = "rofi-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
||||
|
|
@ -298,6 +298,6 @@ values = [ "wayland", "Wayland" ]
|
|||
|
||||
[[data]]
|
||||
name = "ZSH Prompt"
|
||||
description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.\nThis command installs ZSH prompt and provides basic configuration."
|
||||
description = "The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh. This command installs ZSH prompt and provides basic configuration."
|
||||
script = "zsh-setup.sh"
|
||||
task_list = "I FM"
|
||||
|
|
@ -5,6 +5,6 @@ name = "Diablo II Resurrected"
|
|||
|
||||
[[data.entries]]
|
||||
name = "Loot Filter"
|
||||
description = "This is a loot filter for Diablo II Resurrected.\nIt's designed to be a simple, clean, and easy to read loot filter that highlights the most important items.\nWorks on battle.net and single player.\nNo frills, no config, just highlights high runes and other valuable items.\nFor more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
|
||||
description = "This is a loot filter for Diablo II Resurrected. It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items. Works on battle.net and single player. No frills, no config, just highlights high runes and other valuable items. For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter"
|
||||
script = "diablo-ii/d2r-loot-filters.sh"
|
||||
task_list = "FM"
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ name = "Security"
|
|||
|
||||
[[data]]
|
||||
name = "Firewall Baselines (CTT)"
|
||||
description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall.\nThis command installs UFW and configures UFW based on CTT's recommended rules.\nFor more information visit: https://christitus.com/linux-security-mistakes"
|
||||
description = "Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall. This command installs UFW and configures UFW based on CTT's recommended rules. For more information visit: https://christitus.com/linux-security-mistakes"
|
||||
script = "firewall-baselines.sh"
|
||||
task_list = "I SS"
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ multi_select = false
|
|||
|
||||
[[data.entries]]
|
||||
name = "Paru AUR Helper"
|
||||
description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
|
||||
description = "Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
|
||||
script = "arch/paru-setup.sh"
|
||||
task_list = "I"
|
||||
|
||||
[[data.entries]]
|
||||
name = "Yay AUR Helper"
|
||||
description = "Yet Another Yogurt - An AUR Helper Written in Go.\nTo know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
|
||||
description = "Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers"
|
||||
script = "arch/yay-setup.sh"
|
||||
task_list = "I"
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ task_list = "I"
|
|||
|
||||
[[data.entries]]
|
||||
name = "RPM Fusion"
|
||||
description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship.\nThat software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit.\nFor more information visit: https://rpmfusion.org/"
|
||||
description = "RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship. That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit. For more information visit: https://rpmfusion.org/"
|
||||
script = "fedora/rpm-fusion-setup.sh"
|
||||
task_list = "MP"
|
||||
|
||||
|
|
|
|||
|
|
@ -45,15 +45,10 @@ https://github.com/ChrisTitusTech/neovim
|
|||
- **Thorium**: Thorium is a Chromium-based browser focused on privacy and performance.
|
||||
- **Vivaldi**: Vivaldi is a freeware, cross-platform web browser developed by Vivaldi Technologies.
|
||||
- **waterfox**: Waterfox is the privacy-focused web browser engineered to give you speed, control, and peace of mind on the internet.
|
||||
- **Alacritty**: Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows.
|
||||
This command installs and condifures alacritty terminal emulator.
|
||||
- **Alacritty**: Alacritty is a modern terminal emulator that comes with sensible defaults, but allows for extensive configuration. By integrating with other applications, rather than reimplementing their functionality, it manages to provide a flexible set of features with high performance. The supported platforms currently consist of BSD, Linux, macOS and Windows. This command installs and configures alacritty terminal emulator.
|
||||
- **Android Debloater**: Universal Android Debloater (UAD) is a tool designed to help users remove bloatware and unnecessary pre-installed applications from Android devices, enhancing performance and user experience.
|
||||
- **Bash Prompt**: The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems.
|
||||
It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful.
|
||||
This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository.
|
||||
https://github.com/ChrisTitusTech/mybash
|
||||
- **Bottles**: Bottles allows Windows software, like applications and games, to run on Linux.
|
||||
Bottles also provides tools to categorize, organize and optimize your applications.
|
||||
- **Bash Prompt**: The .bashrc file is a script that runs every time a new terminal session is started in Unix-like operating systems. It is used to configure the shell session, set up aliases, define functions, and more, making the terminal easier to use and more powerful. This command configures the key sections and functionalities defined in the .bashrc file from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash
|
||||
- **Bottles**: Bottles allows Windows software, like applications and games, to run on Linux. Bottles also provides tools to categorize, organize and optimize your applications.
|
||||
- **Docker**: Docker is an open platform that uses OS-level virtualization to deliver software in packages called containers.
|
||||
- **DWM-Titus**: DWM is a dynamic window manager for X.
|
||||
It manages windows in tiled, monocle and floating layouts.
|
||||
|
|
@ -61,41 +56,26 @@ All of the layouts can be applied dynamically, optimising the environment for th
|
|||
This command installs and configures DWM and a desktop manager.
|
||||
The list of patches applied can be found in CTT's DWM repository
|
||||
https://github.com/ChrisTitusTech/dwm-titus
|
||||
- **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily.
|
||||
It is written mainly in C, with performance and customizability in mind.
|
||||
This command installs fastfetch and configures from CTT's mybash repository.
|
||||
https://github.com/ChrisTitusTech/mybash
|
||||
- **Flatpak / Flathub**: Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns.
|
||||
This command installs Flatpak and adds the Flathub repository
|
||||
- **Fastfetch**: Fastfetch is a neofetch-like tool for fetching system information and displaying it prettily. It is written mainly in C, with performance and customizability in mind. This command installs fastfetch and configures from CTT's mybash repository. https://github.com/ChrisTitusTech/mybash
|
||||
- **Flatpak / Flathub**: Flatpak is a universal application sandbox for Linux that uses isolated packages from Flathub to prevent conflicts and system alterations, while alleviating dependency concerns. This command installs Flatpak and adds the Flathub repository
|
||||
- **Grub Theme**: Installs ChrisTitusTech's Top 5 Bootloader Themes script to allow for easy customization of GRUB.
|
||||
- **Kitty**: kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features.
|
||||
kitty is written in a mix of C and Python programming languages.
|
||||
This command installs and configures kitty.
|
||||
- **Kitty**: kitty is a free and open-source GPU-accelerated terminal emulator for Linux, macOS, and some BSD distributions, focused on performance and features. kitty is written in a mix of C and Python programming languages. This command installs and configures kitty.
|
||||
- **Linutil Installer**: Installs a distro-specific Linutil package locally.
|
||||
- **Linutil Updater**: Updates your local Linutil crate installation.
|
||||
- **Rofi**: Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport.
|
||||
This command installs and configures rofi with configuration from CTT's DWM repo.
|
||||
https://github.com/ChrisTitusTech/dwm-titus
|
||||
- **Rofi**: Rofi is a window switcher, run dialog, ssh-launcher and dmenu replacement that started as a clone of simpleswitcher, written by Sean Pringle and later expanded by Dave Davenport. This command installs and configures rofi with configuration from CTT's DWM repo. https://github.com/ChrisTitusTech/dwm-titus
|
||||
- **Waydroid**: Waydroid is an emulator that allows you to run Android apps and games on Linux.
|
||||
- **ZSH Prompt**: The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.
|
||||
This command installs ZSH prompt and provides basic configuration.
|
||||
- **ZSH Prompt**: The Z shell is a Unix shell that can be used as an interactive login shell and as a command interpreter for shell scripting. Zsh is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh. This command installs ZSH prompt and provides basic configuration.
|
||||
|
||||
## Gaming
|
||||
|
||||
|
||||
### Diablo II Resurrected
|
||||
|
||||
- **Loot Filter**: This is a loot filter for Diablo II Resurrected.
|
||||
It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items.
|
||||
Works on battle.net and single player.
|
||||
No frills, no config, just highlights high runes and other valuable items.
|
||||
For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter
|
||||
- **Loot Filter**: This is a loot filter for Diablo II Resurrected. It's designed to be a simple, clean, and easy to read loot filter that highlights the most important items. Works on battle.net and single player. No frills, no config, just highlights high runes and other valuable items. For more information visit: https://github.com/ChrisTitusTech/d2r-loot-filter
|
||||
|
||||
## Security
|
||||
|
||||
- **Firewall Baselines (CTT)**: Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall.
|
||||
This command installs UFW and configures UFW based on CTT's recommended rules.
|
||||
For more information visit: https://christitus.com/linux-security-mistakes
|
||||
- **Firewall Baselines (CTT)**: Developed to ease iptables firewall configuration, UFW provides a user friendly way to create an IPv4 or IPv6 host-based firewall. This command installs UFW and configures UFW based on CTT's recommended rules. For more information visit: https://christitus.com/linux-security-mistakes
|
||||
|
||||
## System Setup
|
||||
|
||||
|
|
@ -103,19 +83,15 @@ For more information visit: https://christitus.com/linux-security-mistakes
|
|||
### Arch Linux
|
||||
|
||||
- **Arch Server Setup**: This command installs a minimal arch server setup under 5 minutes.
|
||||
- **Paru AUR Helper**: Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction.
|
||||
To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
|
||||
- **Yay AUR Helper**: Yet Another Yogurt - An AUR Helper Written in Go.
|
||||
To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
|
||||
- **Paru AUR Helper**: Paru is your standard pacman wrapping AUR helper with lots of features and minimal interaction. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
|
||||
- **Yay AUR Helper**: Yet Another Yogurt - An AUR Helper Written in Go. To know more about AUR helpers visit: https://wiki.archlinux.org/title/AUR_helpers
|
||||
|
||||
### Fedora
|
||||
|
||||
- **Configure DNF**: Optimizes DNF for parallel downloads
|
||||
- **Multimedia Codecs**: This script is designed to install multimedia codecs, and to ensure RPM Fusion repositories are installed.
|
||||
- **Nvidia Proprietary Drivers**: This script is designed to download the proprietary NVIDIA drivers in Fedora.
|
||||
- **RPM Fusion**: RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship.
|
||||
That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit.
|
||||
For more information visit: https://rpmfusion.org/
|
||||
- **RPM Fusion**: RPM Fusion provides software that the Fedora Project or Red Hat doesn't want to ship. That software is provided as precompiled RPMs for all current Fedora versions and current Red Hat Enterprise Linux or clones versions; you can use the RPM Fusion repositories with tools like yum and PackageKit. For more information visit: https://rpmfusion.org/
|
||||
- **Upgrade to a New Fedora Release**: Upgrades system to the next Fedora release
|
||||
- **Virtualization**: Enables Virtualization through dnf
|
||||
- **Build Prerequisites**: This script is designed to handle the installation of various software dependencies across different Linux distributions
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ rand = { version = "0.8.5", optional = true }
|
|||
linutil_core = { path = "../core", version = "24.9.28" }
|
||||
tree-sitter-highlight = "0.24.3"
|
||||
tree-sitter-bash = "0.23.1"
|
||||
textwrap = "0.16.1"
|
||||
anstyle = "1.0.8"
|
||||
ansi-to-tui = "7.0.0"
|
||||
zips = "0.1.7"
|
||||
|
|
|
|||
|
|
@ -20,16 +20,19 @@ use ratatui::{
|
|||
|
||||
use ansi_to_tui::IntoText;
|
||||
|
||||
use textwrap::wrap;
|
||||
use tree_sitter_bash as hl_bash;
|
||||
use tree_sitter_highlight::{self as hl, HighlightEvent};
|
||||
use zips::zip_result;
|
||||
|
||||
pub struct FloatingText {
|
||||
pub src: Vec<String>,
|
||||
pub src: String,
|
||||
wrapped_lines: Vec<String>,
|
||||
max_line_width: usize,
|
||||
v_scroll: usize,
|
||||
h_scroll: usize,
|
||||
mode_title: String,
|
||||
wrap_words: bool,
|
||||
frame_height: usize,
|
||||
}
|
||||
|
||||
|
|
@ -108,12 +111,6 @@ fn get_highlighted_string(s: &str) -> Option<String> {
|
|||
Some(output)
|
||||
}
|
||||
|
||||
macro_rules! max_width {
|
||||
($($lines:tt)+) => {{
|
||||
$($lines)+.iter().fold(0, |accum, val| accum.max(val.len()))
|
||||
}}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn get_lines(s: &str) -> Vec<&str> {
|
||||
s.lines().collect::<Vec<_>>()
|
||||
|
|
@ -125,50 +122,49 @@ fn get_lines_owned(s: &str) -> Vec<String> {
|
|||
}
|
||||
|
||||
impl FloatingText {
|
||||
pub fn new(text: String, title: &str) -> Self {
|
||||
let src = get_lines(&text)
|
||||
pub fn new(text: String, title: &str, wrap_words: bool) -> Self {
|
||||
let max_line_width = 80;
|
||||
let wrapped_lines = if wrap_words {
|
||||
wrap(&text, max_line_width)
|
||||
.into_iter()
|
||||
.map(|s| s.to_string())
|
||||
.collect::<Vec<_>>();
|
||||
.map(|cow| cow.into_owned())
|
||||
.collect()
|
||||
} else {
|
||||
get_lines_owned(&text)
|
||||
};
|
||||
|
||||
let max_line_width = max_width!(src);
|
||||
Self {
|
||||
src,
|
||||
src: text,
|
||||
wrapped_lines,
|
||||
mode_title: title.to_string(),
|
||||
max_line_width,
|
||||
v_scroll: 0,
|
||||
h_scroll: 0,
|
||||
wrap_words,
|
||||
frame_height: 0,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn from_command(command: &Command, title: String) -> Option<Self> {
|
||||
let (max_line_width, src) = match command {
|
||||
Command::Raw(cmd) => {
|
||||
// just apply highlights directly
|
||||
(max_width!(get_lines(cmd)), Some(cmd.clone()))
|
||||
}
|
||||
Command::LocalFile { file, .. } => {
|
||||
// have to read from tmp dir to get cmd src
|
||||
let raw = std::fs::read_to_string(file)
|
||||
let src = match command {
|
||||
Command::Raw(cmd) => Some(cmd.clone()),
|
||||
Command::LocalFile { file, .. } => std::fs::read_to_string(file)
|
||||
.map_err(|_| format!("File not found: {:?}", file))
|
||||
.unwrap();
|
||||
.ok(),
|
||||
Command::None => None,
|
||||
}?;
|
||||
|
||||
(max_width!(get_lines(&raw)), Some(raw))
|
||||
}
|
||||
|
||||
// If command is a folder, we don't display a preview
|
||||
Command::None => (0usize, None),
|
||||
};
|
||||
|
||||
let src = get_lines_owned(&get_highlighted_string(&src?)?);
|
||||
let max_line_width = 80;
|
||||
let wrapped_lines = get_lines_owned(&get_highlighted_string(&src)?);
|
||||
|
||||
Some(Self {
|
||||
src,
|
||||
wrapped_lines,
|
||||
mode_title: title,
|
||||
max_line_width,
|
||||
h_scroll: 0,
|
||||
v_scroll: 0,
|
||||
wrap_words: false,
|
||||
frame_height: 0,
|
||||
})
|
||||
}
|
||||
|
|
@ -197,6 +193,20 @@ impl FloatingText {
|
|||
self.h_scroll += 1;
|
||||
}
|
||||
}
|
||||
|
||||
fn update_wrapping(&mut self, width: usize) {
|
||||
if self.max_line_width != width {
|
||||
self.max_line_width = width;
|
||||
self.wrapped_lines = if self.wrap_words {
|
||||
wrap(&self.src, width)
|
||||
.into_iter()
|
||||
.map(|cow| cow.into_owned())
|
||||
.collect()
|
||||
} else {
|
||||
get_lines_owned(&get_highlighted_string(&self.src).unwrap_or(self.src.clone()))
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl FloatContent for FloatingText {
|
||||
|
|
@ -217,13 +227,22 @@ impl FloatContent for FloatingText {
|
|||
|
||||
// Calculate the inner area to ensure text is not drawn over the border
|
||||
let inner_area = block.inner(area);
|
||||
let Rect { height, .. } = inner_area;
|
||||
let Rect { width, height, .. } = inner_area;
|
||||
|
||||
self.update_wrapping(width as usize);
|
||||
|
||||
let lines = self
|
||||
.src
|
||||
.wrapped_lines
|
||||
.iter()
|
||||
.skip(self.v_scroll)
|
||||
.take(height as usize)
|
||||
.flat_map(|l| l.into_text().unwrap())
|
||||
.flat_map(|l| {
|
||||
if self.wrap_words {
|
||||
vec![Line::raw(l.clone())]
|
||||
} else {
|
||||
l.into_text().unwrap().lines
|
||||
}
|
||||
})
|
||||
.map(|line| {
|
||||
let mut skipped = 0;
|
||||
let mut spans = line
|
||||
|
|
|
|||
|
|
@ -718,7 +718,8 @@ impl AppState {
|
|||
fn enable_description(&mut self) {
|
||||
if let Some(command_description) = self.get_selected_description() {
|
||||
if !command_description.is_empty() {
|
||||
let description = FloatingText::new(command_description, "Command Description");
|
||||
let description =
|
||||
FloatingText::new(command_description, "Command Description", true);
|
||||
self.spawn_float(description, 80, 80);
|
||||
}
|
||||
}
|
||||
|
|
@ -804,7 +805,7 @@ impl AppState {
|
|||
|
||||
fn toggle_task_list_guide(&mut self) {
|
||||
self.spawn_float(
|
||||
FloatingText::new(ACTIONS_GUIDE.to_string(), "Important Actions Guide"),
|
||||
FloatingText::new(ACTIONS_GUIDE.to_string(), "Important Actions Guide", true),
|
||||
80,
|
||||
80,
|
||||
);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user