Merge pull request #5 from Ryex/generate-mojang

Refactor: Split out storage so that is is mostly generic.

Author: cozyGalvinism

.gitignore

@@ -11,3 +11,6 @@ meta
 # dev envierment
 /.helix
 /.vscode
+
+# let this be self generated
+mcmeta/static/forge/forge-legacyinfo.json

libmcmeta/src/models/forge.rs

@@ -33,6 +33,7 @@ pub struct ForgeVersionClassifier {
     pub stash: Option<String>,
 }
 
+#[derive(Deserialize, Serialize, Clone, Debug, Validate)]
 pub enum ForgeVersionClassifierExtensions {
     Txt,
     Zip,
@@ -692,7 +693,7 @@ pub struct ForgeOptional {
 }
 
 #[derive(Deserialize, Serialize, Clone, Debug, Validate, Merge, Default)]
-pub struct ForgeInstallerProfile {
+pub struct ForgeInstallerProfileV1 {
     pub install: ForgeInstallerProfileInstallSection,
     #[serde(rename = "versionInfo")]
     pub version_info: ForgeVersionFile,
@@ -778,6 +779,13 @@ pub struct ForgeInstallerProfileV2 {
     server_jar_path: Option<String>,
 }
 
+#[derive(Deserialize, Serialize, Clone, Debug, Validate)]
+#[serde(untagged)]
+pub enum ForgeInstallerProfile {
+    V1(Box<ForgeInstallerProfileV1>),
+    V2(Box<ForgeInstallerProfileV2>),
+}
+
 #[derive(Deserialize, Serialize, Clone, Debug, Validate, Merge, Default)]
 pub struct InstallerInfo {
     pub sha1hash: Option<String>,

mcmeta/src/app_config.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use serde::Deserialize;
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "snake_case", tag = "type")]
 pub enum StorageFormat {
     Json {
@@ -11,7 +11,7 @@ pub enum StorageFormat {
     Database,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Debug, Clone)]
 pub struct MetadataConfig {
     pub max_parallel_fetch_connections: usize,
     pub static_directory: String,
@@ -46,9 +46,9 @@ impl ServerConfig {
             .set_default("debug_log.path", "./logs")?
             .set_default("debug_log.prefix", "mcmeta.log")?
             .set_default("debug_log.level", "debug")?
-            // optionaly oad config from a file. this is optional though
+            // optionally add config from a file. this is optional though
             .add_source(config::File::from(std::path::Path::new(path)).required(false))
-            // envierment overrides file
+            // environment overrides file
             .add_source(config::Environment::with_prefix("mcmeta").separator("__"))
             .build()?;
 

mcmeta/src/main.rs

@@ -75,7 +75,7 @@ async fn main() -> Result<()> {
 
     config
         .storage_format
-        .initialize_metadata(&config.metadata)
+        .update_upstream_metadata(&config.metadata)
         .await?;
 
     let raw_mojang_routes = Router::new()