docs/clean up: clean up

Author: tadghh

rustfmt.toml

@@ -0,0 +1,3 @@
+edition = "2021"
+merge_imports = true         # Merges multiple imports from the same crate
+imports_granularity = "Crate"  # Merges to the crate level where possible

src/app_state.rs

@@ -22,12 +22,12 @@ pub struct AppState {
 
 impl AppState {
     pub fn new(config: Config, config_path: PathBuf) -> Self {
-        let (tx, _) = broadcast::channel(2);
-        let (txe, _) = broadcast::channel(2);
+        let (config_tx, _) = broadcast::channel(2);
+        let (enabled_tx, _) = broadcast::channel(2);
 
         Self {
-            config_tx: tx,
-            enabled_tx: txe,
+            config_tx,
+            enabled_tx,
             config: Arc::new(RwLock::new(config)),
             config_path,
             enabled: Arc::new(RwLock::new(true)),
@@ -48,6 +48,7 @@ impl AppState {
             }
         });
     }
+
     pub fn spawn_force_config(&self, value: WindowConfig) {
         let app_state: Arc<AppState> = Arc::new(self.clone());
 
@@ -116,7 +117,6 @@ impl AppState {
     ) -> Result<(), anyhow::Error> {
         let mut config = self.get_config_mut().await;
 
-        // Get the class name to use for parent lookup
         let lookup_class = window_config
             .get_old_classname()
             .clone()
@@ -134,6 +134,7 @@ impl AppState {
                 window_config.refresh_config();
                 window_config.set_old_classname(Some(lookup_class));
             } else {
+                // The config is no longer being forced to remove the parent class
                 window_config.set_window_class(&parent_class);
                 window_config.reset_config();
                 window_config.set_window_class(&lookup_class);
@@ -159,10 +160,8 @@ impl AppState {
     }
 
     fn remove_existing_config(&self, config: &mut Config, window_config: &WindowConfig) {
-        // Remove configuration by original key
         config.get_windows().remove(&window_config.get_key());
 
-        // Remove configuration by old class if it exists
         if let Some(old_class) = window_config.get_old_classname() {
             let key = format!("{}|{}", window_config.get_name(), old_class);
             config.get_windows().remove(&key);
@@ -181,7 +180,15 @@ impl AppState {
         *self.enabled.read().await
     }
 
-    pub async fn set_enable_state(&self, new_state: bool) {
+    pub async fn enabled(&self) {
+        self.set_enable_state(true).await
+    }
+
+    pub async fn disable(&self) {
+        self.set_enable_state(false).await
+    }
+
+    async fn set_enable_state(&self, new_state: bool) {
         *self.enabled.write().await = new_state;
 
         self.enabled_tx

src/main.rs

@@ -13,22 +13,18 @@ mod win_utils;
 mod window_config;
 use app_state::AppState;
 use monitor::monitor_windows;
-use tray::setup_tray;
+use tray::{setup_tray, STARTUP_ID};
 use util::{load_config, Message};
-
 use win_utils::{change_startup, get_startup_state};
 slint::include_modules!();
 
 #[cfg(target_os = "windows")]
 #[tokio::main]
 async fn main() -> Result<()> {
-    use tray::STARTUP_ID;
-
+    let (config, config_path) = load_config();
     let (tx, mut rx): (UnboundedSender<Message>, UnboundedReceiver<Message>) =
         mpsc::unbounded_channel();
 
-    let (config, config_path) = load_config();
-
     let mut tray = setup_tray(tx.clone())?;
 
     let app_state = Arc::new(AppState::new(config, config_path));
@@ -56,13 +52,13 @@ async fn main() -> Result<()> {
                     }
                 }
                 Message::Enable => {
-                    app_state.set_enable_state(true).await;
+                    app_state.enabled().await;
                 }
                 Message::Disable => {
-                    app_state.set_enable_state(false).await;
+                    app_state.disable().await;
                 }
                 Message::Startup => {
-                    let _ = change_startup(!get_startup_state());
+                    _ = change_startup(!get_startup_state());
                     let state_string = format!("Startup - {}", get_startup_state());
                     tray.inner_mut()
                         .set_menu_item_label(&state_string, STARTUP_ID)?;

src/tray.rs

@@ -32,6 +32,9 @@ pub fn setup_tray(tx: UnboundedSender<Message>) -> Result<TrayItem, TIError> {
     Ok(tray)
 }
 
+/*
+ Just adds another tray item. Keeps the above method clean
+*/
 fn add_tray_menu_item(
     tray: &mut TrayItem,
     label: &'static str,

src/window_config.rs

@@ -1,24 +1,25 @@
 use core::ffi::c_void;
 use std::path::Path;
 
-use crate::win_utils::WindowInfo;
+use crate::{
+    win_utils::{convert_to_full, convert_to_human, make_window_transparent, WindowInfo},
+    TransparencyRule,
+};
 use serde::{Deserialize, Serialize};
 use windows::core::PCWSTR;
 
-use windows::Win32::Foundation::CloseHandle;
-use windows::Win32::System::ProcessStatus::GetProcessImageFileNameA;
-use windows::Win32::System::Threading::{OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION};
-use windows::Win32::UI::WindowsAndMessaging::GetWindowThreadProcessId;
 use windows::Win32::{
-    Foundation::{BOOL, HWND, LPARAM, MAX_PATH},
+    Foundation::{CloseHandle, BOOL, HWND, LPARAM, MAX_PATH},
+    System::{
+        ProcessStatus::GetProcessImageFileNameA,
+        Threading::{OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION},
+    },
     UI::WindowsAndMessaging::{
         EnumChildWindows, EnumWindows, FindWindowExW, FindWindowW, GetClassNameW, GetParent,
+        GetWindowThreadProcessId,
     },
 };
 
-use crate::win_utils::{convert_to_full, convert_to_human, make_window_transparent};
-use crate::TransparencyRule;
-
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct WindowConfig {
     #[serde(default)]
@@ -154,6 +155,7 @@ impl WindowConfig {
             _ = make_window_transparent(HWND(handle as *mut c_void), self.get_transparency());
         }
     }
+
     /*
       Returns all the current handles for the classname
     */