Merge pull request 'config' (#4) from config into master

Reviewed-on: http://raspberrypi.fritz.box:7920/fx/modlist/pulls/4

1 files changed, 28 insertions, 47 deletions

diff --git a/src/apis/modrinth.rs b/src/apis/modrinth.rs
index 9afe7f3..525cc0d 100644
--- a/src/apis/modrinth.rs
+++ b/src/apis/modrinth.rs
@@ -1,10 +1,10 @@
 use chrono::{DateTime, FixedOffset};
 use reqwest::Client;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     error::{ErrorType, MLError, MLE},
-    List, Modloader,
+    List,
 };
 
 #[derive(Debug, Deserialize, Clone)]
@@ -113,7 +113,24 @@ pub struct Hash {
     pub sha1: String,
 }
 
-async fn get(api: &str, path: String) -> Result<Option<Vec<u8>>, Box<dyn std::error::Error>> {
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct GameVersion {
+    pub version: String,
+    pub version_type: GameVersionType,
+    pub date: String,
+    pub major: bool,
+}
+
+#[allow(non_camel_case_types)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub enum GameVersionType {
+    release,
+    snapshot,
+    alpha,
+    beta
+}
+
+async fn get(api: &str, path: &str) -> Result<Option<Vec<u8>>, Box<dyn std::error::Error>> {
     let url = format!(r#"{}{}"#, api, path);
 
     let client = Client::builder()
@@ -135,7 +152,7 @@ async fn get(api: &str, path: String) -> Result<Option<Vec<u8>>, Box<dyn std::er
 
 pub async fn project(api: &str, name: &str) -> Project {
     let url = format!("project/{}", name);
-    let data = get(api, url).await.unwrap().unwrap();
+    let data = get(api, &url).await.unwrap().unwrap();
 
     serde_json::from_slice(&data).unwrap()
 }
@@ -144,24 +161,19 @@ pub async fn projects(api: &str, ids: Vec<String>) -> Vec<Project> {
     let all = ids.join(r#"",""#);
     let url = format!(r#"projects?ids=["{}"]"#, all);
 
-    let data = get(api, url).await.unwrap().unwrap();
+    let data = get(api, &url).await.unwrap().unwrap();
 
     serde_json::from_slice(&data).unwrap()
 }
 
 ///Get applicable versions from mod_id with list context
 pub async fn versions(api: &str, id: String, list: List) -> Vec<Version> {
-    let loaderstr = match list.modloader {
-        Modloader::Forge => String::from("forge"),
-        Modloader::Fabric => String::from("fabric"),
-    };
-
     let url = format!(
         r#"project/{}/version?loaders=["{}"]&game_versions=["{}"]"#,
-        id, loaderstr, list.mc_version
+        id, list.modloader.to_string(), list.mc_version
     );
 
-    let data = get(api, url).await.unwrap();
+    let data = get(api, &url).await.unwrap();
 
     match data {
         Some(data) => serde_json::from_slice(&data).unwrap(),
@@ -173,7 +185,7 @@ pub async fn versions(api: &str, id: String, list: List) -> Vec<Version> {
 pub async fn get_raw_versions(api: &str, versions: Vec<String>) -> Vec<Version> {
     let url = format!(r#"versions?ids=["{}"]"#, versions.join(r#"",""#));
 
-    let data = get(api, url).await.unwrap().unwrap();
+    let data = get(api, &url).await.unwrap().unwrap();
 
     serde_json::from_slice(&data).unwrap()
 }
@@ -195,39 +207,8 @@ pub fn extract_current_version(versions: Vec<Version>) -> MLE<String> {
     }
 }
 
-pub enum MCVersionType {
-    Release,
-    Latest,
-    Specific,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct MCVersion {
-    pub version: String,
-    pub version_type: String,
-    pub date: String,
-    pub major: bool,
-}
+pub async fn get_game_versions() -> Vec<GameVersion> {
+    let data = get("https://api.modrinth.com/v2/", "tag/game_version").await.unwrap().unwrap();
 
-pub async fn get_minecraft_version(api: &str, version: MCVersionType) -> String {
-    let data = get(api, String::from("tag/game_version"))
-        .await
-        .unwrap()
-        .unwrap();
-    let mc_versions: Vec<MCVersion> = serde_json::from_slice(&data).unwrap();
-    let ver = match version {
-        MCVersionType::Release => {
-            let mut i = 0;
-            while !mc_versions[i].major {
-                i += 1;
-            }
-            &mc_versions[i]
-        }
-        MCVersionType::Latest => &mc_versions[0],
-        MCVersionType::Specific => {
-            println!("Not inplemented");
-            &mc_versions[0]
-        }
-    };
-    String::from(&ver.version)
+    serde_json::from_slice(&data).unwrap()
 }