refactored projects to dirs command

KCaverly · Jan 5, 2023 · 5c5e055 · 5c5e055
1 parent f6c6319
commit 5c5e055
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -5,7 +5,7 @@ use toml;
 
 #[derive(Debug, Deserialize)]
 pub struct Config {
-    pub projects: HashMap<String, Project>,
+    pub directories: HashMap<String, ProjectDirectory>,
     pub dotfiles: Dotfiles,
     pub ssh: HashMap<String, SSH>,
 }
@@ -35,7 +35,7 @@ impl Config {
 }
 
 #[derive(Debug, Deserialize)]
-pub struct Project {
+pub struct ProjectDirectory {
     pub session_name: String,
     pub directory: String,
     pub max_depth: u8,
@@ -70,8 +70,8 @@ fn get_peaches_path() -> String {
 
 pub fn generate_config() {
     const DEFAULT_CONFIG: &str = r#"
-[projects]
-    [projects.default]
+[directories]
+    [directories.default]
     session_name = "default"
     directory = "/"
     min_depth = 1

diff --git a/src/projects.rs → src/dirs.rs b/src/projects.rs → src/dirs.rs
@@ -2,14 +2,14 @@ use std::{collections::HashMap, io};
 use walkdir::{DirEntry, WalkDir};
 
 use crate::{
-    config::{Config, Project},
+    config::{Config, ProjectDirectory},
     fuzzy_finder,
     tmux::TMUX,
 };
 
-pub struct ProjectsCommand {}
+pub struct DirsCommand {}
 
-impl ProjectsCommand {
+impl DirsCommand {
     fn get_folders(path: &str, min_depth: u8, max_depth: u8) -> Result<Vec<DirEntry>, io::Error> {
         Ok(WalkDir::new(path)
             .min_depth(min_depth.into())
@@ -21,10 +21,10 @@ impl ProjectsCommand {
             .collect::<Vec<DirEntry>>())
     }
 
-    fn get_options(projects: &HashMap<String, Project>) -> Vec<String> {
+    fn get_options(directories: &HashMap<String, ProjectDirectory>) -> Vec<String> {
         let mut file_list: Vec<String> = Vec::new();
 
-        for (_key, value) in &*projects {
+        for (_key, value) in &*directories {
             let dir_files: Vec<String> =
                 Self::get_folders(&value.directory, value.min_depth, value.max_depth)
                     .unwrap()
@@ -51,8 +51,8 @@ impl ProjectsCommand {
         return file_list;
     }
 
-    fn get_project_details<'a>(cfg: &'a Config, selected: &'a str) -> &'a Project {
-        for (_key, value) in &cfg.projects {
+    fn get_directory_details<'a>(cfg: &'a Config, selected: &'a str) -> &'a ProjectDirectory {
+        for (_key, value) in &cfg.directories {
             if selected.contains(&value.directory) {
                 return value;
             }
@@ -61,7 +61,7 @@ impl ProjectsCommand {
     }
 
     fn post_search_command(cfg: &Config, selected: &str) {
-        let details = Self::get_project_details(cfg, selected);
+        let details = Self::get_directory_details(cfg, selected);
         let name = selected.split("/").last().unwrap();
 
         TMUX::create_window(&details.session_name, name);
@@ -74,7 +74,7 @@ impl ProjectsCommand {
     }
 
     pub fn run(cfg: &Config) {
-        let options = Self::get_options(&cfg.projects);
+        let options = Self::get_options(&cfg.directories);
         let selected = fuzzy_finder::search_options(options);
         Self::post_search_command(&cfg, &selected);
     }

diff --git a/src/main.rs b/src/main.rs
@@ -1,14 +1,14 @@
 mod config;
+mod dirs;
 mod docker;
 mod dotfiles;
 mod fuzzy_finder;
-mod projects;
 mod ssh;
 mod tmux;
 
 use clap::{Parser, Subcommand};
 use docker::DockerCommand;
-use projects::ProjectsCommand;
+use dirs::DirsCommand;
 use ssh::SSHCommand;
 use std::process::{Command, Stdio};
 use std::str;
@@ -23,7 +23,7 @@ struct Value {
 #[derive(Subcommand)]
 enum Commands {
     /// Run projects fuzzy finder
-    Projects {},
+    Dirs {},
     /// Run ssh server launcher
     SSH {},
     /// Upgrade peaches to latest version available on github
@@ -80,10 +80,9 @@ fn main() {
     let value = Value::parse();
 
     match &value.commands {
-        Commands::Projects {} => {
+        Commands::Dirs {} => {
             let cfg: config::Config = config::load_config();
-            ProjectsCommand::run(&cfg);
-            // run_projects(&cfg);
+            DirsCommand::run(&cfg);
         }
 
         Commands::SSH {} => {