COD-121: Refactor workspace identification from i32 to WorkspaceType

Author: shivros

src/config/mod.rs

@@ -255,7 +255,8 @@ fn migrate_config_file(
 
 pub fn create_default_config(cfg_path: &PathBuf) -> Result<String, Box<dyn Error + 'static>> {
     // TODO: maybe we should dump the config from the default values of the struct?
-    let default_config = format!(r#"version = "{VERSION}"
+    let default_config = format!(
+        r#"version = "{VERSION}"
 
 # [format]
 # Deduplicate icons if enable.
@@ -349,7 +350,8 @@ aProgram = "^$" # will match null title for aProgram
 9 = "nine"
 10 = "ten"
 
-"#);
+"#
+    );
 
     let mut config_file = File::create(cfg_path)?;
     write!(&mut config_file, "{}", default_config.trim())?;
@@ -482,13 +484,7 @@ fn generate_workspaces_name_config(
 ) -> Vec<(String, String)> {
     workspaces_name
         .iter()
-        .filter_map(|(id, name)| {
-            if id.parse::<i32>().is_ok() {
-                Some((id.to_string(), name.to_string()))
-            } else {
-                None
-            }
-        })
+        .map(|(id, name)| (id.to_string(), name.to_string()))
         .collect()
 }
 

src/renamer/formatter.rs

@@ -2,18 +2,24 @@ use crate::renamer::ConfigFile;
 use crate::renamer::IconStatus::*;
 use crate::{AppClient, Renamer};
 use hyprland::data::FullscreenMode;
+use hyprland::shared::{WorkspaceId, WorkspaceType};
 use std::collections::HashMap;
 use strfmt::strfmt;
 
 #[derive(Clone)]
 pub struct AppWorkspace {
-    pub id: i32,
+    pub id: WorkspaceType,
+    pub hyprland_id: WorkspaceId,
     pub clients: Vec<AppClient>,
 }
 
 impl AppWorkspace {
-    pub fn new(id: i32, clients: Vec<AppClient>) -> Self {
-        AppWorkspace { id, clients }
+    pub fn new(id: WorkspaceType, hyprland_id: WorkspaceId, clients: Vec<AppClient>) -> Self {
+        AppWorkspace {
+            id,
+            hyprland_id,
+            clients,
+        }
     }
 }
 
@@ -22,7 +28,7 @@ impl Renamer {
         &self,
         workspaces: Vec<AppWorkspace>,
         config: &ConfigFile,
-    ) -> HashMap<i32, String> {
+    ) -> HashMap<WorkspaceType, String> {
         let vars = HashMap::from([("delim".to_string(), config.format.delim.to_string())]);
         workspaces
             .iter()
@@ -70,7 +76,7 @@ impl Renamer {
                 let delimiter = formatter("{delim}", &vars);
                 let joined_string = workspace_output.join(&delimiter);
 
-                (workspace.id, joined_string)
+                (workspace.id.clone(), joined_string)
             })
             .collect()
     }
@@ -231,9 +237,10 @@ mod tests {
             is_dedup_inactive_fullscreen: false,
         };
 
-        let workspace = AppWorkspace::new(1, vec![client]);
+        let workspace = AppWorkspace::new(WorkspaceType::try_from(1).unwrap(), 1, vec![client]);
 
-        assert_eq!(workspace.id, 1);
+        assert_eq!(workspace.id, WorkspaceType::try_from(1).unwrap());
+        assert_eq!(workspace.hyprland_id, 1);
         assert_eq!(workspace.clients.len(), 1);
         assert_eq!(workspace.clients[0].class, "Class");
         assert_eq!(workspace.clients[0].title, "Title");