Add rustfmt hook script, allow for raw Mojang querying

Author: cozyGalvinism

README.md

@@ -28,16 +28,16 @@ under GPL-3.0-only.
 Eventually, mcmeta should implement at least the following goals:
 
 - [ ] Fetching metadata
-  - [ ] Minecraft
+  - [x] Minecraft
   - [ ] Forge
   - [ ] Liteloader
   - [ ] Fabric
   - [ ] Quilt
 - Storing metadata
-  - [ ] JSON
+  - [x] JSON
   - [ ] Database
 - [ ] Offering metadata
-  - [ ] Minecraft
+  - [x] Minecraft
   - [ ] Forge
   - [ ] Liteloader
   - [ ] Fabric

libmcmeta/src/lib.rs

@@ -3,9 +3,4 @@ extern crate custom_error;
 #[macro_use]
 extern crate lazy_static;
 
-lazy_static! {
-    
-}
-
-mod validations;
-pub mod models;
+pub mod models;

libmcmeta/src/models/mod.rs

@@ -1,6 +1,6 @@
-use std::{str::FromStr, fmt::Display};
+use std::{fmt::Display, str::FromStr};
 
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
 pub mod mojang;
 
@@ -9,7 +9,7 @@ custom_error! { pub ModelError
 }
 
 /// A Gradle specifier.
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Eq, Clone)]
 pub struct GradleSpecifier {
     /// Group of the artifact.
     pub group: String,
@@ -48,7 +48,7 @@ impl GradleSpecifier {
     pub fn base(&self) -> String {
         format!(
             "{}/{}/{}",
-            self.group.replace(".", "/"),
+            self.group.replace('.', "/"),
             self.artifact,
             self.version
         )
@@ -91,7 +91,7 @@ impl FromStr for GradleSpecifier {
             .collect::<Vec<&str>>();
 
         let group = components
-            .get(0)
+            .first()
             .ok_or(ModelError::InvalidGradleSpecifier {
                 specifier: s.to_string(),
             })?
@@ -114,19 +114,18 @@ impl FromStr for GradleSpecifier {
             extension = Some(at_split[1].to_string());
         }
 
-        let classifier: Option<String>;
-        if components.len() == 4 {
-            classifier = Some(
+        let classifier = if components.len() == 4 {
+            Some(
                 components
                     .get(3)
                     .ok_or(ModelError::InvalidGradleSpecifier {
                         specifier: s.to_string(),
                     })?
                     .to_string(),
-            );
+            )
         } else {
-            classifier = None;
-        }
+            None
+        };
 
         Ok(GradleSpecifier {
             group,
@@ -183,4 +182,4 @@ impl<'de> Deserialize<'de> for GradleSpecifier {
         let s = String::deserialize(deserializer)?;
         s.parse().map_err(serde::de::Error::custom)
     }
-}
+}

libmcmeta/src/models/mojang.rs

@@ -1,6 +1,6 @@
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MojangVersionManifest {
     /// The latest version of Minecraft.
@@ -10,7 +10,7 @@ pub struct MojangVersionManifest {
 }
 
 /// The latest version of Minecraft.
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MojangVersionManifestLatest {
     /// The latest release version of Minecraft.
@@ -20,7 +20,7 @@ pub struct MojangVersionManifestLatest {
 }
 
 /// A version of Minecraft.
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MojangVersionManifestVersion {
     /// The ID of the version.
@@ -38,7 +38,7 @@ pub struct MojangVersionManifestVersion {
     pub compliance_level: i32,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct AssetIndex {
     pub id: String,
@@ -48,29 +48,29 @@ pub struct AssetIndex {
     pub url: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionDownload {
     pub sha1: String,
     pub size: i32,
     pub url: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionDownloads {
     pub client: VersionDownload,
     pub server: Option<VersionDownload>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct JavaVersion {
     pub component: String,
     pub major_version: i32,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibraryDownloadInfo {
     pub path: String,
@@ -79,7 +79,7 @@ pub struct VersionLibraryDownloadInfo {
     pub url: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibraryClassifiers {
     pub javadoc: Option<VersionLibraryDownloadInfo>,
@@ -92,28 +92,28 @@ pub struct VersionLibraryClassifiers {
     pub sources: Option<VersionLibraryDownloadInfo>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibraryNatives {
     pub linux: Option<String>,
     pub osx: Option<String>,
     pub windows: Option<String>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibraryDownloads {
     pub artifact: Option<VersionLibraryDownloadInfo>,
     pub classifiers: Option<VersionLibraryClassifiers>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibraryExtract {
     pub exclude: Vec<String>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLibrary {
     pub name: String,
@@ -123,36 +123,36 @@ pub struct VersionLibrary {
     pub rules: Option<Vec<ManifestRule>>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct ManifestRule {
     pub action: String,
     pub os: Option<ManifestRuleOS>,
     pub features: Option<ManifestRuleFeatures>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct ManifestRuleFeatures {
     pub is_demo_user: Option<bool>,
     pub has_custom_resolution: Option<bool>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct ManifestRuleOS {
     pub name: Option<String>,
     pub version: Option<String>,
     pub arch: Option<String>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLogging {
     pub client: VersionLoggingClient,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLoggingClient {
     pub argument: String,
@@ -161,7 +161,7 @@ pub struct VersionLoggingClient {
     pub logging_type: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionLoggingClientFile {
     pub id: String,
@@ -170,35 +170,35 @@ pub struct VersionLoggingClientFile {
     pub url: String,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(untagged)]
 pub enum VersionArgument {
     String(String),
     Object(VersionArgumentObject),
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(untagged)]
 pub enum VersionArgumentValue {
     String(String),
     Array(Vec<String>),
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionArgumentObject {
     pub rules: Vec<ManifestRule>,
     pub value: VersionArgumentValue,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct VersionArguments {
     pub game: Vec<VersionArgument>,
     pub jvm: Vec<VersionArgument>,
 }
 
-#[derive(Deserialize, Debug)]
+#[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MinecraftVersion {
     pub asset_index: AssetIndex,
@@ -244,9 +244,13 @@ mod tests {
                     &std::fs::read_to_string(path).unwrap(),
                 );
                 if let Err(e) = version {
-                    panic!("Failed to deserialize version {}: {:?}", entry.file_name().to_str().unwrap(), e);
+                    panic!(
+                        "Failed to deserialize version {}: {:?}",
+                        entry.file_name().to_str().unwrap(),
+                        e
+                    );
                 }
             }
         }
     }
-}
+}

libmcmeta/src/validations.rs

@@ -6,8 +6,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+axum = "0.5.17"
 clap = "4.0.18"
 config = "0.13.2"
+custom_error = "1.9.2"
 git2 = "0.15.0"
+hyper = "0.14.20"
 libmcmeta = { path = "../libmcmeta" }
+reqwest = { version = "0.11.12", features = ["json"] }
+serde = { version = "1.0.147", features = ["derive"] }
+serde_json = "1.0.87"
 tokio = { version = "1.21.2", features = ["full"] }
+tracing = "0.1.37"
+tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

mcmeta/Cargo.toml

@@ -0,0 +1 @@
+pub mod mojang;