refactor: align cli_action to cli to make concept align

phodal · Dec 7, 2021 · 84f64b6 · 84f64b6
1 parent 7af5086
commit 84f64b6
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 8 deletions.
diff --git a/src/cli_action/entry_action.rs → src/cli/entry_action.rs b/src/cli_action/entry_action.rs → src/cli/entry_action.rs
@@ -6,8 +6,8 @@ use std::path::PathBuf;
 use quake_core::parser::quake::QuakeActionNode;
 use quake_core::quake_config::QuakeConfig;
 
-use crate::cli_action::helper::table_process;
-use crate::exec_wrapper::editor_exec;
+use crate::cli::helper::table_process;
+use crate::helper::exec_wrapper::editor_exec;
 use quake_core::entry::entry_paths::EntryPaths;
 use quake_core::errors::QuakeError;
 use quake_core::usecases::entry_usecases;
@@ -74,7 +74,7 @@ mod tests {
     use quake_core::parser::quake::QuakeActionNode;
     use quake_core::quake_config::QuakeConfig;
 
-    use crate::cli_action::action;
+    use crate::cli::action;
 
     #[test]
     fn throw_editor_empty() {

diff --git a/src/cli_action/helper/mod.rs → src/cli/helper/mod.rs b/src/cli_action/helper/mod.rs → src/cli/helper/mod.rs
diff --git a/src/cli_action/helper/table_process.rs → src/cli/helper/table_process.rs b/src/cli_action/helper/table_process.rs → src/cli/helper/table_process.rs
diff --git a/src/cli_action/mod.rs → src/cli/mod.rs b/src/cli_action/mod.rs → src/cli/mod.rs
diff --git a/src/cli_action/quake_action.rs → src/cli/quake_action.rs b/src/cli_action/quake_action.rs → src/cli/quake_action.rs
@@ -8,7 +8,7 @@ use walkdir::{DirEntry, FilterEntry, IntoIter, WalkDir};
 use quake_core::entry::entry_defines::EntryDefines;
 use quake_core::QuakeConfig;
 
-use crate::exec_wrapper::meili_exec;
+use crate::helper::exec_wrapper::meili_exec;
 use quake_core::entry::entry_paths::EntryPaths;
 use quake_core::errors::QuakeError;
 use quake_core::usecases::entry_usecases;

diff --git a/src/cli_action/transflow_action.rs → src/cli/transflow_action.rs b/src/cli_action/transflow_action.rs → src/cli/transflow_action.rs
diff --git a/src/helper/entry_watcher.rs b/src/helper/entry_watcher.rs
@@ -13,7 +13,7 @@ use quake_core::entry::entry_file::EntryFile;
 use quake_core::errors::QuakeError;
 use quake_core::helper::file_filter::type_from_md_path;
 
-use crate::exec_wrapper::meili_exec::feed_entry;
+use crate::helper::exec_wrapper::meili_exec::feed_entry;
 
 fn async_watcher() -> notify::Result<(RecommendedWatcher, Receiver<notify::Result<Event>>)> {
     let (mut tx, rx) = channel(1);

diff --git a/src/exec_wrapper/editor_exec.rs → src/helper/exec_wrapper/editor_exec.rs b/src/exec_wrapper/editor_exec.rs → src/helper/exec_wrapper/editor_exec.rs
diff --git a/src/exec_wrapper/meili_exec.rs → src/helper/exec_wrapper/meili_exec.rs b/src/exec_wrapper/meili_exec.rs → src/helper/exec_wrapper/meili_exec.rs
diff --git a/src/exec_wrapper/mod.rs → src/helper/exec_wrapper/mod.rs b/src/exec_wrapper/mod.rs → src/helper/exec_wrapper/mod.rs
diff --git a/src/helper/mod.rs b/src/helper/mod.rs
@@ -1 +1,2 @@
 pub mod entry_watcher;
+pub mod exec_wrapper;
diff --git a/src/main.rs b/src/main.rs
@@ -14,8 +14,7 @@ use quake_tui::tui_main_loop;
 
 use crate::server::quake_rocket;
 
-pub mod cli_action;
-pub mod exec_wrapper;
+pub mod cli;
 pub mod helper;
 pub mod server;
 
@@ -88,7 +87,7 @@ pub async fn process_cmd(opts: Opts) -> Result<(), Box<dyn Error>> {
             let conf = config_quake(&cmd)?;
             if cmd.input.len() > 0 {
                 let expr = QuakeActionNode::action_from_text(cmd.input.as_str())?;
-                cli_action::action(expr, conf)?
+                cli::action(expr, conf)?
             }
         }
         SubCommand::Server(server) => {