Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add hosting settings to the manifest #1208

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Add hosting settings to the manifest #1208

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions shared_crates/package/src/manifest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ pub struct Manifest {
pub includes: HashMap<SnakeCaseIdentifier, PathBuf>,
#[serde(default)]
pub dependencies: IndexMap<SnakeCaseIdentifier, Dependency>,
#[serde(default)]
pub hosting: Hosting,
}
impl Manifest {
pub fn parse(manifest: &str) -> Result<Self, ManifestParseError> {
Expand Down Expand Up @@ -258,6 +260,27 @@ impl Dependency {
}
}

#[derive(Deserialize, Clone, Debug, Default, PartialEq, Serialize)]
pub struct Hosting {
/// The region to host in
#[serde(default)]
pub region: Region,
/// The maximum number of players that can be connected at once (0 = unlimited)
#[serde(default)]
pub max_players: usize,
}

#[derive(Deserialize, Clone, Debug, Default, PartialEq, Serialize)]
pub enum Region {
/// Automatically select the best region based on the player's location
#[default]
Auto,
/// Always use the EU region
EU,
/// Always use the US region
US,
}

#[cfg(test)]
mod tests {
use std::path::PathBuf;
Expand Down Expand Up @@ -381,10 +404,7 @@ mod tests {
}
}
)]),
messages: Default::default(),
enums: Default::default(),
includes: Default::default(),
dependencies: Default::default(),
..Default::default()
})
)
}
Expand Down Expand Up @@ -568,10 +588,7 @@ mod tests {
}
}
)]),
messages: Default::default(),
enums: Default::default(),
includes: Default::default(),
dependencies: Default::default(),
..Default::default()
}
);

Expand Down Expand Up @@ -618,10 +635,6 @@ mod tests {
version: Version::parse("0.0.1").unwrap(),
..Default::default()
},
build: Build::default(),
components: Default::default(),
concepts: Default::default(),
messages: Default::default(),
enums: IndexMap::from_iter([(
pci("CellState"),
Enum {
Expand All @@ -632,8 +645,7 @@ mod tests {
])
}
)]),
includes: Default::default(),
dependencies: Default::default(),
..Default::default()
})
)
}
Expand Down Expand Up @@ -706,11 +718,7 @@ mod tests {
}
)
]),
concepts: Default::default(),
messages: Default::default(),
enums: Default::default(),
includes: Default::default(),
dependencies: Default::default(),
..Default::default()
})
)
}
Expand Down Expand Up @@ -741,12 +749,6 @@ mod tests {
version: Version::parse("0.0.1").unwrap(),
..Default::default()
},
build: Default::default(),
components: Default::default(),
concepts: Default::default(),
messages: Default::default(),
enums: Default::default(),
includes: Default::default(),
dependencies: IndexMap::from_iter([
(
sci("deps_assets"),
Expand Down Expand Up @@ -780,7 +782,8 @@ mod tests {
enabled: None,
}
)
])
]),
..Default::default()
})
)
}
Expand Down
Loading