addonscript/addonscript-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chore: format

Browse source
This commit is contained in:
Timo Ley 2022-11-28 11:06:15 +01:00
parent 5206d56cf8
commit 21564c2ae6
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/model/src/api.rs
View file

@ -18,7 +18,7 @@ pub struct APIFile {
pub hashes: Option<Hashes>, pub hashes: Option<Hashes>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub meta: Option<Meta>, pub meta: Option<Meta>,
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct AddonDescriptor { pub struct AddonDescriptor {
@ -49,4 +49,4 @@ pub struct EnvBuilderRequest {
pub struct EnvBuilderResponse { pub struct EnvBuilderResponse {
pub addonscript: AddonScript, pub addonscript: AddonScript,
pub files: Vec<File>, pub files: Vec<File>,
} }

4
crates/model/src/enums.rs
View file

@ -9,7 +9,7 @@ pub enum Flag {
Instance, Instance,
Incompatible, Incompatible,
Launch, Launch,
Env Env,
} }
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Hash)] #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
@ -20,4 +20,4 @@ pub enum InstallAction {
Rename, Rename,
Inject, Inject,
Unknown(String), Unknown(String),
} }

19
crates/model/src/lib.rs
View file

@ -2,11 +2,14 @@ use std::collections::HashSet;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
pub use self::{enums::{Flag, InstallAction}, meta::*}; pub use self::{
enums::{Flag, InstallAction},
meta::*,
};
pub mod api; pub mod api;
pub mod meta;
pub mod enums; pub mod enums;
pub mod meta;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct Manifest { pub struct Manifest {
@ -15,7 +18,7 @@ pub struct Manifest {
pub namespace: String, pub namespace: String,
pub version: String, pub version: String,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub files : Option<Vec<File>>, pub files: Option<Vec<File>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub relations: Option<Vec<Relation>>, pub relations: Option<Vec<Relation>>,
pub flags: Flags, pub flags: Flags,
@ -60,7 +63,7 @@ pub struct Relation {
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
pub struct File { pub struct File {
pub qualifier: String, pub qualifier: String,
pub link: Vec<String>, pub link: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -101,7 +104,6 @@ impl VersionlessManifest {
} }
impl Flags { impl Flags {
pub fn has_client_flag(&self, flag: &Flag) -> bool { pub fn has_client_flag(&self, flag: &Flag) -> bool {
if let Some(flags) = &self.client { if let Some(flags) = &self.client {
if flags.contains(flag) { if flags.contains(flag) {
@ -113,7 +115,7 @@ impl Flags {
return true; return true;
} }
} }
return false; false
} }
pub fn has_server_flag(&self, flag: &Flag) -> bool { pub fn has_server_flag(&self, flag: &Flag) -> bool {
@ -127,7 +129,6 @@ impl Flags {
return true; return true;
} }
} }
return false; false
} }
}
}

4
crates/model/src/meta.rs
View file

@ -40,11 +40,11 @@ pub struct VersionMeta {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub changelog: Option<String>, pub changelog: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub timestamp:Option<u32>, pub timestamp: Option<u32>,
} }
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
pub struct Contributor { pub struct Contributor {
pub name: String, pub name: String,
pub email: String, pub email: String,
} }