rename some types

61 files changed, 282 insertions, 372 deletions

diff --git a/src/commands/bookmark.rs b/src/commands/bookmark.rs
index 1a33122..4372a58 100644
--- a/src/commands/bookmark.rs
+++ b/src/commands/bookmark.rs
@@ -9,7 +9,7 @@ use termion::event::Event;
 use crate::config::raw::bookmarks::{BookmarkRaw, BookmarksRaw};
 use crate::config::search_directories;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::event::{process_event, AppEvent};
 use crate::traits::ToString;
 use crate::ui::views::TuiView;
@@ -30,7 +30,7 @@ fn find_bookmark_file() -> Option<path::PathBuf> {
     None
 }
 
-pub fn add_bookmark(context: &mut AppContext, backend: &mut AppBackend) -> JoshutoResult {
+pub fn add_bookmark(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
     let cwd = std::env::current_dir()?;
 
     let bookmark_path = match search_directories(BOOKMARKS_FILE, &CONFIG_HIERARCHY) {
@@ -68,10 +68,7 @@ pub fn add_bookmark(context: &mut AppContext, backend: &mut AppBackend) -> Joshu
     Ok(())
 }
 
-pub fn change_directory_bookmark(
-    context: &mut AppContext,
-    backend: &mut AppBackend,
-) -> JoshutoResult {
+pub fn change_directory_bookmark(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
     let key = poll_for_bookmark_key(context, backend);
 
     if let Some(key) = key {
diff --git a/src/commands/bulk_rename.rs b/src/commands/bulk_rename.rs
index 90dd23a..f7009ae 100644
--- a/src/commands/bulk_rename.rs
+++ b/src/commands/bulk_rename.rs
@@ -7,7 +7,7 @@ use std::process;
 use rand::Rng;
 
 use crate::context::AppContext;
-use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
+use crate::error::{AppError, AppErrorKind, AppResult};
 use crate::ui::AppBackend;
 use crate::util::process::wait_for_enter;
 
@@ -18,7 +18,7 @@ const ENV_EDITOR: &str = "EDITOR";
 const FILE_PREFIX: &str = "joshuto-";
 const RAND_STR_LEN: usize = 10;
 
-pub fn _bulk_rename(context: &mut AppContext) -> JoshutoResult {
+pub fn _bulk_rename(context: &mut AppContext) -> AppResult {
     let tmp_directory = env::var(ENV_TMP_DIR).unwrap_or_else(|_| "/tmp".to_string());
 
     let editor = std::env::var(ENV_EDITOR)?;
@@ -87,8 +87,8 @@ pub fn _bulk_rename(context: &mut AppContext) -> JoshutoResult {
         std::fs::remove_file(&file_path)?;
     }
     if paths_renamed.len() < entries.len() {
-        return Err(JoshutoError::new(
-            JoshutoErrorKind::Io(io::ErrorKind::InvalidInput),
+        return Err(AppError::new(
+            AppErrorKind::Io(io::ErrorKind::InvalidInput),
             "Insufficient inputs".to_string(),
         ));
     }
@@ -124,7 +124,7 @@ pub fn _bulk_rename(context: &mut AppContext) -> JoshutoResult {
     Ok(())
 }
 
-pub fn bulk_rename(context: &mut AppContext, backend: &mut AppBackend) -> JoshutoResult {
+pub fn bulk_rename(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
     context.remove_external_preview();
     backend.terminal_drop();
     let res = _bulk_rename(context);
diff --git a/src/commands/case_sensitivity.rs b/src/commands/case_sensitivity.rs
index f162ec9..533ad40 100644
--- a/src/commands/case_sensitivity.rs
+++ b/src/commands/case_sensitivity.rs
@@ -1,6 +1,6 @@
 use crate::config::clean::app::search::CaseSensitivity;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 
 #[derive(Clone, Copy, Debug)]
 pub enum SetType {
@@ -14,7 +14,7 @@ pub fn set_case_sensitivity(
     context: &mut AppContext,
     case_sensitivity: CaseSensitivity,
     set_type: SetType,
-) -> JoshutoResult {
+) -> AppResult {
     let options = context.config_mut().search_options_mut();
 
     match set_type {
diff --git a/src/commands/change_directory.rs b/src/commands/change_directory.rs
index 23ebfc6..e654d41 100644
--- a/src/commands/change_directory.rs
+++ b/src/commands/change_directory.rs
@@ -2,7 +2,7 @@ use std::path;
 
 use crate::commands::reload;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::history::DirectoryHistory;
 
 // ChangeDirectory command
@@ -12,7 +12,7 @@ pub fn cd(path: &path::Path, context: &mut AppContext) -> std::io::Result<()> {
     Ok(())
 }
 
-pub fn change_directory(context: &mut AppContext, mut path: &path::Path) -> JoshutoResult {
+pub fn change_directory(context: &mut AppContext, mut path: &path::Path) -> AppResult {
     let new_cwd = if path.is_absolute() {
         path.to_path_buf()
     } else {
@@ -43,7 +43,7 @@ pub fn change_directory(context: &mut AppContext, mut path: &path::Path) -> Josh
 }
 
 // ParentDirectory command
-pub fn parent_directory(context: &mut AppContext) -> JoshutoResult {
+pub fn parent_directory(context: &mut AppContext) -> AppResult {
     if let Some(parent) = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -62,7 +62,7 @@ pub fn parent_directory(context: &mut AppContext) -> JoshutoResult {
 }
 
 // PreviousDirectory command
-pub fn previous_directory(context: &mut AppContext) -> JoshutoResult {
+pub fn previous_directory(context: &mut AppContext) -> AppResult {
     if let Some(path) = context.tab_context_ref().curr_tab_ref().previous_dir() {
         let path = path.to_path_buf();
         std::env::set_current_dir(&path)?;
diff --git a/src/commands/command_line.rs b/src/commands/command_line.rs
index 72ba677..d423835 100644
--- a/src/commands/command_line.rs
+++ b/src/commands/command_line.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::config::clean::keymap::AppKeyMapping;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::key_command::{AppExecute, Command};
 use crate::ui::views::{DummyListener, TuiTextField};
 use crate::ui::AppBackend;
@@ -13,7 +13,7 @@ pub fn read_and_execute(
     keymap_t: &AppKeyMapping,
     prefix: &str,
     suffix: &str,
-) -> JoshutoResult {
+) -> AppResult {
     context.flush_event();
     let mut listener = DummyListener {};
     let user_input: Option<String> = TuiTextField::default()
diff --git a/src/commands/cursor_move.rs b/src/commands/cursor_move.rs
index ccb8d98..1f6e5ff 100644
--- a/src/commands/cursor_move.rs
+++ b/src/commands/cursor_move.rs
@@ -1,5 +1,5 @@
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::ui::AppBackend;
 
 pub fn lazy_load_directory_size(context: &mut AppContext) {
@@ -54,7 +54,7 @@ pub fn cursor_move(context: &mut AppContext, new_index: usize) {
     }
 }
 
-pub fn up(context: &mut AppContext, u: usize) -> JoshutoResult {
+pub fn up(context: &mut AppContext, u: usize) -> AppResult {
     let movement = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -67,7 +67,7 @@ pub fn up(context: &mut AppContext, u: usize) -> JoshutoResult {
     Ok(())
 }
 
-pub fn down(context: &mut AppContext, u: usize) -> JoshutoResult {
+pub fn down(context: &mut AppContext, u: usize) -> AppResult {
     let movement = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -80,7 +80,7 @@ pub fn down(context: &mut AppContext, u: usize) -> JoshutoResult {
     Ok(())
 }
 
-pub fn home(context: &mut AppContext) -> JoshutoResult {
+pub fn home(context: &mut AppContext) -> AppResult {
     let movement = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -100,7 +100,7 @@ pub fn home(context: &mut AppContext) -> JoshutoResult {
     Ok(())
 }
 
-pub fn end(context: &mut AppContext) -> JoshutoResult {
+pub fn end(context: &mut AppContext) -> AppResult {
     let movement = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -138,11 +138,7 @@ fn get_page_size(context: &AppContext, backend: &AppBackend) -> Option<usize> {
     }
 }
 
-pub fn page_up(
-    context: &mut AppContext,
-    backend: &mut AppBackend,
-    proportion: f64,
-) -> JoshutoResult {
+pub fn page_up(context: &mut AppContext, backend: &mut AppBackend, proportion: f64) -> AppResult {
     let page_size = get_page_size(context, backend).unwrap_or(10) as f64 * proportion;
     let page_size = page_size as usize;
 
@@ -158,11 +154,7 @@ pub fn page_up(
     Ok(())
 }
 
-pub fn page_down(
-    context: &mut AppContext,
-    backend: &mut AppBackend,
-    proportion: f64,
-) -> JoshutoResult {
+pub fn page_down(context: &mut AppContext, backend: &mut AppBackend, proportion: f64) -> AppResult {
     let page_size = get_page_size(context, backend).unwrap_or(10) as f64 * proportion;
     let page_size = page_size as usize;
 
@@ -178,7 +170,7 @@ pub fn page_down(
     Ok(())
 }
 
-pub fn page_home(context: &mut AppContext, _: &mut AppBackend) -> JoshutoResult {
+pub fn page_home(context: &mut AppContext, _: &mut AppBackend) -> AppResult {
     let new_index = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -190,7 +182,7 @@ pub fn page_home(context: &mut AppContext, _: &mut AppBackend) -> JoshutoResult
     Ok(())
 }
 
-pub fn page_middle(context: &mut AppContext, backend: &mut AppBackend) -> JoshutoResult {
+pub fn page_middle(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
     let movement = get_page_size(context, backend).unwrap_or(10) / 2;
 
     let new_index = context
@@ -204,7 +196,7 @@ pub fn page_middle(context: &mut AppContext, backend: &mut AppBackend) -> Joshut
     Ok(())
 }
 
-pub fn page_end(context: &mut AppContext, backend: &mut AppBackend) -> JoshutoResult {
+pub fn page_end(context: &mut AppContext, backend: &mut AppBackend) -> AppResult {
     let movement = get_page_size(context, backend).unwrap_or(10) - 1;
 
     let new_index = context
diff --git a/src/commands/delete_files.rs b/src/commands/delete_files.rs
index 2f336fa..7d7fa33 100644
--- a/src/commands/delete_files.rs
+++ b/src/commands/delete_files.rs
@@ -4,7 +4,7 @@ use std::sync::mpsc;
 use termion::event::Key;
 
 use crate::context::AppContext;
-use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
+use crate::error::{AppError, AppErrorKind, AppResult};
 use crate::history::DirectoryHistory;
 use crate::io::{FileOperation, FileOperationOptions, IoWorkerThread};
 use crate::ui::widgets::TuiPrompt;
@@ -40,7 +40,7 @@ fn delete_files(
     paths: Vec<path::PathBuf>,
     background: bool,
     permanently: bool,
-) -> JoshutoResult<()> {
+) -> AppResult<()> {
     let file_op = FileOperation::Delete;
     let options = FileOperationOptions {
         overwrite: false,
@@ -71,7 +71,7 @@ pub fn delete_selected_files(
     background: bool,
     permanently: bool,
     noconfirm: bool,
-) -> JoshutoResult {
+) -> AppResult {
     let paths = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -81,8 +81,8 @@ pub fn delete_selected_files(
 
     let paths_len = paths.len();
     if paths_len == 0 {
-        let err = JoshutoError::new(
-            JoshutoErrorKind::InvalidParameters,
+        let err = AppError::new(
+            AppErrorKind::InvalidParameters,
             "no files selected".to_string(),
         );
         return Err(err);
diff --git a/src/commands/escape.rs b/src/commands/escape.rs
index 1a507df..5aea18f 100644
--- a/src/commands/escape.rs
+++ b/src/commands/escape.rs
@@ -1,7 +1,7 @@
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 
-pub fn escape(context: &mut AppContext) -> JoshutoResult {
+pub fn escape(context: &mut AppContext) -> AppResult {
     if let Some(curr_dir_list) = context.tab_context_mut().curr_tab_mut().curr_list_mut() {
         curr_dir_list.visual_mode_cancel();
     };
diff --git a/src/commands/file_ops.rs b/src/commands/file_ops.rs
index f289323..be0c0ec 100644
--- a/src/commands/file_ops.rs
+++ b/src/commands/file_ops.rs
@@ -2,7 +2,7 @@ use std::io;
 use std::process::{Command, Stdio};
 
 use crate::context::{AppContext, LocalStateContext};
-use crate::error::{JoshutoError, JoshutoErrorKind, JoshutoResult};
+use crate::error::{AppError, AppErrorKind, AppResult};
 use crate::io::{FileOperation, FileOperationOptions, IoWorkerThread};
 
 fn new_local_state(context: &mut AppContext, file_op: FileOperation) -> Option<()> {
@@ -17,27 +17,27 @@ fn new_local_state(context: &mut AppContext, file_op: FileOperation) -> Option<(
     Some(())
 }
 
-pub fn cut(context: &mut AppContext) -> JoshutoResult {
+pub fn cut(context: &mut AppContext) -> AppResult {
     new_local_state(context, FileOperation::Cut);
     Ok(())
 }
 
-pub fn copy(context: &mut AppContext) -> JoshutoResult {
+pub fn copy(context: &mut AppContext) -> AppResult {
     new_local_state(context, FileOperation::Copy);
     Ok(())
 }
 
-pub fn symlink_absolute(context: &mut AppContext) -> JoshutoResult {
+pub fn symlink_absolute(context: &mut AppContext) -> AppResult {
     new_local_state(context, FileOperation::Symlink { relative: false });
     Ok(())
 }
 
-pub fn symlink_relative(context: &mut AppContext) -> JoshutoResult {
+pub fn symlink_relative(context: &mut AppContext) -> AppResult {
     new_local_state(context, FileOperation::Symlink { relative: true });
     Ok(())
 }
 
-pub fn paste(context: &mut AppContext, options: FileOperationOptions) -> JoshutoResult {
+pub fn paste(context: &mut AppContext, options: FileOperationOptions) -> AppResult {
     match context.take_local_state() {
         Some(state) if !state.paths.is_empty() => {
             let dest = context.tab_context_ref().curr_tab_ref().cwd().to_path_buf();
@@ -45,14 +45,14 @@ pub fn paste(context: &mut AppContext, options: FileOperationOptions) -> Joshuto
             context.worker_context_mut().push_worker(worker_thread);
             Ok(())
         }
-        _ => Err(JoshutoError::new(
-            JoshutoErrorKind::Io(io::ErrorKind::InvalidData),
+        _ => Err(AppError::new(
+            AppErrorKind::Io(io::ErrorKind::InvalidData),
             "no files selected".to_string(),
         )),
     }
 }
 
-pub fn copy_filename(context: &mut AppContext) -> JoshutoResult {
+pub fn copy_filename(context: &mut AppContext) -> AppResult {
     let entry_file_name = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -66,7 +66,7 @@ pub fn copy_filename(context: &mut AppContext) -> JoshutoResult {
     Ok(())
 }
 
-pub fn copy_filename_without_extension(context: &mut AppContext) -> JoshutoResult {
+pub fn copy_filename_without_extension(context: &mut AppContext) -> AppResult {
     let entry_file_name = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -86,7 +86,7 @@ pub fn copy_filename_without_extension(context: &mut AppContext) -> JoshutoResul
     Ok(())
 }
 
-pub fn copy_filepath(context: &mut AppContext, all: bool) -> JoshutoResult {
+pub fn copy_filepath(context: &mut AppContext, all: bool) -> AppResult {
     let selected = context.tab_context_ref().curr_tab_ref().curr_list_ref();
     let entry_file_path = {
         if all {
@@ -112,7 +112,7 @@ pub fn copy_filepath(context: &mut AppContext, all: bool) -> JoshutoResult {
     Ok(())
 }
 
-pub fn copy_dirpath(context: &mut AppContext) -> JoshutoResult {
+pub fn copy_dirpath(context: &mut AppContext) -> AppResult {
     let opt_entry = context
         .tab_context_ref()
         .curr_tab_ref()
@@ -125,7 +125,7 @@ pub fn copy_dirpath(context: &mut AppContext) -> JoshutoResult {
     Ok(())
 }
 
-fn copy_string_to_buffer(string: String) -> JoshutoResult {
+fn copy_string_to_buffer(string: String) -> AppResult {
     let clipboards = [
         (
             "wl-copy",
@@ -154,8 +154,8 @@ fn copy_string_to_buffer(string: String) -> JoshutoResult {
             _ => {}
         }
     }
-    Err(JoshutoError::new(
-        JoshutoErrorKind::ClipboardError,
+    Err(AppError::new(
+        AppErrorKind::ClipboardError,
         "Failed to copy to clipboard".to_string(),
     ))
 }
diff --git a/src/commands/filter.rs b/src/commands/filter.rs
index fbf1d30..54a1f99 100644
--- a/src/commands/filter.rs
+++ b/src/commands/filter.rs
@@ -1,9 +1,9 @@
 use crate::context::{AppContext, MatchContext};
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 
 use super::reload;
 
-pub fn filter(context: &mut AppContext, pattern: &str) -> JoshutoResult {
+pub fn filter(context: &mut AppContext, pattern: &str) -> AppResult {
     let case_sensitivity = context
         .config_ref()
         .search_options_ref()
diff --git a/src/commands/flat.rs b/src/commands/flat.rs
index 1f3891a..c63912f 100644
--- a/src/commands/flat.rs
+++ b/src/commands/flat.rs
@@ -1,9 +1,9 @@
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 
 use super::reload;
 
-pub fn flatten(context: &mut AppContext, depth: usize) -> JoshutoResult {
+pub fn flatten(context: &mut AppContext, depth: usize) -> AppResult {
     let curr_tab = context.tab_context_mut().curr_tab_mut();
     let path = curr_tab.cwd().to_path_buf();
     curr_tab
diff --git a/src/commands/line_nums.rs b/src/commands/line_nums.rs
index 24e51b1..5a1d047 100644
--- a/src/commands/line_nums.rs
+++ b/src/commands/line_nums.rs
@@ -1,10 +1,10 @@
 use crate::config::clean::app::display::line_number::LineNumberStyle;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 
 use super::reload;
 
-pub fn switch_line_numbering(context: &mut AppContext, style: LineNumberStyle) -> JoshutoResult {
+pub fn switch_line_numbering(context: &mut AppContext, style: LineNumberStyle) -> AppResult {
     context
         .config_mut()
         .display_options_mut()
diff --git a/src/commands/linemode.rs b/src/commands/linemode.rs
index 92e63d1..da1262d 100644
--- a/src/commands/linemode.rs
+++ b/src/commands/linemode.rs
@@ -1,10 +1,10 @@
 use super::reload;
 use crate::config::clean::app::display::line_mode::LineMode;
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::history::DirectoryHistory;
 
-pub fn set_linemode(context: &mut AppContext, linemode: LineMode) -> JoshutoResult {
+pub fn set_linemode(context: &mut AppContext, linemode: LineMode) -> AppResult {
     let curr_tab = context.tab_context_mut().curr_tab_mut();
     curr_tab.option_mut().linemode = linemode;
     curr_tab.history_mut().depreciate_all_entries();
diff --git a/src/commands/new_directory.rs b/src/commands/new_directory.rs
index 7fb7190..ec9efd4 100644
--- a/src/commands/new_directory.rs
+++ b/src/commands/new_directory.rs
@@ -1,10 +1,10 @@
 use std::path;
 
 use crate::context::AppContext;
-use crate::error::JoshutoResult;
+use crate::error::AppResult;
 use crate::history::DirectoryHistory;
 
-pub fn new_directory(context: &