Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clap-fix' into 'master'

Browse Source 
Yse correct clap macro

See merge request veloren/veloren!3917
This commit is contained in:
Marcel 2023-05-05 13:10:37 +00:00
commit 59f12ef110
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/src/comp/admin.rs
View File

@ -12,6 +12,29 @@ pub enum AdminRole {
Admin = 1,
}
impl core::str::FromStr for AdminRole {
type Err = &'static str;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
"mod" | "moderator" => Ok(AdminRole::Moderator),
"admin" => Ok(AdminRole::Admin),
_ => Err("Could not parse AdminRole"),
}
}
}
impl ToString for AdminRole {
fn to_string(&self) -> String {
match self {
AdminRole::Moderator => "moderator",
AdminRole::Admin => "admin",
}
.into()
}
}
#[derive(Copy, Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
pub struct Admin(pub AdminRole);

7
server-cli/src/cli.rs
View File

@ -2,7 +2,6 @@ use clap::Parser;
use common::comp;
use server::persistence::SqlLogMode;
use std::sync::mpsc::Sender;
use strum::VariantNames;
use tracing::error;
#[derive(Clone, Debug, Parser)]
@ -12,7 +11,7 @@ pub enum Admin {
/// Name of the admin to whom to assign a role
username: String,
/// role to assign to the admin
#[arg(ignore_case = true, value_parser = clap::builder::PossibleValuesParser::new(comp::AdminRole::VARIANTS))]
#[arg(ignore_case = true, value_parser = clap::value_parser!(comp::AdminRole))]
role: comp::AdminRole,
},
Remove {
@ -63,7 +62,7 @@ pub enum Message {
},
/// Enable or disable sql logging
SqlLogMode {
#[arg(default_value_t, value_parser = SqlLogMode::variants())]
#[arg(default_value_t, value_parser = clap::value_parser!(SqlLogMode))]
mode: SqlLogMode,
},
/// Disconnects all connected clients
@ -110,7 +109,7 @@ pub struct ArgvApp {
#[arg(long)]
/// Run without auth enabled
pub no_auth: bool,
#[arg(default_value_t, long, short, value_parser = SqlLogMode::variants())]
#[arg(default_value_t, long, short, value_parser = clap::value_parser!(SqlLogMode))]
/// Enables SQL logging
pub sql_log_mode: SqlLogMode,
#[command(subcommand)]