mirror of
https://github.com/Drop-OSS/drop.git
synced 2026-07-26 09:44:40 +10:00
refactor: Rename commands/config to commands/configure
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
use clap::{Args, Parser, Subcommand, ValueEnum};
|
use clap::{Args, Parser, Subcommand, ValueEnum};
|
||||||
|
|
||||||
use crate::commands::config::config_option::ConfigOptionCli;
|
use crate::commands::configure::config_option::ConfigOptionCli;
|
||||||
|
|
||||||
#[derive(Parser)]
|
#[derive(Parser)]
|
||||||
#[command(version, about, long_about = None)]
|
#[command(version, about, long_about = None)]
|
||||||
|
|||||||
@@ -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 log::warn;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{collections::HashMap, fs};
|
use std::{collections::HashMap, fs};
|
||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
use clap::Subcommand;
|
use clap::Subcommand;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::commands::config::{
|
use crate::commands::configure::{
|
||||||
s3::{S3Config, S3ConfigCli},
|
s3::{S3Config, S3ConfigCli},
|
||||||
server::{ServerConfig, ServerConfigCli},
|
server::{ServerConfig, ServerConfigCli},
|
||||||
};
|
};
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::commands::config::config_option::ConfigOption;
|
use crate::commands::configure::config_option::ConfigOption;
|
||||||
|
|
||||||
pub trait Configurable {
|
pub trait Configurable {
|
||||||
async fn configure(self) -> anyhow::Result<ConfigOption>;
|
async fn configure(self) -> anyhow::Result<ConfigOption>;
|
||||||
@@ -8,7 +8,7 @@ macro_rules! interactive_variable {
|
|||||||
let $var = if let Some($var) = $value.$var {
|
let $var = if let Some($var) = $value.$var {
|
||||||
$var
|
$var
|
||||||
} else {
|
} 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 {
|
let $var = if let Some($var) = $value.$var {
|
||||||
Some($var)
|
Some($var)
|
||||||
} else {
|
} else {
|
||||||
crate::commands::config::interactive::query_optional_variable($prompt).unwrap()
|
crate::commands::configure::interactive::query_optional_variable($prompt).unwrap()
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@ use s3::{Bucket, Region, creds::Credentials};
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
commands::config::{config_option::ConfigOption, configure::Configurable},
|
commands::configure::{config_option::ConfigOption, configure::Configurable},
|
||||||
interactive_optional_variable, interactive_variable,
|
interactive_optional_variable, interactive_variable,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@ use dialoguer::{Confirm, Input, theme::ColorfulTheme};
|
|||||||
use reqwest::Client;
|
use reqwest::Client;
|
||||||
use url::Url;
|
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)]
|
#[derive(Serialize, Deserialize, Clone)]
|
||||||
pub struct ServerConfig {
|
pub struct ServerConfig {
|
||||||
@@ -1,2 +1,2 @@
|
|||||||
pub mod config;
|
pub mod configure;
|
||||||
pub mod upload;
|
pub mod upload;
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ use std::path::Path;
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
cli::UploadInfo,
|
cli::UploadInfo,
|
||||||
commands::config::config::Config,
|
commands::configure::config::Config,
|
||||||
commands::upload::{s3::S3, uploadable::Uploadable},
|
commands::upload::{s3::S3, uploadable::Uploadable},
|
||||||
manifest::generate_manifest,
|
manifest::generate_manifest,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
commands::config::s3::S3Config,
|
commands::configure::s3::S3Config,
|
||||||
commands::upload::{
|
commands::upload::{
|
||||||
speedtest::{SPEEDTEST_PATH, Speedtest},
|
speedtest::{SPEEDTEST_PATH, Speedtest},
|
||||||
uploadable::Uploadable,
|
uploadable::Uploadable,
|
||||||
|
|||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
use crate::commands::config::config_option::ConfigOptionCli;
|
use crate::commands::configure::config_option::ConfigOptionCli;
|
||||||
use crate::commands::config::configure::Configurable;
|
use crate::commands::configure::configure::Configurable;
|
||||||
use crate::{
|
use crate::{
|
||||||
cli::{Cli, Commands},
|
cli::{Cli, Commands},
|
||||||
commands::config::config::Config,
|
commands::configure::config::Config,
|
||||||
commands::upload,
|
commands::upload,
|
||||||
};
|
};
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
|
|||||||
Reference in New Issue
Block a user