parallel execution

src/api/app/actions/build/mod.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::{path::Path, sync::Arc};
 
 use anyhow::Result;
 
@@ -19,17 +19,28 @@ impl App {
         Ok(())
     }
 
-    pub async fn action_install_addons(&self, base: &Path) -> Result<()> {
+    pub async fn action_install_addons(self: Arc<Self>, base: &Path) -> Result<()> {
         let addons = self.collect_addons().await?;
+        let base = Arc::new(base.to_owned());
 
-        for addon in &addons {
-            self.action_install_addon(base, addon).await?;
+        let mut handles = vec![];
+
+        for addon in addons {
+            let app = self.clone();
+            let base = base.clone();
+            handles.push(tokio::spawn(async move {
+                app.action_install_addon(&base, &addon).await
+            }));
+        }
+
+        for handle in handles {
+            handle.await??;
         }
 
         Ok(())
     }
 
-    pub async fn action_install_addon(&self, base: &Path, addon: &Addon) -> Result<()> {
+    pub async fn action_install_addon(self: Arc<Self>, base: &Path, addon: &Addon) -> Result<()> {
         let steps = addon.resolve_steps(&self).await?;
         let dir = base.join(addon.target.as_str());
         self.execute_steps(&dir, &steps).await?;

src/api/app/step.rs

@@ -64,7 +64,8 @@ impl App {
                         tokio::fs::remove_file(&output_path).await?;
                         //return Ok(StepResult::Continue);
                     } else {
-                        if let Some((format, mut hasher, content)) = metadata.get_hasher() {
+                        let hasher = metadata.get_hasher();
+                        if let Some((format, mut hasher, content)) = hasher {
                             let output_file = File::open(&output_path).await?;
                             let mut stream = ReaderStream::new(output_file);
 

src/api/models/addon/addon.rs

@@ -18,7 +18,7 @@ impl Addon {
         match &self.addon_type {
             AddonType::Url { url } => resolve_steps_for_url(app, url, None).await,
             AddonType::Modrinth { id, version } => app.modrinth().resolve_steps(id, version).await,
-            AddonType::Curseforge { id, version } => todo!(),
+            AddonType::Curseforge { id, version } => Ok(vec![]),
             AddonType::Spigot { id, version } => todo!(),
             AddonType::Hangar { id, version } => todo!(),
             AddonType::GithubRelease { repo, version, filename } => app.github().resolve_steps(repo, version, filename).await,

src/api/step/mod.rs

@@ -28,7 +28,7 @@ pub struct FileMeta {
 }
 
 impl FileMeta {
-    pub fn get_hasher(&self) -> Option<(HashFormat, Box<dyn DynDigest>, String)> {
+    pub fn get_hasher(&self) -> Option<(HashFormat, Box<dyn DynDigest + Send>, String)> {
         get_best_hash(&self.hashes).map(|(format, content)| (format, format.get_digest(), content))
     }
 }

src/api/utils/hashing/mod.rs

@@ -22,7 +22,7 @@ pub enum HashFormat {
 }
 
 impl HashFormat {
-    pub fn get_digest(&self) -> Box<dyn DynDigest> {
+    pub fn get_digest(&self) -> Box<dyn DynDigest + Send> {
         match self {
             HashFormat::Sha256 => Box::new(sha2::Sha256::new()),
             HashFormat::Sha512 => Box::new(sha2::Sha512::new()),

src/commands/build.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::{path::Path, sync::Arc};
 
 use anyhow::Result;
 
@@ -9,7 +9,7 @@ pub struct Args {
 
 }
 
-pub async fn run(mut app: App, args: Args) -> Result<()> {
+pub async fn run(app: Arc<App>, args: Args) -> Result<()> {
     let base = Path::new("./output/server");
 
     app.action_install_jar(&base)

src/commands/init.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::{path::Path, sync::Arc};
 
 use anyhow::Result;
 
@@ -11,7 +11,7 @@ pub struct Args {
     name: Option<String>,
 }
 
-pub async fn run(mut app: App, args: Args) -> Result<()> {
+pub async fn run(app: Arc<App>, args: Args) -> Result<()> {
     app.action_install_addons(Path::new("./output/server"))
         .await?;
 

src/commands/sources/list.rs

@@ -1,11 +1,13 @@
+use std::sync::Arc;
+
 use anyhow::Result;
 
 use crate::api::app::App;
 
 #[derive(clap::Args)]
 pub struct Args {}
 
-pub async fn run(mut app: App, args: Args) -> Result<()> {
+pub async fn run(app: Arc<App>, args: Args) -> Result<()> {
     let sources = app.collect_sources().await?;
 
     println!("{sources:#?}");

src/commands/sources/mod.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use anyhow::Result;
 
 use crate::api::app::App;
@@ -9,7 +11,7 @@ pub enum Commands {
     List(list::Args),
 }
 
-pub async fn run(mut app: App, args: Commands) -> Result<()> {
+pub async fn run(app: Arc<App>, args: Commands) -> Result<()> {
     match args {
         Commands::List(args) => list::run(app, args).await,
     }

src/main.rs

@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use anyhow::Result;
 use api::app::App;
 use clap::Parser;
@@ -27,7 +29,7 @@ enum Commands {
 #[tokio::main]
 async fn main() -> Result<()> {
     let args = Cli::parse();
-    let app = App::new()?;
+    let app = Arc::new(App::new()?);
 
     match args.command {
         Commands::Init(args) => commands::init::run(app, args).await,