refactor: cleanup, use clap over argparse & cleanup

Signed-off-by: Rachel Powers <[email protected]>

Author: Ryex

libmcmeta/Cargo.toml

@@ -7,13 +7,13 @@ edition = "2021"
 
 [dependencies]
 chrono = { version = "0.4.24", features = ["serde"] }
-custom_error = "1.9.2"
 lazy_static = "1.4.0"
 merge = "0.1.0"
 serde = { version = "1.0.160", features = ["derive"] }
 serde_json = "1.0.95"
 serde_valid = "0.15.0"
 serde_with = "2.3.2"
+thiserror = "1.0.40"
 time = { version = "0.3.20", features = ["serde-human-readable"] }
 tracing = "0.1.37"
 

libmcmeta/src/lib.rs

@@ -1,6 +1 @@
-#[macro_use]
-extern crate custom_error;
-// #[macro_use]
-// extern crate lazy_static;
-
 pub mod models;

libmcmeta/src/models/mod.rs

@@ -3,12 +3,15 @@ use serde::{Deserialize, Serialize};
 use serde_valid::Validate;
 use std::collections::HashMap;
 use std::{fmt::Display, str::FromStr};
+use thiserror::Error;
 
 pub mod forge;
 pub mod mojang;
 
-custom_error! { pub ModelError
-    InvalidGradleSpecifier { specifier: String } = "Invalid Gradle specifier '{specifier}'",
+#[derive(Error, Debug)]
+pub enum ModelError {
+    #[error("Invalid Gradle specifier '{specifier}'")]
+    InvalidGradleSpecifier { specifier: String },
 }
 
 static META_FORMAT_VERSION: i32 = 1;

mcmeta/Cargo.toml

@@ -2,16 +2,15 @@
 name = "mcmeta"
 version = "0.1.0"
 edition = "2021"
+description = "A Metadata server for Minecraft launchers and others"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 anyhow = { version = "1.0.70", features = ["backtrace"] }
-argparse = "0.2.2"
 axum = "0.6.15"
-clap = "4.2.1"
+clap = { version = "4.2.1", features = ["derive"] }
 config = "0.13.3"
-data-encoding = "2.3.3"
 dotenv = "0.15.0"
 futures = "0.3.28"
 git2 = "0.17.0"

mcmeta/src/download/errors.rs

@@ -3,8 +3,8 @@ use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum MetadataError {
-    #[error("Unable to deserialise object at {line}:{column}. Context `{ctx}` \n\nCaused by:\n\t{source}")]
-    BadData {
+    #[error("Unable to deserialise json object at {line}:{column}. Context `{ctx}` \n\nCaused by:\n\t{source}")]
+    BadJsonData {
         ctx: String,
         line: usize,
         column: usize,
@@ -14,7 +14,7 @@ pub enum MetadataError {
 
 impl MetadataError {
     pub fn from_json_err(err: serde_json::Error, body: &str) -> Self {
-        Self::BadData {
+        Self::BadJsonData {
             ctx: get_json_context_back(&err, body, 200),
             line: err.line(),
             column: err.column(),

mcmeta/src/errors.rs

@@ -6,45 +6,43 @@ use axum::{routing::get, Extension, Router};
 use tracing::{debug, info};
 
 use anyhow::Result;
-use argparse::{ArgumentParser, Store, StoreTrue};
 use dotenv::dotenv;
 use tracing_subscriber::{filter, prelude::*};
 
 mod app_config;
 mod download;
-mod errors;
 mod routes;
 mod storage;
 mod utils;
 
 #[macro_use]
 extern crate lazy_static;
 
+use clap::Parser;
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+struct CliArgs {
+    #[arg(short, long, value_name = "FILE")]
+    config: Option<String>,
+    #[arg(long)]
+    use_dotenv: bool,
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
-    let mut config_path = "".to_string();
-    let mut use_dotenv = false;
-    {
-        // limit scope of argparse borrows
-        let mut ap = ArgumentParser::new();
-        ap.set_description("A Minecraft metadata api server for Mojang and Modloader metadata.");
-        ap.refer(&mut config_path).add_option(
-            &["-c", "--config"],
-            Store,
-            "Path to a json config file.",
-        );
-        ap.refer(&mut use_dotenv).add_option(
-            &["--use-dotenv"],
-            StoreTrue,
-            "Load environment variables from a local .env",
-        );
-        ap.parse_args_or_exit();
-    }
+    let mut config_path = String::new();
+
+    let args = CliArgs::parse();
 
-    if use_dotenv {
+    if args.use_dotenv {
         dotenv().ok();
     }
 
+    if let Some(path) = args.config {
+        config_path = path;
+    }
+
     let config = Arc::new(ServerConfig::from_config(&config_path)?);
 
     let file_appender =