feat: use command as string in config #7

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.4.3] - 2023-07-02
+
+### Features
+
+* use command as string in config #7 : the configuration is upgrade at the first
+  start of version > 0.4.2
+
+BREAKING config file format : config from < v0.4.3 will be automatically upgrade
+to v0.4.3 but mouse-actions program < v0.4.3 will not be able to open this
+v0.4.3 config format.
+
 ## [0.4.2] - 2023-06-18
 
 ### Features

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mouse_actions"
-version = "0.4.2"
+version = "0.4.3"
 authors = ["Jerem <jersou@gmail.com>"]
 repository = "https://github.com/jersou/mouse-actions"
 edition = "2021"
@@ -18,12 +18,13 @@ log = "0.4.17"
 env_logger = "0.10.0"
 notify = "5.1.0"
 clap = { version = "4.2.1", features = ["derive"] }
-regex = "1.7.3"
+regex = "1.8.4"
 anyhow = "1.0.70"
 fs2 = "0.4.3"
 tempfile = "3.5.0"
 rustix = { version = "0.37.7", features = ["process"] }
 users = "0.11.0"
+fancy-regex = "0.11.0"
 
 [build-dependencies]
 vergen = { version = "8.1.1", features = ["build", "git", "gitcl", "cargo"] }

Mouse-Actions.iml

@@ -7,6 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/config-editor/src-tauri/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

README.md

@@ -38,7 +38,7 @@ are optional):
 * with some modifiers : shift/Ctrl/Alt...
 * with screen edge : Top/Left...
 * auto reload config on changes
-* fast shape recognition ~200µs (0.0002 secondes) for a config with 30 shapes
+* fast shape recognition ~200µs (0.0002 sec) for a config with 30 shapes
 
 ## Project status
 
@@ -176,7 +176,7 @@ The config file default path is `~/.config/mouse-actions.json`
   | `Unknown` | `None`
 
 * `bindings` : array of binding :
-    * `cmd` : command line to exec, as array of string
+    * `cmd_str` : command line to exec
     * `event`: object :
         * `button`: `Left` | `Right` | `Middle` | `Side` | `Extra` | `Forward`
           | `Back`
@@ -388,6 +388,7 @@ cargo audit
 ### Medium
 
 * CI: build the releases https://github.com/tauri-apps/tauri-action
+* add ARM64 target
 * create ~/.config if it doesn't exist
 * fix exec cmd not found
   error `Err(Os { code: 2, kind: NotFound, message: "No such file or directory" })`

config-editor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mouse-actions-config-editor",
   "private": true,
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

config-editor/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mouse_actions_config_editor"
-version = "0.4.2"
+version = "0.4.3"
 description = "Mouse Actions Config Editor"
 authors = ["Jerem <jersou@gmail.com>"]
 repository = "https://github.com/jersou/mouse-actions"

config-editor/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "mouse-actions-gui",
-    "version": "0.4.2"
+    "version": "0.4.3"
   },
   "tauri": {
     "allowlist": {

config-editor/src/App.tsx

@@ -108,7 +108,7 @@ export default function App() {
         };
         newConfig.bindings?.splice((index ?? -1) + 1, 0, {
           uid: self.crypto.randomUUID(),
-          cmd: ["TODO"],
+          cmd_str: "TODO",
           comment: "TODO",
           event: {
             button: "Right",

config-editor/src/Binding.tsx

@@ -109,12 +109,12 @@ export function Binding({
             style={{ flex: 1, marginTop: 10, marginBottom: 10 }}
             label="Command"
             variant="outlined"
-            value={JSON.stringify(binding.cmd)}
+            value={binding.cmd_str}
             onChange={(e) => {
               setBinding?.(
                 structuredClone({
                   ...binding,
-                  cmd: JSON.parse(e.target.value),
+                  cmd_str: e.target.value,
                 })
               );
             }}

config-editor/src/Bindings.stories.tsx

@@ -15,7 +15,7 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 const binding1: BindingType = {
-  cmd: ["cmd", "cmd", "cmd"],
+  cmd_str: "cmd cmd cmd",
   comment: "comment",
   event: {
     event_type: "Click",

config-editor/src/config.type.ts

@@ -48,7 +48,7 @@ export type EventType = {
 export type BindingType = {
   uid?: string;
   comment: string;
-  cmd: string[];
+  cmd_str: string;
   event: EventType;
 };
 

src/binding.rs

@@ -7,5 +7,11 @@ pub struct Binding {
     #[serde(default)]
     pub comment: String,
     pub event: ClickEvent,
+
+    #[serde(skip_serializing)]
+    #[serde(default)]
     pub cmd: Vec<String>,
+
+    #[serde(default)]
+    pub cmd_str: String,
 }