refactor: simplify provider initialization and cleanup (#84)

glzr-io · Aug 17, 2024 · 8e585fa · 8e585fa · CtByte · Aug 19, 2024
1 parent 480613f
commit 8e585fa
Show file tree

Hide file tree

Showing 17 changed files with 480 additions and 494 deletions.
diff --git a/packages/desktop/src/main.rs b/packages/desktop/src/main.rs
@@ -1,6 +1,9 @@
 use std::{collections::HashMap, env, sync::Arc};
 
 use clap::Parser;
+use providers::{
+  config::ProviderConfig, provider_manager::init_provider_manager,
+};
 use serde::Serialize;
 use tauri::{
   AppHandle, Manager, State, WebviewUrl, WebviewWindowBuilder, Window,
@@ -18,7 +21,7 @@ use tracing_subscriber::EnvFilter;
 use crate::{
   cli::{Cli, CliCommand},
   monitors::get_monitors_str,
-  providers::{config::ProviderConfig, manager::ProviderManager},
+  providers::provider_manager::ProviderManager,
   sys_tray::setup_sys_tray,
   util::window_ext::WindowExt,
 };
@@ -72,7 +75,7 @@ async fn listen_provider(
   provider_manager: State<'_, ProviderManager>,
 ) -> anyhow::Result<(), String> {
   provider_manager
-    .listen(config_hash, config, tracked_access)
+    .create(config_hash, config, tracked_access)
     .await
     .map_err(|err| err.to_string())
 }
@@ -83,7 +86,7 @@ async fn unlisten_provider(
   provider_manager: State<'_, ProviderManager>,
 ) -> anyhow::Result<(), String> {
   provider_manager
-    .unlisten(config_hash)
+    .destroy(config_hash)
     .await
     .map_err(|err| err.to_string())
 }
@@ -169,7 +172,7 @@ async fn main() {
           // Add application icon to system tray.
           setup_sys_tray(app)?;
 
-          providers::manager::init(app)?;
+          init_provider_manager(app);
 
           let args_map = OpenWindowArgsMap(Default::default());
           let args_map_ref = args_map.0.clone();

diff --git a/packages/desktop/src/providers/battery/provider.rs b/packages/desktop/src/providers/battery/provider.rs
@@ -13,7 +13,7 @@ use tokio::task::AbortHandle;
 
 use super::{BatteryProviderConfig, BatteryVariables};
 use crate::providers::{
-  interval_provider::IntervalProvider, variables::ProviderVariables,
+  provider::IntervalProvider, variables::ProviderVariables,
 };
 
 pub struct BatteryProvider {

diff --git a/packages/desktop/src/providers/config.rs b/packages/desktop/src/providers/config.rs
@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-#[cfg(all(windows, target_arch = "x86_64"))]
+#[cfg(windows)]
 use super::komorebi::KomorebiProviderConfig;
 use super::{
   battery::BatteryProviderConfig, cpu::CpuProviderConfig,
@@ -16,7 +16,7 @@ pub enum ProviderConfig {
   Cpu(CpuProviderConfig),
   Host(HostProviderConfig),
   Ip(IpProviderConfig),
-  #[cfg(all(windows, target_arch = "x86_64"))]
+  #[cfg(windows)]
   Komorebi(KomorebiProviderConfig),
   Memory(MemoryProviderConfig),
   Network(NetworkProviderConfig),

diff --git a/packages/desktop/src/providers/cpu/provider.rs b/packages/desktop/src/providers/cpu/provider.rs
@@ -6,7 +6,7 @@ use tokio::{sync::Mutex, task::AbortHandle};
 
 use super::{CpuProviderConfig, CpuVariables};
 use crate::providers::{
-  interval_provider::IntervalProvider, variables::ProviderVariables,
+  provider::IntervalProvider, variables::ProviderVariables,
 };
 
 pub struct CpuProvider {

diff --git a/packages/desktop/src/providers/host/provider.rs b/packages/desktop/src/providers/host/provider.rs
@@ -6,7 +6,7 @@ use tokio::{sync::Mutex, task::AbortHandle};
 
 use super::{HostProviderConfig, HostVariables};
 use crate::providers::{
-  interval_provider::IntervalProvider, variables::ProviderVariables,
+  provider::IntervalProvider, variables::ProviderVariables,
 };
 
 pub struct HostProvider {

diff --git a/packages/desktop/src/providers/interval_provider.rs b/packages/desktop/src/providers/interval_provider.rs
diff --git a/packages/desktop/src/providers/ip/provider.rs b/packages/desktop/src/providers/ip/provider.rs
@@ -7,7 +7,7 @@ use tokio::task::AbortHandle;
 
 use super::{ipinfo_res::IpinfoRes, IpProviderConfig, IpVariables};
 use crate::providers::{
-  interval_provider::IntervalProvider, variables::ProviderVariables,
+  provider::IntervalProvider, variables::ProviderVariables,
 };
 
 pub struct IpProvider {

diff --git a/packages/desktop/src/providers/komorebi/provider.rs b/packages/desktop/src/providers/komorebi/provider.rs
@@ -18,8 +18,8 @@ use super::{
 };
 use crate::providers::{
   komorebi::KomorebiVariables,
-  manager::{ProviderOutput, VariablesResult},
   provider::Provider,
+  provider_ref::{ProviderOutput, VariablesResult},
   variables::ProviderVariables,
 };
 
@@ -123,16 +123,18 @@ impl KomorebiProvider {
 
 #[async_trait]
 impl Provider for KomorebiProvider {
-  // State should always be up to date.
-  fn min_refresh_interval(&self) -> Duration {
-    Duration::MAX
+  fn min_refresh_interval(&self) -> Option<Duration> {
+    // State should always be up to date.
+    None
   }
 
   async fn on_start(
     &mut self,
-    config_hash: String,
+    config_hash: &str,
     emit_output_tx: Sender<ProviderOutput>,
   ) {
+    let config_hash = config_hash.to_string();
+
     let task_handle = task::spawn(async move {
       let socket = komorebi_client::subscribe(SOCKET_NAME).unwrap();
       debug!("Connected to Komorebi socket.");
@@ -166,7 +168,7 @@ impl Provider for KomorebiProvider {
           Err(error) => {
             _ = emit_output_tx
               .send(ProviderOutput {
-                config_hash: config_hash.clone(),
+                config_hash: config_hash.to_string(),
                 variables: VariablesResult::Error(error.to_string()),
               })
               .await;
@@ -181,7 +183,7 @@ impl Provider for KomorebiProvider {
 
   async fn on_refresh(
     &mut self,
-    _config_hash: String,
+    _config_hash: &str,
     _emit_output_tx: Sender<ProviderOutput>,
   ) {
     // No-op.