diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 07b851dd..af391b0d 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -1,6 +1,6 @@ use clap::{Args, Parser, Subcommand, ValueEnum}; -use crate::commands::config::config_option::ConfigOptionCli; +use crate::commands::configure::config_option::ConfigOptionCli; #[derive(Parser)] #[command(version, about, long_about = None)] diff --git a/cli/src/commands/config/config.rs b/cli/src/commands/configure/config.rs similarity index 96% rename from cli/src/commands/config/config.rs rename to cli/src/commands/configure/config.rs index abc042cd..7035332f 100644 --- a/cli/src/commands/config/config.rs +++ b/cli/src/commands/configure/config.rs @@ -1,4 +1,4 @@ -use crate::commands::config::{config_option::ConfigOption, s3::S3Config}; +use crate::commands::configure::{config_option::ConfigOption, s3::S3Config}; use log::warn; use serde::{Deserialize, Serialize}; use std::{collections::HashMap, fs}; diff --git a/cli/src/commands/config/config_option.rs b/cli/src/commands/configure/config_option.rs similarity index 91% rename from cli/src/commands/config/config_option.rs rename to cli/src/commands/configure/config_option.rs index 8e61f237..638b2a8d 100644 --- a/cli/src/commands/config/config_option.rs +++ b/cli/src/commands/configure/config_option.rs @@ -1,7 +1,7 @@ use clap::Subcommand; use serde::{Deserialize, Serialize}; -use crate::commands::config::{ +use crate::commands::configure::{ s3::{S3Config, S3ConfigCli}, server::{ServerConfig, ServerConfigCli}, }; diff --git a/cli/src/commands/config/configure.rs b/cli/src/commands/configure/configure.rs similarity index 59% rename from cli/src/commands/config/configure.rs rename to cli/src/commands/configure/configure.rs index 736aa5e9..f8240083 100644 --- a/cli/src/commands/config/configure.rs +++ b/cli/src/commands/configure/configure.rs @@ -1,4 +1,4 @@ -use crate::commands::config::config_option::ConfigOption; +use crate::commands::configure::config_option::ConfigOption; pub trait Configurable { async fn configure(self) -> anyhow::Result; diff --git a/cli/src/commands/config/interactive.rs b/cli/src/commands/configure/interactive.rs similarity index 86% rename from cli/src/commands/config/interactive.rs rename to cli/src/commands/configure/interactive.rs index f1bd1e31..d567f3f5 100644 --- a/cli/src/commands/config/interactive.rs +++ b/cli/src/commands/configure/interactive.rs @@ -8,7 +8,7 @@ macro_rules! interactive_variable { let $var = if let Some($var) = $value.$var { $var } else { - crate::commands::config::interactive::query_variable($prompt).unwrap() + crate::commands::configure::interactive::query_variable($prompt).unwrap() }; }; } @@ -18,7 +18,7 @@ macro_rules! interactive_optional_variable { let $var = if let Some($var) = $value.$var { Some($var) } else { - crate::commands::config::interactive::query_optional_variable($prompt).unwrap() + crate::commands::configure::interactive::query_optional_variable($prompt).unwrap() }; }; } diff --git a/cli/src/commands/config/mod.rs b/cli/src/commands/configure/mod.rs similarity index 100% rename from cli/src/commands/config/mod.rs rename to cli/src/commands/configure/mod.rs diff --git a/cli/src/commands/config/s3.rs b/cli/src/commands/configure/s3.rs similarity index 95% rename from cli/src/commands/config/s3.rs rename to cli/src/commands/configure/s3.rs index 6ee48304..fc037907 100644 --- a/cli/src/commands/config/s3.rs +++ b/cli/src/commands/configure/s3.rs @@ -5,7 +5,7 @@ use s3::{Bucket, Region, creds::Credentials}; use serde::{Deserialize, Serialize}; use crate::{ - commands::config::{config_option::ConfigOption, configure::Configurable}, + commands::configure::{config_option::ConfigOption, configure::Configurable}, interactive_optional_variable, interactive_variable, }; diff --git a/cli/src/commands/config/server.rs b/cli/src/commands/configure/server.rs similarity index 96% rename from cli/src/commands/config/server.rs rename to cli/src/commands/configure/server.rs index 6ba3f181..4a3eeed7 100644 --- a/cli/src/commands/config/server.rs +++ b/cli/src/commands/configure/server.rs @@ -7,7 +7,7 @@ use dialoguer::{Confirm, Input, theme::ColorfulTheme}; use reqwest::Client; use url::Url; -use crate::commands::config::{config_option::ConfigOption, configure::Configurable}; +use crate::commands::configure::{config_option::ConfigOption, configure::Configurable}; #[derive(Serialize, Deserialize, Clone)] pub struct ServerConfig { diff --git a/cli/src/commands/mod.rs b/cli/src/commands/mod.rs index 1acc25f6..db8ad986 100644 --- a/cli/src/commands/mod.rs +++ b/cli/src/commands/mod.rs @@ -1,2 +1,2 @@ -pub mod config; +pub mod configure; pub mod upload; diff --git a/cli/src/commands/upload/interface.rs b/cli/src/commands/upload/interface.rs index c5a5ece3..068961c4 100644 --- a/cli/src/commands/upload/interface.rs +++ b/cli/src/commands/upload/interface.rs @@ -2,7 +2,7 @@ use std::path::Path; use crate::{ cli::UploadInfo, - commands::config::config::Config, + commands::configure::config::Config, commands::upload::{s3::S3, uploadable::Uploadable}, manifest::generate_manifest, }; diff --git a/cli/src/commands/upload/s3.rs b/cli/src/commands/upload/s3.rs index f3ca3d79..5c348b34 100644 --- a/cli/src/commands/upload/s3.rs +++ b/cli/src/commands/upload/s3.rs @@ -1,5 +1,5 @@ use crate::{ - commands::config::s3::S3Config, + commands::configure::s3::S3Config, commands::upload::{ speedtest::{SPEEDTEST_PATH, Speedtest}, uploadable::Uploadable, diff --git a/cli/src/main.rs b/cli/src/main.rs index 21d74d78..3aaa3dc1 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -1,8 +1,8 @@ -use crate::commands::config::config_option::ConfigOptionCli; -use crate::commands::config::configure::Configurable; +use crate::commands::configure::config_option::ConfigOptionCli; +use crate::commands::configure::configure::Configurable; use crate::{ cli::{Cli, Commands}, - commands::config::config::Config, + commands::configure::config::Config, commands::upload, }; use clap::Parser;