source resolution works

src/api/app/mod.rs

@@ -8,7 +8,7 @@ use reqwest::{IntoUrl, Response};
 use serde::de::DeserializeOwned;
 use tokio::{sync::RwLock, time::sleep};
 
-use super::{models::{network::{Network, NETWORK_TOML}, server::{Server, SERVER_TOML}, Addon}, utils::{try_find_toml_upwards, write_toml}};
+use super::{models::{network::{Network, NETWORK_TOML}, server::{Server, SERVER_TOML}, Addon, Source}, utils::{try_find_toml_upwards, write_toml}};
 
 pub mod actions;
 pub mod cache;
@@ -109,15 +109,23 @@ impl App {
         Ok(res.json().await?)
     }
 
-    pub async fn collect_addons(&self) -> Result<Vec<Addon>> {
-        let mut addons = vec![];
+    pub async fn collect_sources(&self) -> Result<Vec<Source>> {
+        let mut sources = vec![];
 
         if let Some(lock) = &self.server {
             let server = lock.read().await;
 
-            for source in &server.sources {
-                addons.append(&mut source.resolve_addons(&self).await?);
-            }
+            sources.append(&mut server.sources.clone());
+        }
+
+        Ok(sources)
+    }
+
+    pub async fn collect_addons(&self) -> Result<Vec<Addon>> {
+        let mut addons = vec![];
+
+        for source in self.collect_sources().await? {
+            addons.append(&mut source.resolve_addons(&self).await?);
         }
 
         Ok(addons)

src/commands/mod.rs

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

src/commands/sources/list.rs

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

src/commands/sources/mod.rs

@@ -0,0 +1,16 @@
+use anyhow::Result;
+
+use crate::api::app::App;
+
+pub mod list;
+
+#[derive(clap::Subcommand)]
+pub enum Commands {
+    List(list::Args),
+}
+
+pub async fn run(mut app: App, args: Commands) -> Result<()> {
+    match args {
+        Commands::List(args) => list::run(app, args).await,
+    }
+}

src/main.rs

@@ -19,6 +19,8 @@ struct Cli {
 #[derive(clap::Subcommand)]
 enum Commands {
     Init(commands::init::Args),
+    #[command(subcommand)]
+    Sources(commands::sources::Commands),
 }
 
 #[tokio::main]
@@ -28,5 +30,6 @@ async fn main() -> Result<()> {
 
     match args.command {
         Commands::Init(args) => commands::init::run(app, args).await,
+        Commands::Sources(args) => commands::sources::run(app, args).await,
     }
 }