refactor: move commands into a module hierarchy

fixes #313 (partially?)

Author: SaadiSave

src/bin/juliainstaller.rs

@@ -223,9 +223,7 @@ pub fn main() -> Result<()> {
     };
     use is_terminal::IsTerminal;
     use juliaup::{
-        command_add::run_command_add,
-        command_default::run_command_default,
-        command_selfchannel::run_command_selfchannel,
+        command,
         config_file::JuliaupSelfConfig,
         get_juliaup_target, get_own_version,
         global_paths::get_paths,
@@ -266,12 +264,6 @@ pub fn main() -> Result<()> {
 
     let mut paths = get_paths().with_context(|| "Trying to load all global paths.")?;
 
-    use juliaup::{
-        command_config_backgroundselfupdate::run_command_config_backgroundselfupdate,
-        command_config_modifypath::run_command_config_modifypath,
-        command_config_startupselfupdate::run_command_config_startupselfupdate,
-        command_config_symlinks::run_command_config_symlinks,
-    };
     use log::{debug, info, trace};
 
     println!("{}", style("Welcome to Julia!").bold());
@@ -500,26 +492,32 @@ pub fn main() -> Result<()> {
         paths.juliaupselfconfig = self_config_path.clone();
     }
 
-    run_command_config_backgroundselfupdate(
+    command::config::background_self_update::run(
         Some(install_choices.backgroundselfupdate),
         true,
         &paths,
     )
     .unwrap();
-    run_command_config_startupselfupdate(Some(install_choices.startupselfupdate), true, &paths)
-        .unwrap();
+    command::config::startup_self_update::run(
+        Some(install_choices.startupselfupdate),
+        true,
+        &paths,
+    )
+    .unwrap();
     if install_choices.modifypath {
         // We only run this if true so that we don't try to touch the various shell scripts at all
         // if this is not selected.
-        run_command_config_modifypath(Some(install_choices.modifypath), true, &paths).unwrap();
+        command::config::modify_path::run(Some(install_choices.modifypath), true, &paths).unwrap();
     }
-    run_command_config_symlinks(Some(install_choices.symlinks), true, &paths).unwrap();
-    run_command_selfchannel(Some(args.juliaup_channel), &paths).unwrap();
 
-    run_command_add(&args.default_channel, &paths)
+    #[cfg(not(windows))]
+    command::config::symlinks::run(Some(install_choices.symlinks), true, &paths).unwrap();
+    command::selfchannel::run(Some(args.juliaup_channel), &paths).unwrap();
+
+    command::add::run(&args.default_channel, &paths)
         .with_context(|| "Failed to run `run_command_add`.")?;
 
-    run_command_default(&args.default_channel, &paths)
+    command::default::run(&args.default_channel, &paths)
         .with_context(|| "Failed to run `run_command_default`.")?;
 
     let symlink_path = juliaupselfbin.join("julia");

src/bin/juliaup.rs

@@ -1,39 +1,8 @@
 use anyhow::{Context, Result};
 use clap::Parser;
 use juliaup::cli::{ConfigSubCmd, Juliaup, OverrideSubCmd, SelfSubCmd};
-use juliaup::command_api::run_command_api;
-use juliaup::command_completions::generate_completion_for_command;
-use juliaup::command_config_autoinstall::run_command_config_autoinstall;
-#[cfg(not(windows))]
-use juliaup::command_config_symlinks::run_command_config_symlinks;
-use juliaup::command_config_versionsdbupdate::run_command_config_versionsdbupdate;
-use juliaup::command_default::run_command_default;
-use juliaup::command_gc::run_command_gc;
-use juliaup::command_info::run_command_info;
-use juliaup::command_initial_setup_from_launcher::run_command_initial_setup_from_launcher;
-use juliaup::command_link::run_command_link;
-use juliaup::command_list::run_command_list;
-use juliaup::command_override::{run_command_override_status, run_command_override_unset};
-use juliaup::command_remove::run_command_remove;
-use juliaup::command_selfupdate::run_command_selfupdate;
-use juliaup::command_status::run_command_status;
-use juliaup::command_update::run_command_update;
-use juliaup::command_update_version_db::run_command_update_version_db;
+use juliaup::command;
 use juliaup::global_paths::get_paths;
-use juliaup::{command_add::run_command_add, command_override::run_command_override_set};
-#[cfg(feature = "selfupdate")]
-use juliaup::{
-    command_config_backgroundselfupdate::run_command_config_backgroundselfupdate,
-    command_config_modifypath::run_command_config_modifypath,
-    command_config_startupselfupdate::run_command_config_startupselfupdate,
-    command_selfchannel::run_command_selfchannel,
-};
-
-#[cfg(feature = "selfupdate")]
-use juliaup::command_selfuninstall::run_command_selfuninstall;
-
-#[cfg(not(feature = "selfupdate"))]
-use juliaup::command_selfuninstall::run_command_selfuninstall_unavailable;
 
 use log::info;
 
@@ -48,7 +17,7 @@ fn main() -> Result<()> {
         .write_style("JULIAUP_LOG_STYLE");
     env_logger::init_from_env(env);
 
-    #[cfg(feature = "winpkgidentityext")]
+    #[cfg(all(windows, feature = "winpkgidentityext"))]
     {
         use windows::Management::Deployment::{AddPackageOptions, PackageManager};
 
@@ -92,68 +61,68 @@ fn main() -> Result<()> {
     let paths = get_paths().with_context(|| "Trying to load all global paths.")?;
 
     match args {
-        Juliaup::Default { channel } => run_command_default(&channel, &paths),
-        Juliaup::Add { channel } => run_command_add(&channel, &paths),
-        Juliaup::Remove { channel } => run_command_remove(&channel, &paths),
-        Juliaup::Status {} => run_command_status(&paths),
-        Juliaup::Update { channel } => run_command_update(&channel, &paths),
-        Juliaup::Gc { prune_linked } => run_command_gc(prune_linked, &paths),
+        Juliaup::Default { channel } => command::default::run(&channel, &paths),
+        Juliaup::Add { channel } => command::add::run(&channel, &paths),
+        Juliaup::Remove { channel } => command::remove::run(&channel, &paths),
+        Juliaup::Status {} => command::status::run(&paths),
+        Juliaup::Update { channel } => command::update::run(&channel, &paths),
+        Juliaup::Gc { prune_linked } => command::gc::run(prune_linked, &paths),
         Juliaup::Link {
             channel,
             target,
             args,
-        } => run_command_link(&channel, &target, &args, &paths),
-        Juliaup::List {} => run_command_list(&paths),
+        } => command::link::run(&channel, &target, &args, &paths),
+        Juliaup::List {} => command::list::run(&paths),
         Juliaup::Config(subcmd) => match subcmd {
             #[cfg(not(windows))]
             ConfigSubCmd::ChannelSymlinks { value } => {
-                run_command_config_symlinks(value, false, &paths)
+                command::config::symlinks::run(value, false, &paths)
             }
             #[cfg(feature = "selfupdate")]
             ConfigSubCmd::BackgroundSelfupdateInterval { value } => {
-                run_command_config_backgroundselfupdate(value, false, &paths)
+                command::config::background_self_update::run(value, false, &paths)
             }
             #[cfg(feature = "selfupdate")]
             ConfigSubCmd::StartupSelfupdateInterval { value } => {
-                run_command_config_startupselfupdate(value, false, &paths)
+                command::config::startup_self_update::run(value, false, &paths)
             }
             #[cfg(feature = "selfupdate")]
             ConfigSubCmd::ModifyPath { value } => {
-                run_command_config_modifypath(value, false, &paths)
+                command::config::modify_path::run(value, false, &paths)
             }
             ConfigSubCmd::VersionsDbUpdateInterval { value } => {
-                run_command_config_versionsdbupdate(value, false, &paths)
+                command::config::versionsdb_update::run(value, false, &paths)
             }
             ConfigSubCmd::AutoInstallChannels { value } => {
-                run_command_config_autoinstall(value, false, &paths)
+                command::config::autoinstall::run(value, false, &paths)
             }
         },
-        Juliaup::Api { command } => run_command_api(&command, &paths),
-        Juliaup::InitialSetupFromLauncher {} => run_command_initial_setup_from_launcher(&paths),
-        Juliaup::UpdateVersionDb {} => run_command_update_version_db(&paths),
+        Juliaup::Api { command } => command::api::run(&command, &paths),
+        Juliaup::InitialSetupFromLauncher {} => command::initial_setup_from_launcher::run(&paths),
+        Juliaup::UpdateVersionDb {} => command::update_versiondb::run(&paths),
         Juliaup::OverrideSubCmd(subcmd) => match subcmd {
-            OverrideSubCmd::Status {} => run_command_override_status(&paths),
+            OverrideSubCmd::Status {} => command::r#override::status(&paths),
             OverrideSubCmd::Set { channel, path } => {
-                run_command_override_set(&paths, channel, path)
+                command::r#override::set(&paths, channel, path)
             }
             OverrideSubCmd::Unset { nonexistent, path } => {
-                run_command_override_unset(&paths, nonexistent, path)
+                command::r#override::unset(&paths, nonexistent, path)
             }
         },
-        Juliaup::Info {} => run_command_info(&paths),
+        Juliaup::Info {} => command::info::run(&paths),
         #[cfg(feature = "selfupdate")]
-        Juliaup::SecretSelfUpdate {} => run_command_selfupdate(&paths),
+        Juliaup::SecretSelfUpdate {} => command::selfupdate::run(&paths),
         Juliaup::SelfSubCmd(subcmd) => match subcmd {
-            SelfSubCmd::Update {} => run_command_selfupdate(&paths),
+            SelfSubCmd::Update {} => command::selfupdate::run(&paths),
             #[cfg(feature = "selfupdate")]
-            SelfSubCmd::Channel { channel } => run_command_selfchannel(channel, &paths),
+            SelfSubCmd::Channel { channel } => command::selfchannel::run(channel, &paths),
             #[cfg(feature = "selfupdate")]
-            SelfSubCmd::Uninstall {} => run_command_selfuninstall(&paths),
+            SelfSubCmd::Uninstall {} => command::selfuninstall::run(&paths),
             #[cfg(not(feature = "selfupdate"))]
-            SelfSubCmd::Uninstall {} => run_command_selfuninstall_unavailable(),
+            SelfSubCmd::Uninstall {} => command::selfuninstall::unavailable(),
         },
         Juliaup::Completions { shell } => {
-            generate_completion_for_command::<Juliaup>(shell, "juliaup")
+            command::completions::generate::<Juliaup>(shell, "juliaup")
         }
     }
 }

src/command_add.rs renamed to src/command/add.rs

@@ -10,7 +10,7 @@ use crate::versions_file::load_versions_db;
 use anyhow::{anyhow, Context, Result};
 use regex::Regex;
 
-pub fn run_command_add(channel: &str, paths: &GlobalPaths) -> Result<()> {
+pub fn run(channel: &str, paths: &GlobalPaths) -> Result<()> {
     // This regex is dynamically compiled, but its runtime is negligible compared to downloading Julia
     if Regex::new(r"^(?:pr\d+|nightly|\d+\.\d+-nightly)(?:~|$)")
         .unwrap()

src/command_api.rs renamed to src/command/api.rs

@@ -29,7 +29,7 @@ pub struct JuliaupApiGetinfoReturn {
     pub other_versions: Vec<JuliaupChannelInfo>,
 }
 
-pub fn run_command_api(command: &str, paths: &GlobalPaths) -> Result<()> {
+pub fn run(command: &str, paths: &GlobalPaths) -> Result<()> {
     if command != "getconfig1" {
         bail!("Wrong API command.");
     }

src/command_completions.rs renamed to src/command/completions.rs

@@ -1,7 +1,7 @@
 use crate::cli;
 use anyhow::Result;
 use clap::CommandFactory;
-use clap_complete::{generate, Shell};
+use clap_complete::Shell;
 use cli::CompletionShell;
 use std::io;
 
@@ -25,10 +25,8 @@ impl From<CompletionShell> for GeneratorType {
 }
 
 /// Generic completion generator that supports both standard shells and nushell
-pub fn generate_completion_for_command<T: CommandFactory>(
-    shell: CompletionShell,
-    app_name: &str,
-) -> Result<()> {
+pub fn generate<T: CommandFactory>(shell: CompletionShell, app_name: &str) -> Result<()> {
+    use clap_complete::generate;
     let mut cmd = T::command();
     let mut stdout = io::stdout().lock();
 

src/command_config_autoinstall.rs renamed to src/command/config/autoinstall.rs

@@ -1,14 +1,12 @@
-use anyhow::{anyhow, Result};
+use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
+use crate::utils::{print_juliaup_style, JuliaupMessageType};
+use anyhow::{bail, Context};
 
-pub fn run_command_config_autoinstall(
+pub fn run(
     value: Option<String>,
     quiet: bool,
     paths: &crate::global_paths::GlobalPaths,
-) -> Result<()> {
-    use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
-    use crate::utils::{print_juliaup_style, JuliaupMessageType};
-    use anyhow::Context;
-
+) -> anyhow::Result<()> {
     match value {
         Some(value_str) => {
             let mut config_file = load_mut_config_db(paths)
@@ -19,12 +17,10 @@ pub fn run_command_config_autoinstall(
                 "true" => Some(true),
                 "false" => Some(false),
                 "default" => None,
-                _ => {
-                    return Err(anyhow!(
+                _ => bail!(
                         "Invalid value '{}'. Valid values are: true, false, default (to unset the property)",
                         value_str
-                    ))
-                }
+                    ),
             };
 
             if new_value != config_file.data.settings.auto_install_channels {

src/command_config_backgroundselfupdate.rs renamed to src/command/config/background_self_update.rs

@@ -1,17 +1,13 @@
-#[cfg(feature = "selfupdate")]
+use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
 use crate::utils::{print_juliaup_style, JuliaupMessageType};
-#[cfg(feature = "selfupdate")]
-use anyhow::Result;
+use anyhow::{bail, Context};
 
-#[cfg(feature = "selfupdate")]
-pub fn run_command_config_backgroundselfupdate(
+pub fn run(
     value: Option<i64>,
     quiet: bool,
     paths: &crate::global_paths::GlobalPaths,
-) -> Result<()> {
-    use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
+) -> anyhow::Result<()> {
     use crate::operations::{install_background_selfupdate, uninstall_background_selfupdate};
-    use anyhow::{bail, Context};
 
     match value {
         Some(value) => {

src/command/config/mod.rs

@@ -0,0 +1,15 @@
+pub mod autoinstall;
+
+#[cfg(feature = "selfupdate")]
+pub mod background_self_update;
+
+#[cfg(feature = "selfupdate")]
+pub mod modify_path;
+
+#[cfg(feature = "selfupdate")]
+pub mod startup_self_update;
+
+#[cfg(not(windows))]
+pub mod symlinks;
+
+pub mod versionsdb_update;

src/command_config_modifypath.rs renamed to src/command/config/modify_path.rs

@@ -1,15 +1,15 @@
-#[cfg(feature = "selfupdate")]
-pub fn run_command_config_modifypath(
+use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
+use crate::utils::{print_juliaup_style, JuliaupMessageType};
+use anyhow::Context;
+
+pub fn run(
     value: Option<bool>,
     quiet: bool,
     paths: &crate::global_paths::GlobalPaths,
 ) -> anyhow::Result<()> {
-    use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
     use crate::operations::{
         add_binfolder_to_path_in_shell_scripts, remove_binfolder_from_path_in_shell_scripts,
     };
-    use crate::utils::{print_juliaup_style, JuliaupMessageType};
-    use anyhow::Context;
 
     match value {
         Some(value) => {

src/command_config_startupselfupdate.rs renamed to src/command/config/startup_self_update.rs

@@ -1,17 +1,12 @@
-#[cfg(feature = "selfupdate")]
+use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
 use crate::utils::{print_juliaup_style, JuliaupMessageType};
-#[cfg(feature = "selfupdate")]
-use anyhow::Result;
+use anyhow::{bail, Context};
 
-#[cfg(feature = "selfupdate")]
-pub fn run_command_config_startupselfupdate(
+pub fn run(
     value: Option<i64>,
     quiet: bool,
     paths: &crate::global_paths::GlobalPaths,
-) -> Result<()> {
-    use crate::config_file::{load_config_db, load_mut_config_db, save_config_db};
-    use anyhow::{bail, Context};
-
+) -> anyhow::Result<()> {
     match value {
         Some(value) => {
             if value < 0 {