impl Source::File

src/api/models/addon/holders.rs

@@ -0,0 +1,42 @@
+use serde::{Deserialize, Serialize};
+
+use super::{Addon, AddonTarget, AddonType};
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct AddonListFile {
+    #[serde(default = "Vec::new")]
+    pub addons: Vec<Addon>,
+
+    // backwards compatability
+    #[serde(default = "Vec::new")]
+    pub mods: Vec<AddonType>,
+    #[serde(default = "Vec::new")]
+    pub plugins: Vec<AddonType>,
+}
+
+impl AddonListFile {
+    pub fn flatten(self) -> Vec<Addon> {
+        [
+            self.addons,
+            self.mods
+                .into_iter()
+                .map(|addon_type| {
+                    Addon {
+                        environment: None,
+                        addon_type,
+                        target: AddonTarget::Mod,
+                    }
+                })
+                .collect(),
+            self.plugins
+                .into_iter()
+                .map(|addon_type| {
+                    Addon {
+                        environment: None,
+                        addon_type,
+                        target: AddonTarget::Plugin,
+                    }
+                }).collect()
+        ].concat()
+    }
+}

src/api/models/addon/mod.rs

@@ -2,8 +2,10 @@ mod addon;
 mod addon_metadata;
 mod addon_target;
 mod addon_type;
+mod holders;
 
 pub use addon::*;
 pub use addon_metadata::*;
 pub use addon_target::*;
 pub use addon_type::*;
+pub use holders::*;

src/api/models/source.rs

@@ -1,8 +1,10 @@
+use std::path::PathBuf;
+
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
 
-use super::{mrpack::resolve_mrpack_addons, packwiz::resolve_packwiz_addons, Addon, ModpackType};
-use crate::api::{app::App, models::ModpackSource};
+use super::{mrpack::resolve_mrpack_addons, packwiz::resolve_packwiz_addons, Addon, AddonListFile, ModpackType};
+use crate::api::{app::App, models::ModpackSource, utils::read_toml};
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
 #[serde(tag = "type", rename_all = "lowercase")]
@@ -24,7 +26,14 @@ pub enum Source {
 impl Source {
     pub async fn resolve_addons(&self, app: &App) -> Result<Vec<Addon>> {
         match self {
-            Source::File { path } => Ok(vec![]),
+            Source::File { path } => {
+                let file: AddonListFile = read_toml(&PathBuf::from(if path.ends_with(".toml") {
+                    path.clone()
+                } else {
+                    format!("{path}.toml")
+                }))?;
+                Ok(file.flatten())
+            },
 
             Source::Folder { path } => Ok(vec![]),
 

src/api/utils/mod.rs

@@ -27,9 +27,13 @@ pub fn try_find_toml_upwards<T: DeserializeOwned>(filename: &str) -> Result<Opti
         }
     };
 
-    let data: T = toml::from_str(&std::fs::read_to_string(&found_path)?)?;
+    read_toml(&found_path).map(|data| Some((found_path, data)))
+}
+
+pub fn read_toml<T: DeserializeOwned>(path: &Path) -> Result<T> {
+    let data: T = toml::from_str(&std::fs::read_to_string(&path)?)?;
 
-    Ok(Some((found_path, data)))
+    Ok(data)
 }
 
 pub fn write_toml<T: Serialize>(path: &Path, filename: &str, value: &T) -> Result<()> {