naskya/fishctl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ensure that revision is latest in validation

Browse source
This commit is contained in:
naskya 2024-06-21 10:36:54 +09:00
parent e59f549eeb
commit ec627458d2
Signed by: naskya
GPG key ID: 712D413B3A9FED5C
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config/client.rs
View file

@ -11,6 +11,7 @@ use validator::{Validate, ValidationError};
#[derive(Deserialize, Serialize, Validate, Debug)] #[derive(Deserialize, Serialize, Validate, Debug)]
pub struct Config { pub struct Config {
#[validate(custom(function = "super::ensure_latest_revision"))]
pub config_revision: Revision, pub config_revision: Revision,
#[validate(nested)] #[validate(nested)]
pub theme: Option<Theme>, pub theme: Option<Theme>,

8
src/config/mod.rs
View file

@ -4,6 +4,7 @@ pub mod server;
use clap::ValueEnum; use clap::ValueEnum;
use enum_iterator::Sequence; use enum_iterator::Sequence;
use serde_repr::{Deserialize_repr, Serialize_repr}; use serde_repr::{Deserialize_repr, Serialize_repr};
use validator::ValidationError;
pub const SERVER_CONFIG_PATH: &str = "config/server.toml"; pub const SERVER_CONFIG_PATH: &str = "config/server.toml";
pub const CLIENT_CONFIG_PATH: &str = "config/client.toml"; pub const CLIENT_CONFIG_PATH: &str = "config/client.toml";
@ -19,3 +20,10 @@ pub enum Revision {
/// The first revision number for `config/{server,client}.toml` /// The first revision number for `config/{server,client}.toml`
V1, V1,
} }
fn ensure_latest_revision(revision: &Revision) -> Result<(), ValidationError> {
match revision.next() {
Some(_) => Err(ValidationError::new("not the latest revision")),
None => Ok(()),
}
}

1
src/config/server.rs
View file

@ -11,6 +11,7 @@ use validator::Validate;
#[derive(Deserialize, Serialize, Validate, Debug)] #[derive(Deserialize, Serialize, Validate, Debug)]
pub struct Config { pub struct Config {
#[validate(custom(function = "super::ensure_latest_revision"))]
pub config_revision: Revision, pub config_revision: Revision,
#[validate(nested)] #[validate(nested)]
pub info: Option<Info>, pub info: Option<Info>,