more stuff

src/api/app/mod.rs

@@ -1,6 +1,8 @@
 use std::sync::Arc;
 
 use anyhow::{Context, Result};
+use reqwest::Url;
+use serde::de::DeserializeOwned;
 use tokio::sync::RwLock;
 
 use super::models::{network::Network, Addon, server::Server};
@@ -16,10 +18,10 @@ pub const APP_USER_AGENT: &str = concat!(
 );
 
 pub struct App {
-    http_client: reqwest::Client,
-    server: Option<Arc<RwLock<Server>>>,
-    network: Option<Arc<RwLock<Network>>>,
-    ci: bool,
+    pub http_client: reqwest::Client,
+    pub server: Option<Arc<RwLock<Server>>>,
+    pub network: Option<Arc<RwLock<Network>>>,
+    pub ci: bool,
 }
 
 impl App {
@@ -37,6 +39,17 @@ impl App {
         })
     }
 
+    pub async fn http_get_json<T: DeserializeOwned>(&self, url: impl Into<Url>) -> Result<T> {
+        Ok(self.http_client
+            .get(url.into())
+            .send()
+            .await?
+            .error_for_status()?
+            .json()
+            .await?
+        )
+    }
+
     pub async fn collect_addons(&self) -> Result<Vec<Addon>> {
         let mut addons = vec![];
 

src/api/mod.rs

@@ -2,3 +2,4 @@ pub mod models;
 pub mod app;
 pub mod tools;
 pub mod utils;
+pub mod sources;

src/api/models/addon/mod.rs

@@ -1,7 +1,5 @@
 mod addon;
-mod addon_source;
 mod addon_type;
 
 pub use addon::*;
-pub use addon_source::*;
 pub use addon_type::*;

src/api/models/lockfile/mod.rs

@@ -0,0 +1,3 @@
+pub struct Lockfile {
+
+}

src/api/models/mod.rs

@@ -1,15 +1,18 @@
 mod modpack_source;
 mod step;
 mod env;
+mod source;
 
 pub mod addon;
 pub mod packwiz;
 pub mod mrpack;
 pub mod unsup;
 pub mod network;
 pub mod server;
+pub mod lockfile;
 
 pub use modpack_source::*;
 pub use step::*;
 pub use addon::*;
 pub use env::*;
+pub use source::*;

src/api/models/mrpack/mod.rs

@@ -0,0 +1,27 @@
+pub const MRPACK_INDEX_FILE: &str = "modrinth.index.json";
+
+mod mrpack_index;
+mod mrpack_file;
+
+use anyhow::Result;
+pub use mrpack_index::*;
+pub use mrpack_file::*;
+
+use crate::api::{app::App, utils::accessor::Accessor};
+
+use super::Addon;
+
+pub async fn resolve_mrpack_addons(
+    app: &App,
+    accessor: Accessor,
+) -> Result<Vec<Addon>> {
+
+
+    todo!()
+}
+
+impl MRPackFile {
+    pub async fn into_addon(&self) -> Result<Addon> {
+        todo!()
+    }
+}

src/api/models/mrpack/mrpack_file.rs

@@ -0,0 +1,27 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct MRPackFile {
+    path: String,
+    hashes: HashMap<String, String>,
+    env: Option<Env>,
+    file_size: u64,
+    downloads: Vec<String>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Env {
+    pub client: EnvSupport,
+    pub server: EnvSupport,
+}
+
+#[derive(Debug, Deserialize, Serialize, PartialEq, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum EnvSupport {
+    Required,
+    Optional,
+    Unsupported,
+}

src/api/models/mrpack/mrpack_index.rs

@@ -0,0 +1,16 @@
+use std::collections::HashMap;
+
+use serde::{Deserialize, Serialize};
+
+use super::MRPackFile;
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct MRPackIndex {
+    pub game: String,
+    pub name: String,
+    pub version_id: String,
+    pub summary: Option<String>,
+    pub files: Vec<MRPackFile>,
+    pub dependencies: HashMap<String, String>,
+}

src/api/models/server/mod.rs

@@ -1,6 +1,6 @@
 use serde::{Serialize, Deserialize};
 
-use super::AddonSource;
+use super::Source;
 
 mod server_type;
 mod server_flavor;
@@ -14,7 +14,7 @@ pub struct Server {
     pub name: String,
     pub port: Option<i32>,
 
-    pub sources: Vec<AddonSource>,
+    pub sources: Vec<Source>,
 }
 
 impl Default for Server {

src/api/models/addon/addon_source.rs → src/api/models/source.rs

@@ -5,7 +5,8 @@ use crate::api::{app::App, models::ModpackSource};
 use super::Addon;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub enum AddonSource {
+#[serde(tag = "type", rename_all = "lowercase")]
+pub enum Source {
     File {
         path: String,
     },
@@ -15,22 +16,23 @@ pub enum AddonSource {
     },
 
     Modpack {
+        #[serde(flatten)]
         modpack: ModpackSource,
     },
 }
 
-impl AddonSource {
+impl Source {
     pub async fn resolve(&self, app: &App) -> Result<Vec<Addon>> {
         match self {
-            AddonSource::File { path } => {
+            Source::File { path } => {
                 Ok(vec![])
             }
 
-            AddonSource::Folder { path } => {
+            Source::Folder { path } => {
                 Ok(vec![])
             }
 
-            AddonSource::Modpack { modpack } => {
+            Source::Modpack { modpack } => {
                 Ok(vec![])
             }
         }

src/api/models/step.rs

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
 
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
@@ -18,20 +18,18 @@ pub enum Step {
     Execute,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(tag = "type")]
 pub enum CacheStrategy {
     File {
-        namespace: String,
+        namespace: Cow<'static, str>,
         path: String,
     },
     Indexed {
-        index_path: String,
+        namespace: Cow<'static, str>,
+        path: Option<String>,
         key: String,
-        value: String,
     },
-    #[default]
-    None,
 }
 
 pub enum StepResult {

src/api/sources/mod.rs

@@ -0,0 +1,33 @@
+use std::collections::HashMap;
+
+use anyhow::Result;
+
+use super::{app::App, models::{CacheStrategy, Step}, utils::url::get_filename_from_url};
+
+pub mod vanilla;
+
+pub async fn resolve_steps_for_url(
+    app: &App,
+    url: impl Into<String>,
+    filename: Option<String>,
+) -> Result<Vec<Step>> {
+    let url: String = url.into();
+
+    let filename = filename.unwrap_or_else(|| {
+        get_filename_from_url(&url)
+    });
+
+    Ok(vec![
+        Step::CacheCheck(CacheStrategy::Indexed {
+            namespace: "url".into(),
+            path: None,
+            key: url.clone(),
+        }),
+        Step::Download {
+            url: url.into(),
+            filename,
+            size: None,
+            hashes: HashMap::new(),
+        }
+    ])
+}

src/api/sources/vanilla/mod.rs

@@ -0,0 +1,7 @@
+use crate::api::app::App;
+
+pub struct VanillaAPI<'a>(pub &'a App);
+
+impl<'a> VanillaAPI<'a> {
+
+}

src/api/utils/accessor.rs

@@ -1,10 +1,36 @@
-use std::path::PathBuf;
+use std::{ffi::OsString, fs::DirEntry, io::{Read, Seek}, path::PathBuf};
+
+use anyhow::{anyhow, Result};
+use serde::de::DeserializeOwned;
+use zip::ZipArchive;
+
+use crate::api::app::App;
+
+pub trait ReadSeek: std::io::Read + Seek {}
 
 pub enum Accessor {
     Local(PathBuf),
     Remote(reqwest::Url),
+    Zip(ZipArchive<Box<dyn ReadSeek>>),
 }
 
 impl Accessor {
-
+    pub async fn dir(&self) -> Result<Vec<String>> {
+        match self {
+            Accessor::Zip(zip) => Ok(zip.file_names().map(ToOwned::to_owned).collect()),
+            Accessor::Local(path) => Ok(path.read_dir()?
+                .filter_map(|r| r.ok())
+                .map(|n| n.file_name().to_string_lossy().into_owned())
+                .collect()),
+            Accessor::Remote(_) => Err(anyhow!("cannot dir() Accessor::Remote")),
+        }
+    }
+
+    pub async fn json<T: DeserializeOwned>(&mut self, app: &App, path: &str) -> Result<T> {
+        match self {
+            Accessor::Local(base) => Ok(serde_json::from_reader(std::fs::File::open(base.join(path))?)?),
+            Accessor::Zip(zip) => Ok(serde_json::from_reader(zip.by_name(path)?)?),
+            Accessor::Remote(url) => Ok(app.http_get_json(url.join(path)?).await?),
+        }
+    }
 }

src/api/utils/mod.rs

@@ -1,3 +1,4 @@
 pub mod hashing;
 pub mod accessor;
 pub mod serde;
+pub mod url;

src/api/utils/url.rs

@@ -0,0 +1,4 @@
+pub fn get_filename_from_url(url: &str) -> String {
+    let url_clean = url.split(&['?', '#'][..]).next().unwrap();
+    url_clean.split('/').last().unwrap().to_string()
+}

src/commands/mod.rs

@@ -1 +1,2 @@
 pub mod init;
+pub mod build;