Merge pull request #3 from FxQnLr/new_input

New input, fuck it

1 files changed, 10 insertions, 6 deletions

diff --git a/src/apis/modrinth.rs b/src/apis/modrinth.rs
index 78073e6..36ab5df 100644
--- a/src/apis/modrinth.rs
+++ b/src/apis/modrinth.rs
@@ -1,9 +1,8 @@
-use std::io::{Error, ErrorKind};
 use chrono::{DateTime, FixedOffset};
 use reqwest::Client;
 use serde::Deserialize;
 
-use crate::{Modloader, List};
+use crate::{Modloader, List, error::{MLE, MLError, ErrorType}};
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct Project {
@@ -142,7 +141,7 @@ pub async fn project(api: String, name: &str) -> Project {
 }
 
 pub async fn projects(api: String, ids: Vec<String>) -> Vec<Project> {
-    println!("Getting versions for all mods from modrinth");
+    println!("\tGet versions from modrinth\n");
     let all = ids.join(r#"",""#);
     let url = format!(r#"projects?ids=["{}"]"#, all);
 
@@ -177,9 +176,9 @@ pub async fn get_raw_versions(api: String, versions: Vec<String>) -> Vec<Version
     serde_json::from_slice(&data).unwrap()
 }
 
-pub fn extract_current_version(versions: Vec<Version>) -> Result<String, Box<dyn std::error::Error>> {
+pub fn extract_current_version(versions: Vec<Version>) -> MLE<String> {
     match versions.len() {
-        0 => Err(Box::new(Error::new(ErrorKind::NotFound, "NO_VERSIONS_AVAILABLE"))),
+        0 => Err(MLError::new(ErrorType::ModError, "NO_VERSIONS_AVAILABLE")),
         1.. => {
             let mut times: Vec<(String, DateTime<FixedOffset>)> = vec![];
             for ver in versions {
@@ -188,7 +187,7 @@ pub fn extract_current_version(versions: Vec<Version>) -> Result<String, Box<dyn
             }
             times.sort_by_key(|t| t.1);
             times.reverse();
-            println!("Current Version: {}", times[0].0);
+            println!("\t └New current version: {}", times[0].0);
             Ok(times[0].0.to_string())
         },
         _ => panic!("available_versions should never be negative"),
@@ -198,6 +197,7 @@ pub fn extract_current_version(versions: Vec<Version>) -> Result<String, Box<dyn
 pub enum MCVersionType {
     Release,
     Latest,
+    Specific,
 }
 
 #[derive(Debug, Deserialize)]
@@ -220,6 +220,10 @@ pub async fn get_minecraft_version(api: String, version: MCVersionType) -> Strin
             &mc_versions[i]
         },
         MCVersionType::Latest => &mc_versions[0],
+        MCVersionType::Specific => {
+            println!("Not inplemented");
+            &mc_versions[0]
+        }
     };
     String::from(&ver.version)
 }