Refactor so it's a bit more organized

diff --git a/Cargo.lock b/Cargo.lock
index 1107e94287c412d622cc73d2eb82b2c1b92d3e1d..9579a858b1666384c50f30cc36e3ab1c93af76eb 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -573,7 +573,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
  "httpdate",
  "itoa",
  "pin-project-lite",

- "socket2",
+ "socket2 0.4.9",

  "tokio",
  "tower-service",
  "tracing",
  "tokio",
  "tower-service",
  "tracing",


@@ -861,9 +861,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
 
 [[package]]
 name = "pin-project-lite"

-version = "0.2.10"
+version = "0.2.13"

 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"

 
 [[package]]
 name = "pin-utils"
 
 [[package]]
 name = "pin-utils"


@@ -880,7 +880,6 @@ dependencies = [
  "log",
  "podman-api",
  "poise",
  "log",
  "podman-api",
  "poise",

- "serde_path_to_error",

  "tokio",
 ]
 
  "tokio",
 ]
 


@@ -1227,16 +1226,6 @@ dependencies = [
  "serde",
 ]
 
  "serde",
 ]
 

-[[package]]
-name = "serde_path_to_error"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc4422959dd87a76cb117c191dcbffc20467f06c9100b76721dab370f24d3a"
-dependencies = [
- "itoa",
- "serde",
-]
-

 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"


@@ -1317,6 +1306,16 @@ dependencies = [
  "winapi",
 ]
 
  "winapi",
 ]
 

+[[package]]
+name = "socket2"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+

 [[package]]
 name = "spin"
 version = "0.5.2"
 [[package]]
 name = "spin"
 version = "0.5.2"


@@ -1437,18 +1436,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
 
 [[package]]
 name = "tokio"

-version = "1.29.1"
+version = "1.32.0"

 source = "registry+https://github.com/rust-lang/crates.io-index"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"

 dependencies = [
 dependencies = [

- "autocfg",

  "backtrace",
  "bytes 1.4.0",
  "libc",
  "mio",
  "num_cpus",
  "pin-project-lite",
  "backtrace",
  "bytes 1.4.0",
  "libc",
  "mio",
  "num_cpus",
  "pin-project-lite",

- "socket2",
+ "socket2 0.5.4",

  "tokio-macros",
  "windows-sys",
 ]
  "tokio-macros",
  "windows-sys",
 ]

diff --git a/Cargo.toml b/Cargo.toml
index e1ee701b50f6d8723efaadd619846152c4b27024..3ee7c26b9ef36ad52430bb964938c67c07b1e9f9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,9 +7,8 @@ edition = "2021"
 
 [dependencies]
 podman-api = "0.10"
 
 [dependencies]
 podman-api = "0.10"

-poise = "0.5.5"
-serde_path_to_error = "0.1.13"
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread"]}
+poise = "0.5"
+tokio = { version = "1.32", features = ["macros", "rt-multi-thread"]}

 dotenv = "0.15.0"
 log = "0.4.20"
 fern = "0.6.2"
\ No newline at end of file
 dotenv = "0.15.0"
 log = "0.4.20"
 fern = "0.6.2"
\ No newline at end of file

diff --git a/src/containers/mod.rs b/src/cache/containers.rs
similarity index 91%
rename from src/containers/mod.rs
rename to src/cache/containers.rs
index eb8e494c21c6b45cd585cdb6720b8a02982dbfc6..b0aa58441eb25bbe87ed75be9445a6b403220de5 100644 (file)
--- a/src/containers/mod.rs
+++ b/src/cache/containers.rs
@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 use std::collections::HashMap;

-use std::ops::Deref;

 use std::process;
 use std::process;

-use std::sync::{Arc, Mutex};
+use std::sync::{Arc, RwLock};

 use std::time::{Instant, Duration};
 use log::{warn};
 use podman_api::models::{Container, Port};
 use std::time::{Instant, Duration};
 use log::{warn};
 use podman_api::models::{Container, Port};


@@ -10,7 +9,7 @@ use podman_api::Podman;
 use crate::utils::Id;
 
 pub(crate) struct Containers {
 use crate::utils::Id;
 
 pub(crate) struct Containers {

-    cache: Arc<Mutex<Option<(Instant, HashMap<[u8; 32], Container>)>>>,
+    cache: Arc<RwLock<Option<(Instant, HashMap<[u8; 32], Container>)>>>,

     connection: Podman,
 }
 
     connection: Podman,
 }
 


@@ -24,18 +23,17 @@ impl Containers {
             }
         };
         let c = Containers {
             }
         };
         let c = Containers {

-            cache: Arc::new(Mutex::new(None)),
+            cache: Arc::new(RwLock::new(None)),

             connection,
         };
         c
     }
 
     fn time_since_update(&self) -> Duration {
             connection,
         };
         c
     }
 
     fn time_since_update(&self) -> Duration {

-        let i = match self.cache.lock().unwrap().deref() {
-            Some(i) => { i.0 }
-            None => { return Duration::MAX; }
-        };
-        Instant::now().duration_since(i)
+        match self.cache.read() {
+            Ok(i) => { Instant::now().duration_since(i.unwrap().0) }
+            Err(_) => { Duration::MAX }
+        }

     }
 
     pub(crate) async fn sync(&self) -> Result<(), ContainerError> {
     }
 
     pub(crate) async fn sync(&self) -> Result<(), ContainerError> {


@@ -51,9 +49,7 @@ impl Containers {
     pub(crate) async fn sync_now(&self) -> Result<(), ContainerError> {
         return match self.sync_helper().await {
             Ok(_) => { Ok(()) }
     pub(crate) async fn sync_now(&self) -> Result<(), ContainerError> {
         return match self.sync_helper().await {
             Ok(_) => { Ok(()) }

-            Err(e) => {
-                Err(e)
-            }
+            Err(e) => { Err(e) }

         };
     }
 
         };
     }
 


@@ -138,7 +134,7 @@ impl Containers {
 
         // Scoping mutex actions
         {
 
         // Scoping mutex actions
         {

-            *match self.cache.lock() {
+            *match self.cache.write() {

                 Ok(c) => { c }
                 Err(_) => {
                     warn!("Cache was poisoned");
                 Ok(c) => { c }
                 Err(_) => {
                     warn!("Cache was poisoned");

diff --git a/src/cache/mod.rs b/src/cache/mod.rs
new file mode 100644 (file)
index 0000000..5d8620d
--- /dev/null
+++ b/src/cache/mod.rs
@@ -0,0 +1,11 @@
+pub(crate) mod containers;
+pub(crate) mod system;
+
+use crate::cache::containers::Containers;
+use crate::cache::system::System;
+
+/// Struct combining all of the caching podman structs
+pub(crate) struct Cache {
+    pub(super) containers: Containers,
+    pub(super) system: System,
+}
\ No newline at end of file

diff --git a/src/cache/system.rs b/src/cache/system.rs
new file mode 100644 (file)
index 0000000..d832fc7
--- /dev/null
+++ b/src/cache/system.rs
@@ -0,0 +1,11 @@
+use std::sync::{Arc, RwLock};
+use std::time::Instant;
+use podman_api::models::Info;
+use poise::serenity_prelude::Connection;
+
+
+pub(crate) struct System {
+    updated: Arc<RwLock<Instant>>,
+    data: Arc<RwLock<Info>>,
+    connection: Connection
+}

diff --git a/src/commands/mod.rs b/src/commands/mod.rs
new file mode 100644 (file)
index 0000000..a20c520
--- /dev/null
+++ b/src/commands/mod.rs
@@ -0,0 +1,124 @@
+use log::debug;
+use podman_api::opts::ContainerListOpts;
+use crate::create_embed;
+use crate::utils::{Context, Error, EmbedData};
+
+
+/// Display's the connected podman's version information
+#[poise::command(slash_command, prefix_command)]
+pub(super) async fn version(ctx: Context<'_>) -> Result<(), Error> {
+    let version_response = match ctx.data().podman.version().await {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("unable too get podman version.");
+            create_embed!(&ctx, "Error", format!("```{}```", e));
+            return Ok(());
+        }
+    };
+
+    create_embed!(&ctx, "Podman Version",
+    "Podman" => format!("v{}",&ctx.data().podman_version),
+    "API" => format!("v{}", match &version_response.api_version {
+        None => { "unknown" }
+        Some(v) => { v }
+        }),
+    "Go" => format!("{}", match &version_response.go_version {
+        None => { "unknown" }
+        Some(v) => { v }
+        }
+    ));
+    Ok(())
+}
+
+/// Podman system info.
+#[poise::command(slash_command, prefix_command)]
+pub(super) async fn system_info(ctx: Context<'_>) -> Result<(), Error> {
+    let info_response = match ctx.data().podman.info().await {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("unable too get podman version.");
+            create_embed!(&ctx, "Error", format!("```{}```", e));
+            return Ok(());
+        }
+    };
+
+    let containers_options = ContainerListOpts::builder().all(true).sync(true).build();
+    let containers_response = match ctx
+        .data()
+        .podman
+        .containers()
+        .list(&containers_options)
+        .await
+    {
+        Ok(containers_response) => containers_response,
+        Err(e) => {
+            eprintln!("unable too get podman cache::containers.");
+            create_embed!(&ctx, "Error", format!("```{}```", e));
+            return Ok(());
+        }
+    };
+
+    debug!("{:?}",&info_response);
+    debug!("{:?}",&containers_response);
+
+    let mut running_number = 0;
+    let _ = &containers_response.clone().into_iter().for_each(|c| {
+        if match c.state {
+            None => {
+                false
+            }
+            Some(c) => { c == "running" }
+        } {
+            running_number += 1;
+        }
+    });
+
+    create_embed!(&ctx, "Server info",
+        "Total Containers" => format!("{}", containers_response.len()),
+        "Running Containers" => format!("{}", running_number),
+        "Uptime" => format!("{}", match &info_response.host {
+        None => { "Unknown" }
+        Some(h) => {
+            match &h.uptime {
+                None => { "Unknown" }
+                Some(u) => { u }
+            }
+        }
+    })
+    );
+
+    Ok(())
+}
+
+async fn list_containers(ctx: Context<'_>) -> Result<(), Error> {
+    let info_response = match ctx.data().podman.info().await {
+        Ok(v) => v,
+        Err(e) => {
+            eprintln!("unable too get podman version.");
+            create_embed!(&ctx, "Error", format!("```{}```", e));
+            return Ok(());
+        }
+    };
+
+    let containers_options = ContainerListOpts::builder().all(true).sync(true).build();
+    let containers_response = match ctx
+        .data()
+        .podman
+        .containers()
+        .list(&containers_options)
+        .await
+    {
+        Ok(containers_response) => containers_response,
+        Err(e) => {
+            eprintln!("unable too get podman cache::containers.");
+            create_embed!(&ctx, "Error", format!("```{}```", e));
+            return Ok(());
+        }
+    };
+
+    let mut container_list: Vec<(String, String)> = Vec::new();
+    container_list.reserve(containers_response.len());
+
+
+    todo!()
+}
\ No newline at end of file

diff --git a/src/main.rs b/src/main.rs
index 397bb1208d15f452fcbc270678559528ecdacc22..07913622fdd9fe6aadfafc2c89cfdad807a224b9 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,136 +1,19 @@
+mod cache;
+mod commands;

 mod utils;
 mod utils;

-mod containers;

 
 

-use crate::utils::*;
-use podman_api::opts::ContainerListOpts;

 use podman_api::Podman;
 use poise::serenity_prelude as serenity;
 use std::process;
 use dotenv::dotenv;
 use tokio;
 use podman_api::Podman;
 use poise::serenity_prelude as serenity;
 use std::process;
 use dotenv::dotenv;
 use tokio;

-use crate::containers::{ContainerError, Containers};
+use crate::cache::containers::Containers;
+use crate::utils::Data;

 
 

-/// Display's the connected podman's version information
-#[poise::command(slash_command, prefix_command)]
-async fn version(ctx: Context<'_>) -> Result<(), Error> {
-    let version_response = match ctx.data().podman.version().await {
-        Ok(v) => v,
-        Err(e) => {
-            eprintln!("unable too get podman version.");
-            create_embed!(&ctx, "Error", format!("```{}```", e));
-            return Ok(());
-        }
-    };
-
-    create_embed!(&ctx, "Podman Version",
-    "Podman" => format!("v{}",&ctx.data().podman_version),
-    "API" => format!("v{}", match &version_response.api_version {
-        None => { "unknown" }
-        Some(v) => { v }
-        }),
-    "Go" => format!("{}", match &version_response.go_version {
-        None => { "unknown" }
-        Some(v) => { v }
-        }
-    ));
-    Ok(())
-}
-
-/// Podman system info.
-#[poise::command(slash_command, prefix_command)]
-async fn system_info(ctx: Context<'_>) -> Result<(), Error> {
-    let info_response = match ctx.data().podman.info().await {
-        Ok(v) => v,
-        Err(e) => {
-            eprintln!("unable too get podman version.");
-            create_embed!(&ctx, "Error", format!("```{}```", e));
-            return Ok(());
-        }
-    };
-
-    let containers_options = ContainerListOpts::builder().all(true).sync(true).build();
-    let containers_response = match ctx
-        .data()
-        .podman
-        .containers()
-        .list(&containers_options)
-        .await
-    {
-        Ok(containers_response) => containers_response,
-        Err(e) => {
-            eprintln!("unable too get podman containers.");
-            create_embed!(&ctx, "Error", format!("```{}```", e));
-            return Ok(());
-        }
-    };
-
-    dbg!(&info_response);
-    dbg!(&containers_response);
-
-    let mut running_number = 0;
-    let _ = &containers_response.clone().into_iter().for_each(|c| {
-        if match c.state {
-            None => {
-                false
-            }
-            Some(c) => { c == "running" }
-        } {
-            running_number += 1;
-        }
-    });
-
-    create_embed!(&ctx, "Server info",
-        "Total Containers" => format!("{}", containers_response.len()),
-        "Running Containers" => format!("{}", running_number),
-        "Uptime" => format!("{}", match &info_response.host {
-        None => { "Unknown" }
-        Some(h) => {
-            match &h.uptime {
-                None => { "Unknown" }
-                Some(u) => { u }
-            }
-        }
-    })
-    );
-
-    Ok(())
-}
-
-async fn list_containers(ctx: Context<'_>) -> Result<(), Error> {
-    let info_response = match ctx.data().podman.info().await {
-        Ok(v) => v,
-        Err(e) => {
-            eprintln!("unable too get podman version.");
-            create_embed!(&ctx, "Error", format!("```{}```", e));
-            return Ok(());
-        }
-    };
-
-    let containers_options = ContainerListOpts::builder().all(true).sync(true).build();
-    let containers_response = match ctx
-        .data()
-        .podman
-        .containers()
-        .list(&containers_options)
-        .await
-    {
-        Ok(containers_response) => containers_response,
-        Err(e) => {
-            eprintln!("unable too get podman containers.");
-            create_embed!(&ctx, "Error", format!("```{}```", e));
-            return Ok(());
-        }
-    };
-
-    let mut container_list: Vec<(String, String)> = Vec::new();
-    container_list.reserve(containers_response.len());
-
-
-    todo!()
-}

 
 #[tokio::main]
 async fn main() {
 
 #[tokio::main]
 async fn main() {

+    dotenv().ok();

     let api_uri = "unix:///run/podman/podman.sock";
     let podman = match Podman::new(&api_uri) {
         Ok(a) => a,
     let api_uri = "unix:///run/podman/podman.sock";
     let podman = match Podman::new(&api_uri) {
         Ok(a) => a,


@@ -139,7 +22,6 @@ async fn main() {
             process::exit(32);
         }
     };
             process::exit(32);
         }
     };

-

     let containers = Containers::connect(&api_uri);
 
     match containers.sync().await {
     let containers = Containers::connect(&api_uri);
 
     match containers.sync().await {


@@ -150,10 +32,9 @@ async fn main() {
         }
     }
 
         }
     }
 

-    dotenv().ok();

     let framework = poise::Framework::builder()
         .options(poise::FrameworkOptions {
     let framework = poise::Framework::builder()
         .options(poise::FrameworkOptions {

-            commands: vec![version(), system_info()],
+            commands: vec![commands::version(), commands::system_info()],

             ..Default::default()
         })
         .token(std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN"))
             ..Default::default()
         })
         .token(std::env::var("DISCORD_TOKEN").expect("missing DISCORD_TOKEN"))

diff --git a/src/utils.rs b/src/utils.rs
index a5a84517264d9bf883ef19192f5e51f07f577a83..f29624ce691b3a668d17191189b1a1b94a44a511 100644 (file)
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,6 +1,6 @@
 use std::num::ParseIntError;
 use podman_api::Podman;
 use std::num::ParseIntError;
 use podman_api::Podman;

-use crate::containers::Containers;
+use crate::cache::containers::Containers;

 
 /// Helper functions for getting data for discord embeds.
 pub(crate) struct EmbedData;
 
 /// Helper functions for getting data for discord embeds.
 pub(crate) struct EmbedData;


@@ -88,7 +88,7 @@ impl Id {
 }
 
 
 }
 
 

-// User data, which is stored and accessible in all command invocations
+/// User data, which is stored and accessible in all command invocations

 pub(crate) type Error = Box<dyn std::error::Error + Send + Sync>;
 pub(crate) type Context<'a> = poise::Context<'a, Data, Error>;
 
 pub(crate) type Error = Box<dyn std::error::Error + Send + Sync>;
 pub(crate) type Context<'a> = poise::Context<'a, Data, Error>;