diff options
Diffstat (limited to 'src')
36 files changed, 112 insertions, 101 deletions
diff --git a/src/commands/bookmark.rs b/src/commands/bookmark.rs index 23db860..c810d56 100644 --- a/src/commands/bookmark.rs +++ b/src/commands/bookmark.rs @@ -2,9 +2,9 @@ use std::fs::File; use std::io::Write; use std::path; +use ratatui::layout::Rect; +use ratatui::widgets::Clear; use termion::event::Event; -use tui::layout::Rect; -use tui::widgets::Clear; use crate::config::{search_directories, BookmarkRaw, BookmarksRaw}; use crate::context::AppContext; diff --git a/src/commands/command_line.rs b/src/commands/command_line.rs index 608e5dd..5a311b9 100644 --- a/src/commands/command_line.rs +++ b/src/commands/command_line.rs @@ -24,7 +24,7 @@ pub fn read_and_execute( if let Some(s) = user_input { let trimmed = s.trim_start(); - context.commandline_context_mut().history_mut().add(trimmed); + let _ = context.commandline_context_mut().history_mut().add(trimmed); let command = Command::from_str(trimmed)?; command.execute(context, backend, keymap_t) } else { diff --git a/src/config/general/display_raw.rs b/src/config/general/display_raw.rs index 295d30f..a340305 100644 --- a/src/config/general/display_raw.rs +++ b/src/config/general/display_raw.rs @@ -1,7 +1,7 @@ use std::convert::From; +use ratatui::layout::Constraint; use serde_derive::Deserialize; -use tui::layout::Constraint; use crate::config::option::{ DisplayMode, DisplayOption, LineMode, LineNumberStyle, TabDisplayOption, diff --git a/src/config/option/display_option.rs b/src/config/option/display_option.rs index eaeb971..24fa89c 100644 --- a/src/config/option/display_option.rs +++ b/src/config/option/display_option.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, path::PathBuf}; -use tui::layout::Constraint; +use ratatui::layout::Constraint; use crate::config::option::LineMode; use crate::config::option::SortOption; diff --git a/src/config/theme/style.rs b/src/config/theme/style.rs index e4ee599..5ae24fd 100644 --- a/src/config/theme/style.rs +++ b/src/config/theme/style.rs @@ -2,7 +2,7 @@ use colors_transform::{Color, Rgb}; use serde_derive::Deserialize; -use tui::style::{self, Style}; +use ratatui::style::{self, Style}; const fn default_color() -> style::Color { style::Color::Reset diff --git a/src/context/app_context.rs b/src/context/app_context.rs index 4f605ce..7971562 100644 --- a/src/context/app_context.rs +++ b/src/context/app_context.rs @@ -56,7 +56,7 @@ impl AppContext { let event_tx = events.event_tx.clone(); let mut commandline_context = CommandLineContext::new(); - commandline_context.history_mut().set_max_len(20); + let _ = commandline_context.history_mut().set_max_len(20); let event_tx_for_fs_notification = event_tx.clone(); let watcher = notify::recommended_watcher(move |res| { diff --git a/src/context/message_queue.rs b/src/context/message_queue.rs index 0208b96..118e254 100644 --- a/src/context/message_queue.rs +++ b/src/context/message_queue.rs @@ -1,6 +1,6 @@ use std::collections::VecDeque; -use tui::style::{Color, Style}; +use ratatui::style::{Color, Style}; pub struct Message { pub content: String, diff --git a/src/context/ui_context.rs b/src/context/ui_context.rs index c5a8006..ff46041 100644 --- a/src/context/ui_context.rs +++ b/src/context/ui_context.rs @@ -1,4 +1,4 @@ -use tui::layout::Rect; +use ratatui::layout::Rect; #[derive(Clone, Debug, PartialEq, Eq)] pub struct UiContext { diff --git a/src/error/error_kind.rs b/src/error/error_kind.rs index a03cd13..7260e2d 100644 --- a/src/error/error_kind.rs +++ b/src/error/error_kind.rs @@ -13,6 +13,8 @@ pub enum JoshutoErrorKind { ParseError, ClipboardError, TomlDeError(toml::de::Error), + + #[cfg(feature = "recycle_bin")] TrashError, Glob, diff --git a/src/error/error_type.rs b/src/error/error_type.rs index 31ffa23..4e2eaad 100644 --- a/src/error/error_type.rs +++ b/src/error/error_type.rs @@ -56,6 +56,7 @@ impl From<std::env::VarError> for JoshutoError { } } +#[cfg(feature = "recycle_bin")] impl From<trash::Error> for JoshutoError { fn from(err: trash::Error) -> Self { let cause = err.to_string(); diff --git a/src/event/process_event.rs b/src/event/process_event.rs index c207740..f215d9a 100644 --- a/src/event/process_event.rs +++ b/src/event/process_event.rs @@ -2,9 +2,9 @@ use std::io; use std::path; use notify; +use ratatui::layout::{Constraint, Direction, Layout}; use signal_hook::consts::signal; use termion::event::{Event, Key, MouseButton, MouseEvent}; -use tui::layout::{Constraint, Direction, Layout}; use uuid::Uuid; use crate::commands::{cursor_move, parent_cursor_move, reload}; diff --git a/src/io/io_worker.rs b/src/io/io_worker.rs index 42a3ef5..b8d5113 100644 --- a/src/io/io_worker.rs +++ b/src/io/io_worker.rs @@ -200,11 +200,17 @@ impl IoWorkerThread { total_bytes, total_bytes, ); + #[cfg(feature = "recycle_bin")] if self.options.permanently { remove_files(&self.paths)?; } else { trash_files(&self.paths)?; } + #[cfg(not(feature = "recycle_bin"))] + { + remove_files(&self.paths)?; + } + Ok(progress) } } @@ -323,6 +329,7 @@ pub fn recursive_cut( } } +#[cfg(feature = "recycle_bin")] fn trash_error_to_io_error(err: trash::Error) -> std::io::Error { match err { trash::Error::Unknown { description } => { @@ -351,6 +358,7 @@ where Ok(()) } +#[cfg(feature = "recycle_bin")] fn trash_files<P>(paths: &[P]) -> std::io::Result<()> where P: AsRef<path::Path>, diff --git a/src/preview/preview_file.rs b/src/preview/preview_file.rs index d115480..96fccb3 100644 --- a/src/preview/preview_file.rs +++ b/src/preview/preview_file.rs @@ -3,7 +3,7 @@ use std::process::{Command, Output}; use std::thread; use std::time; -use tui::layout::Rect; +use ratatui::layout::Rect; use crate::context::AppContext; use crate::event::AppEvent; @@ -13,8 +13,8 @@ use crate::ui::views::TuiView; use uuid::Uuid; +use ratatui::layout::Rect; use termion::event::Event; -use tui::layout::Rect; pub fn run_loop( backend: &mut ui::AppBackend, diff --git a/src/ui/backend.rs b/src/ui/backend.rs index e67b5e9..b5b9833 100644 --- a/src/ui/backend.rs +++ b/src/ui/backend.rs @@ -1,10 +1,10 @@ use std::io::{self, stdout, Write}; +use ratatui::backend::TermionBackend; +use ratatui::widgets::Widget; use termion::raw::{IntoRawMode, RawTerminal}; use termion::screen::AlternateScreen; use termion::screen::IntoAlternateScreen; -use tui::backend::TermionBackend; -use tui::widgets::Widget; #[cfg(feature = "mouse")] use termion::input::MouseTerminal; @@ -37,7 +37,7 @@ impl New for Screen { } // pub type TuiBackend = TermionBackend<Screen>; -pub type TuiTerminal = tui::Terminal<TermionBackend<Screen>>; +pub type TuiTerminal = ratatui::Terminal<TermionBackend<Screen>>; pub struct AppBackend { pub terminal: Option<TuiTerminal>, @@ -50,7 +50,7 @@ impl AppBackend { write!(alt_screen, "{}", termion::clear::All)?; let backend = TermionBackend::new(alt_screen); - let mut terminal = tui::Terminal::new(backend)?; + let mut terminal = ratatui::Terminal::new(backend)?; terminal.hide_cursor()?; Ok(Self { terminal: Some(terminal), diff --git a/src/ui/views/tui_command_menu.rs b/src/ui/views/tui_command_menu.rs index 1d0b04b..e1b8aa4 100644 --- a/src/ui/views/tui_command_menu.rs +++ b/src/ui/views/tui_command_menu.rs @@ -1,8 +1,8 @@ use std::iter::Iterator; -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::widgets::{Clear, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::widgets::{Clear, Widget}; use crate::config::KeyMapping; use crate::context::AppContext; diff --git a/src/ui/views/tui_folder_view.rs b/src/ui/views/tui_folder_view.rs index 199acf4..2a6204b 100644 --- a/src/ui/views/tui_folder_view.rs +++ b/src/ui/views/tui_folder_view.rs @@ -1,9 +1,9 @@ -use tui::buffer::Buffer; -use tui::layout::{Constraint, Direction, Layout, Rect}; -use tui::style::{Color, Style}; -use tui::symbols::line::{HORIZONTAL_DOWN, HORIZONTAL_UP}; -use tui::text::Span; -use tui::widgets::{Block, Borders, Paragraph, Widget, Wrap}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Constraint, Direction, Layout, Rect}; +use ratatui::style::{Color, Style}; +use ratatui::symbols::line::{HORIZONTAL_DOWN, HORIZONTAL_UP}; +use ratatui::text::Span; +use ratatui::widgets::{Block, Borders, Paragraph, Widget, Wrap}; use crate::context::AppContext; use crate::preview::preview_dir::PreviewDirState; diff --git a/src/ui/views/tui_hsplit_view.rs b/src/ui/views/tui_hsplit_view.rs index fb98dd7..57614ef 100644 --- a/src/ui/views/tui_hsplit_view.rs +++ b/src/ui/views/tui_hsplit_view.rs @@ -1,8 +1,8 @@ -use tui::buffer::Buffer; -use tui::layout::{Constraint, Direction, Layout, Rect}; -use tui::style::{Color, Style}; -use tui::text::Span; -use tui::widgets::{Block, Borders, Paragraph, Widget, Wrap}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Constraint, Direction, Layout, Rect}; +use ratatui::style::{Color, Style}; +use ratatui::text::Span; +use ratatui::widgets::{Block, Borders, Paragraph, Widget, Wrap}; use crate::context::AppContext; use crate::ui::widgets::{TuiDirListDetailed, TuiFooter, TuiTabBar, TuiTopBar}; diff --git a/src/ui/views/tui_progress_view.rs b/src/ui/views/tui_progress_view.rs index 8c97bfe..59c6c6c 100644 --- a/src/ui/views/tui_progress_view.rs +++ b/src/ui/views/tui_progress_view.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::{Direction, Layout, Rect}; -use tui::style::{Color, Style}; -use tui::widgets::{Paragraph, Text, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Direction, Layout, Rect}; +use ratatui::style::{Color, Style}; +use ratatui::widgets::{Paragraph, Text, Widget}; use super::{TuiDirList, TuiDirListDetailed, TuiFooter, TuiTabBar, TuiTopBar}; use crate::context::AppContext; diff --git a/src/ui/views/tui_textfield.rs b/src/ui/views/tui_textfield.rs index 2bdbd96..1bc38aa 100644 --- a/src/ui/views/tui_textfield.rs +++ b/src/ui/views/tui_textfield.rs @@ -5,9 +5,9 @@ use rustyline::history::SearchDirection; use rustyline::line_buffer::{self, ChangeListener, DeleteListener, Direction, LineBuffer}; use rustyline::{At, Word}; +use ratatui::layout::Rect; +use ratatui::widgets::Clear; use termion::event::{Event, Key}; -use tui::layout::Rect; -use tui::widgets::Clear; use unicode_width::UnicodeWidthStr; use crate::context::AppContext; @@ -23,15 +23,15 @@ use crate::ui::AppBackend; pub struct DummyListener {} impl DeleteListener for DummyListener { - fn delete(&mut self, idx: usize, string: &str, dir: Direction) {} + fn delete(&mut self, _idx: usize, _string: &str, _dir: Direction) {} } impl ChangeListener for DummyListener { - fn insert_char(&mut self, idx: usize, c: char) {} + fn insert_char(&mut self, _idx: usize, _c: char) {} - fn insert_str(&mut self, idx: usize, string: &str) {} + fn insert_str(&mut self, _idx: usize, _string: &str) {} - fn replace(&mut self, idx: usize, old: &str, new: &str) {} + fn replace(&mut self, _idx: usize, _old: &str, _new: &str) {} } struct CompletionTracker { diff --git a/src/ui/views/tui_view.rs b/src/ui/views/tui_view.rs index d8f2802..83997d5 100644 --- a/src/ui/views/tui_view.rs +++ b/src/ui/views/tui_view.rs @@ -1,6 +1,6 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::widgets::Widget; use crate::config::option::DisplayMode; use crate::context::AppContext; diff --git a/src/ui/views/tui_worker_view.rs b/src/ui/views/tui_worker_view.rs index ace4805..3140d89 100644 --- a/src/ui/views/tui_worker_view.rs +++ b/src/ui/views/tui_worker_view.rs @@ -1,6 +1,6 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::widgets::Widget; use crate::context::AppContext; use crate::ui::widgets::{TuiTopBar, TuiWorker}; diff --git a/src/ui/widgets/tui_dirlist.rs b/src/ui/widgets/tui_dirlist.rs index 54b5727..8d7b35e 100644 --- a/src/ui/widgets/tui_dirlist.rs +++ b/src/ui/widgets/tui_dirlist.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Modifier, Style}; +use ratatui::widgets::Widget; use unicode_width::UnicodeWidthStr; use crate::fs::{JoshutoDirEntry, JoshutoDirList}; diff --git a/src/ui/widgets/tui_dirlist_detailed.rs b/src/ui/widgets/tui_dirlist_detailed.rs index 20124b5..3373134 100644 --- a/src/ui/widgets/tui_dirlist_detailed.rs +++ b/src/ui/widgets/tui_dirlist_detailed.rs @@ -1,9 +1,9 @@ use std::cmp::{min, Ordering}; -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Modifier, Style}; +use ratatui::widgets::Widget; use crate::config::option::{DisplayOption, LineMode, LineNumberStyle, TabDisplayOption}; use crate::fs::{FileType, JoshutoDirEntry, JoshutoDirList, LinkType}; diff --git a/src/ui/widgets/tui_dirlist_loading.rs b/src/ui/widgets/tui_dirlist_loading.rs index ef6730d..2e84596 100644 --- a/src/ui/widgets/tui_dirlist_loading.rs +++ b/src/ui/widgets/tui_dirlist_loading.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Style}; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Style}; +use ratatui::widgets::Widget; pub struct TuiDirListLoading; diff --git a/src/ui/widgets/tui_file_preview.rs b/src/ui/widgets/tui_file_preview.rs index beeda00..f7a82d7 100644 --- a/src/ui/widgets/tui_file_preview.rs +++ b/src/ui/widgets/tui_file_preview.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::text::Span; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::text::Span; +use ratatui::widgets::Widget; use crate::preview::preview_file::FilePreview; diff --git a/src/ui/widgets/tui_footer.rs b/src/ui/widgets/tui_footer.rs index d841a21..adfe90d 100644 --- a/src/ui/widgets/tui_footer.rs +++ b/src/ui/widgets/tui_footer.rs @@ -1,8 +1,8 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Style}; -use tui::text::{Line, Span}; -use tui::widgets::{Paragraph, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Style}; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, Widget}; use crate::config::option::TabDisplayOption; use crate::fs::{JoshutoDirList, LinkType}; diff --git a/src/ui/widgets/tui_help.rs b/src/ui/widgets/tui_help.rs index 681b42d..5e62240 100644 --- a/src/ui/widgets/tui_help.rs +++ b/src/ui/widgets/tui_help.rs @@ -2,10 +2,10 @@ use lazy_static::lazy_static; use termion::event::{Event, Key}; -use tui::buffer::Buffer; -use tui::layout::{Constraint, Rect}; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::{Cell, Row, Table, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Constraint, Rect}; +use ratatui::style::{Color, Modifier, Style}; +use ratatui::widgets::{Cell, Row, Table, Widget}; use crate::config::KeyMapping; use crate::key_command::traits::CommandComment; diff --git a/src/ui/widgets/tui_menu.rs b/src/ui/widgets/tui_menu.rs index 0cee287..c4f3466 100644 --- a/src/ui/widgets/tui_menu.rs +++ b/src/ui/widgets/tui_menu.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Style}; -use tui::widgets::{Block, Borders, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Style}; +use ratatui::widgets::{Block, Borders, Widget}; pub struct TuiMenu<'a> { options: &'a [&'a str], diff --git a/src/ui/widgets/tui_message.rs b/src/ui/widgets/tui_message.rs index d4d245c..6ad891d 100644 --- a/src/ui/widgets/tui_message.rs +++ b/src/ui/widgets/tui_message.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::Style; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::Style; +use ratatui::widgets::Widget; pub struct TuiMessage<'a> { message: &'a str, diff --git a/src/ui/widgets/tui_prompt.rs b/src/ui/widgets/tui_prompt.rs index 9ee2573..739ef89 100644 --- a/src/ui/widgets/tui_prompt.rs +++ b/src/ui/widgets/tui_prompt.rs @@ -1,8 +1,8 @@ +use ratatui::layout::Rect; +use ratatui::style::{Color, Style}; +use ratatui::text::Span; +use ratatui::widgets::{Clear, Paragraph, Wrap}; use termion::event::{Event, Key}; -use tui::layout::Rect; -use tui::style::{Color, Style}; -use tui::text::Span; -use tui::widgets::{Clear, Paragraph, Wrap}; use crate::context::AppContext; use crate::event::process_event; diff --git a/src/ui/widgets/tui_tab.rs b/src/ui/widgets/tui_tab.rs index 35f6630..f724b86 100644 --- a/src/ui/widgets/tui_tab.rs +++ b/src/ui/widgets/tui_tab.rs @@ -1,9 +1,9 @@ use std::ffi::OsStr; -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::text::{Line, Span}; -use tui::widgets::{Paragraph, Widget, Wrap}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, Widget, Wrap}; use crate::context::TabContext; use crate::THEME_T; diff --git a/src/ui/widgets/tui_text.rs b/src/ui/widgets/tui_text.rs index 1a1064c..b767dd4 100644 --- a/src/ui/widgets/tui_text.rs +++ b/src/ui/widgets/tui_text.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Style}; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Style}; +use ratatui::widgets::Widget; use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; #[derive(Clone, Debug)] diff --git a/src/ui/widgets/tui_topbar.rs b/src/ui/widgets/tui_topbar.rs index d98fd31..700f318 100644 --- a/src/ui/widgets/tui_topbar.rs +++ b/src/ui/widgets/tui_topbar.rs @@ -1,11 +1,11 @@ use std::path::Component; use std::path::Path; -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Modifier, Style}; -use tui::text::{Line, Span}; -use tui::widgets::{Paragraph, Widget}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Modifier, Style}; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, Widget}; use unicode_width::UnicodeWidthStr; diff --git a/src/ui/widgets/tui_worker.rs b/src/ui/widgets/tui_worker.rs index 3d06131..3018ad1 100644 --- a/src/ui/widgets/tui_worker.rs +++ b/src/ui/widgets/tui_worker.rs @@ -1,7 +1,7 @@ -use tui::buffer::Buffer; -use tui::layout::Rect; -use tui::style::{Color, Modifier, Style}; -use tui::widgets::Widget; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; +use ratatui::style::{Color, Modifier, Style}; +use ratatui::widgets::Widget; use crate::context::WorkerContext; use crate::io::{FileOperationProgress, IoWorkerObserver}; diff --git a/src/util/style.rs b/src/util/style.rs index e2db2f3..2f87a9b 100644 --- a/src/util/style.rs +++ b/src/util/style.rs @@ -1,4 +1,4 @@ -use tui::style::Style; +use ratatui::style::Style; use crate::fs::{FileType, JoshutoDirEntry, LinkType}; use crate::util::unix; |