2.1.1 - Path Bugs

Author: ShayBox

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "wooting-profile-switcher"
 description = "Wooting Profile Switcher"
-version = "2.1.0"
+version = "2.1.1"
 authors = ["Shayne Hartford <shaybox@shaybox.com>", "Tony Langhammer"]
 edition = "2021"
 readme = "README.md"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 productName = "wooting-profile-switcher"
-version = "2.1.0"
+version = "2.1.1"
 
 [tauri.bundle]
 active = true

Tauri.toml

@@ -1,3 +1,5 @@
+use std::ops::Not;
+
 use egui_extras::{Column, TableBuilder};
 use game_scanner::prelude::*;
 use image::DynamicImage;
@@ -65,10 +67,26 @@ impl SelectedRule {
     fn to_rule(&self) -> Rule {
         Rule {
             alias:          self.alias.clone(),
-            match_app_name: Some(self.match_app_name.clone()),
-            match_bin_name: Some(self.match_bin_name.clone()),
-            match_bin_path: Some(self.match_bin_path.clone()),
-            match_win_name: Some(self.match_win_name.clone()),
+            match_app_name: self
+                .match_app_name
+                .is_empty()
+                .not()
+                .then_some(self.match_app_name.clone()),
+            match_bin_name: self
+                .match_bin_name
+                .is_empty()
+                .not()
+                .then_some(self.match_bin_name.clone()),
+            match_bin_path: self
+                .match_bin_path
+                .is_empty()
+                .not()
+                .then_some(self.match_bin_path.clone()),
+            match_win_name: self
+                .match_win_name
+                .is_empty()
+                .not()
+                .then_some(self.match_win_name.clone()),
             profile_index:  self.profile_index,
         }
     }
@@ -255,7 +273,7 @@ impl App for MainApp {
                                     alias: game.name,
                                     match_bin_path: game
                                         .path
-                                        .map(|path| path.display().to_string()),
+                                        .map(|path| path.display().to_string() + "*"),
                                     ..Default::default()
                                 };
                                 config.rules.push(rule.clone());
@@ -266,6 +284,10 @@ impl App for MainApp {
                                 *open_new_rule_setup = false;
                             }
                         }
+
+                        if ui.button("Cancel").clicked() {
+                            *open_new_rule_setup = false;
+                        }
                     });
                 });
         };

src/app.rs

@@ -301,7 +301,7 @@ fn find_match(active_window: ActiveWindow, rules: Vec<Rule>) -> Option<u8> {
     for (rule_prop_fn, active_prop) in match_active_window {
         if let Some(rule) = rules.iter().cloned().find(|rule| {
             if let Some(rule_prop) = rule_prop_fn(rule.clone()) {
-                if Pattern::new(&rule_prop).matches(&active_prop) {
+                if Pattern::new(&rule_prop.replace('\\', "\\\\")).matches(&active_prop) {
                     true
                 } else if let Ok(re) = Regex::new(&rule_prop) {
                     re.is_match(&active_prop)