summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Zhao <jeff.no.zhao@gmail.com>2023-09-07 14:00:52 -0400
committerJeff Zhao <jeff.no.zhao@gmail.com>2023-09-07 14:00:52 -0400
commitcbd0e604a4109595419d3f82d52a13530e7db030 (patch)
tree22a72acc7cec96ac9d0554483283802b3a53097f
parent800a98f6746edde3c95157e233ef7201d830c595 (diff)
cleanup config code
-rw-r--r--.gitignore1
-rw-r--r--Cargo.lock1
-rw-r--r--Cargo.toml3
-rw-r--r--src/commands/bookmark.rs3
-rw-r--r--src/commands/case_sensitivity.rs2
-rw-r--r--src/commands/command_line.rs2
-rw-r--r--src/commands/line_nums.rs2
-rw-r--r--src/commands/linemode.rs2
-rw-r--r--src/commands/numbered_command.rs2
-rw-r--r--src/commands/open_file.rs2
-rw-r--r--src/commands/rename_file.rs2
-rw-r--r--src/commands/search_fzf.rs2
-rw-r--r--src/commands/select.rs28
-rw-r--r--src/commands/show_help.rs2
-rw-r--r--src/commands/show_tasks.rs2
-rw-r--r--src/commands/sort.rs2
-rw-r--r--src/commands/subdir_fzf.rs2
-rw-r--r--src/commands/tab_bar_mode.rs6
-rw-r--r--src/commands/tab_ops.rs2
-rw-r--r--src/config/clean/app/config.rs (renamed from src/config/general/app.rs)34
-rw-r--r--src/config/clean/app/display/config.rs (renamed from src/config/option/display_option.rs)114
-rw-r--r--src/config/clean/app/display/dirlist.rs26
-rw-r--r--src/config/clean/app/display/line_mode.rs (renamed from src/config/option/linemodes.rs)2
-rw-r--r--src/config/clean/app/display/line_number.rs17
-rw-r--r--src/config/clean/app/display/mod.rs10
-rw-r--r--src/config/clean/app/display/new_tab.rs (renamed from src/config/option/new_tab_option.rs)0
-rw-r--r--src/config/clean/app/display/sort.rs (renamed from src/config/option/sort_option.rs)24
-rw-r--r--src/config/clean/app/display/sort_type.rs (renamed from src/config/option/sort_type.rs)5
-rw-r--r--src/config/clean/app/display/tab.rs33
-rw-r--r--src/config/clean/app/mod.rs13
-rw-r--r--src/config/clean/app/preview/config.rs (renamed from src/config/general/preview_raw.rs)31
-rw-r--r--src/config/clean/app/preview/mod.rs3
-rw-r--r--src/config/clean/app/search/config.rs (renamed from src/config/option/search_option.rs)29
-rw-r--r--src/config/clean/app/search/mod.rs3
-rw-r--r--src/config/clean/app/tab/config.rs (renamed from src/config/option/tab_option.rs)11
-rw-r--r--src/config/clean/app/tab/mod.rs3
-rw-r--r--src/config/clean/bookmarks.rs (renamed from src/config/bookmarks/mod.rs)21
-rw-r--r--src/config/clean/icon/config.rs48
-rw-r--r--src/config/clean/icon/mod.rs8
-rw-r--r--src/config/clean/keymap/config.rs (renamed from src/config/keymap/keymapping.rs)25
-rw-r--r--src/config/clean/keymap/mod.rs9
-rw-r--r--src/config/clean/mimetype/config.rs (renamed from src/config/mimetype/registry.rs)20
-rw-r--r--src/config/clean/mimetype/entry.rs (renamed from src/config/mimetype/entry.rs)2
-rw-r--r--src/config/clean/mimetype/list.rs27
-rw-r--r--src/config/clean/mimetype/mod.rs7
-rw-r--r--src/config/clean/mod.rs7
-rw-r--r--src/config/clean/preview/config.rs35
-rw-r--r--src/config/clean/preview/mod.rs3
-rw-r--r--src/config/clean/theme/config.rs79
-rw-r--r--src/config/clean/theme/mod.rs11
-rw-r--r--src/config/clean/theme/style.rs51
-rw-r--r--src/config/clean/theme/tab.rs17
-rw-r--r--src/config/general/app_raw.rs65
-rw-r--r--src/config/general/display_raw.rs137
-rw-r--r--src/config/general/mod.rs16
-rw-r--r--src/config/general/sort_raw.rs51
-rw-r--r--src/config/icons/mod.rs55
-rw-r--r--src/config/keymap/mod.rs9
-rw-r--r--src/config/mod.rs17
-rw-r--r--src/config/option/mod.rs19
-rw-r--r--src/config/option/preview_option.rs24
-rw-r--r--src/config/option/select_option.rs26
-rw-r--r--src/config/preview.rs2
-rw-r--r--src/config/raw/app/config.rs39
-rw-r--r--src/config/raw/app/display/config.rs75
-rw-r--r--src/config/raw/app/display/mod.rs7
-rw-r--r--src/config/raw/app/display/preview.rs28
-rw-r--r--src/config/raw/app/display/search.rs (renamed from src/config/general/search_raw.rs)31
-rw-r--r--src/config/raw/app/display/sort.rs28
-rw-r--r--src/config/raw/app/display/tab.rs (renamed from src/config/general/tab_raw.rs)15
-rw-r--r--src/config/raw/app/mod.rs4
-rw-r--r--src/config/raw/bookmarks.rs (renamed from src/config/bookmarks/bookmarks_raw.rs)2
-rw-r--r--src/config/raw/icon/config.rs (renamed from src/config/icons/icons_raw.rs)2
-rw-r--r--src/config/raw/icon/mod.rs3
-rw-r--r--src/config/raw/keymap/config.rs21
-rw-r--r--src/config/raw/keymap/mod.rs3
-rw-r--r--src/config/raw/mimetype/list.rs (renamed from src/config/mimetype/list.rs)28
-rw-r--r--src/config/raw/mimetype/mod.rs (renamed from src/config/mimetype/mod.rs)2
-rw-r--r--src/config/raw/mimetype/registry.rs19
-rw-r--r--src/config/raw/mod.rs7
-rw-r--r--src/config/raw/preview/config.rs11
-rw-r--r--src/config/raw/preview/mod.rs3
-rw-r--r--src/config/raw/theme/config.rs29
-rw-r--r--src/config/raw/theme/mod.rs5
-rw-r--r--src/config/raw/theme/style.rs (renamed from src/config/theme/style.rs)54
-rw-r--r--src/config/raw/theme/tab.rs11
-rw-r--r--src/config/theme/app_theme.rs123
-rw-r--r--src/config/theme/mod.rs11
-rw-r--r--src/context/app_context.rs10
-rw-r--r--src/context/matcher.rs2
-rw-r--r--src/context/tab_context.rs2
-rw-r--r--src/event/process_event.rs3
-rw-r--r--src/fs/dirlist.rs3
-rw-r--r--src/fs/entry.rs6
-rw-r--r--src/history.rs5
-rw-r--r--src/key_command/command.rs11
-rw-r--r--src/key_command/command_keybind.rs3
-rw-r--r--src/key_command/impl_appexecute.rs3
-rw-r--r--src/key_command/impl_comment.rs9
-rw-r--r--src/key_command/impl_from_str.rs11
-rw-r--r--src/key_command/impl_numbered.rs2
-rw-r--r--src/key_command/traits.rs2
-rw-r--r--src/main.rs20
-rw-r--r--src/run.rs2
-rw-r--r--src/tab/tab_struct.rs3
-rw-r--r--src/ui/views/tui_command_menu.rs2
-rw-r--r--src/ui/views/tui_view.rs2
-rw-r--r--src/ui/widgets/tui_dirlist_detailed.rs5
-rw-r--r--src/ui/widgets/tui_footer.rs2
-rw-r--r--src/ui/widgets/tui_help.rs2
-rw-r--r--src/ui/widgets/tui_tab.rs2
-rw-r--r--src/util/process.rs2
112 files changed, 1002 insertions, 890 deletions
diff --git a/.gitignore b/.gitignore
index 95e4312..a359f21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
**/*.rs.bk
/result
/.devenv
+.vscode/
diff --git a/Cargo.lock b/Cargo.lock
index 196c0dc..0a26be5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -549,7 +549,6 @@ dependencies = [
"regex",
"rustyline",
"serde",
- "serde_derive",
"shell-words",
"shellexpand",
"signal-hook",
diff --git a/Cargo.toml b/Cargo.toml
index 1024efb..dbb3f16 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,8 +29,7 @@ phf = { version = "^0", features = ["macros"], optional = true }
rand = "^0"
regex = "1.9.3"
rustyline = "^12"
-serde = "^1"
-serde_derive = "^1"
+serde = { version = "^1", features = ["derive"] }
shell-words = "^1"
shellexpand = { version = "^3", features = ["full"] }
signal-hook = "^0"
diff --git a/src/commands/bookmark.rs b/src/commands/bookmark.rs
index c810d56..1a33122 100644
--- a/src/commands/bookmark.rs
+++ b/src/commands/bookmark.rs
@@ -6,7 +6,8 @@ use ratatui::layout::Rect;
use ratatui::widgets::Clear;
use termion::event::Event;
-use crate::config::{search_directories, BookmarkRaw, BookmarksRaw};
+use crate::config::raw::bookmarks::{BookmarkRaw, BookmarksRaw};
+use crate::config::search_directories;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::event::{process_event, AppEvent};
diff --git a/src/commands/case_sensitivity.rs b/src/commands/case_sensitivity.rs
index 658c7fe..f162ec9 100644
--- a/src/commands/case_sensitivity.rs
+++ b/src/commands/case_sensitivity.rs
@@ -1,4 +1,4 @@
-use crate::config::option::CaseSensitivity;
+use crate::config::clean::app::search::CaseSensitivity;
use crate::context::AppContext;
use crate::error::JoshutoResult;
diff --git a/src/commands/command_line.rs b/src/commands/command_line.rs
index ae9b3af..72ba677 100644
--- a/src/commands/command_line.rs
+++ b/src/commands/command_line.rs
@@ -1,6 +1,6 @@
use std::str::FromStr;
-use crate::config::AppKeyMapping;
+use crate::config::clean::keymap::AppKeyMapping;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::key_command::{AppExecute, Command};
diff --git a/src/commands/line_nums.rs b/src/commands/line_nums.rs
index c5ff877..24e51b1 100644
--- a/src/commands/line_nums.rs
+++ b/src/commands/line_nums.rs
@@ -1,4 +1,4 @@
-use crate::config::option::LineNumberStyle;
+use crate::config::clean::app::display::line_number::LineNumberStyle;
use crate::context::AppContext;
use crate::error::JoshutoResult;
diff --git a/src/commands/linemode.rs b/src/commands/linemode.rs
index 82668f6..92e63d1 100644
--- a/src/commands/linemode.rs
+++ b/src/commands/linemode.rs
@@ -1,5 +1,5 @@
use super::reload;
-use crate::config::option::LineMode;
+use crate::config::clean::app::display::line_mode::LineMode;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::history::DirectoryHistory;
diff --git a/src/commands/numbered_command.rs b/src/commands/numbered_command.rs
index b66e38c..58f10a0 100644
--- a/src/commands/numbered_command.rs
+++ b/src/commands/numbered_command.rs
@@ -1,7 +1,7 @@
use termion::event::{Event, Key};
use crate::commands::cursor_move;
-use crate::config::AppKeyMapping;
+use crate::config::clean::keymap::AppKeyMapping;
use crate::context::AppContext;
use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
use crate::event::process_event;
diff --git a/src/commands/open_file.rs b/src/commands/open_file.rs
index c93f721..90623b8 100644
--- a/src/commands/open_file.rs
+++ b/src/commands/open_file.rs
@@ -2,7 +2,7 @@ use std::io;
use std::path;
use crate::commands::{quit, reload};
-use crate::config::ProgramEntry;
+use crate::config::clean::mimetype::ProgramEntry;
use crate::context::AppContext;
use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
use crate::ui::views::DummyListener;
diff --git a/src/commands/rename_file.rs b/src/commands/rename_file.rs
index e98c598..13bb671 100644
--- a/src/commands/rename_file.rs
+++ b/src/commands/rename_file.rs
@@ -1,6 +1,6 @@
use std::path;
-use crate::config::AppKeyMapping;
+use crate::config::clean::keymap::AppKeyMapping;
use crate::context::AppContext;
use crate::error::JoshutoResult;
use crate::history::create_dirlist_with_history;
diff --git a/src/commands/search_fzf.rs b/src/commands/search_fzf.rs
index 9d86b7b..dba5b18 100644
--- a/src/commands/search_fzf.rs
+++ b/