add TODO comment

.github/workflows/pre-release.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   linux-release-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies

.github/workflows/rust.yml

@@ -10,87 +10,149 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  fmt:
+  build-linux:
-    name: Formatting
+
     runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - name: cargo fmt
+    - name: install dependencies
-        run: cargo fmt --check
+      run: |
+        sudo apt-get update
+        sudo apt-get install libx11-dev libxtst-dev
+        sudo apt-get install libadwaita-1-dev libgtk-4-dev
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+    - name: Check Formatting
+      run: cargo fmt --check
+    - name: Clippy
+      run: cargo clippy --all-features --all-targets -- --deny warnings
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: lan-mouse
+        path: target/debug/lan-mouse
+
+  build-windows:
+
+    runs-on: windows-latest
 
-  ci:
-    name: ${{ matrix.job }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
-          - macos-latest
-          - macos-15-intel
-        job:
-          - build
-          - check
-          - clippy
-          - test
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
-      - uses: Swatinem/rust-cache@v2
+    - uses: actions/setup-python@v5
-      - name: Install Linux deps
+      with:
-        if: runner.os == 'Linux'
+        python-version: '3.11'
-        run: |
+    # needed for cache restore
-          sudo apt-get update
+    - name: create gtk dir
-          sudo apt-get install libx11-dev libxtst-dev libadwaita-1-dev libgtk-4-dev
+      run: mkdir C:\gtk-build\gtk\x64\release
-      - name: Install macOS dependencies
+    - uses: actions/cache@v3
-        if: runner.os == 'macOS'
+      id: cache
-        run: brew install gtk4 libadwaita imagemagick
+      with:
-      - name: Install Windows Dependencies - create gtk dir
+        path: c:/gtk-build/gtk/x64/release/**
-        if: runner.os == 'Windows'
+        key: gtk-windows-build
-        run: mkdir C:\gtk-build\gtk\x64\release
+        restore-keys: gtk-windows-build
-      - name: Install Windows Dependencies - install gtk from cache
+    - name: Update path
-        uses: actions/cache@v3
+      run: |
-        if: runner.os == 'Windows'
+        echo "PKG_CONFIG=C:\gtk-build\gtk\x64\release\bin\pkgconf.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        id: cache
+        echo "C:\pkg-config-lite-0.28-1\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        with:
+        echo "C:\gtk-build\gtk\x64\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-          path: c:/gtk-build/gtk/x64/release/**
+        echo $env:GITHUB_PATH
-          key: gtk-windows-build
+        echo $env:PATH
-          restore-keys: gtk-windows-build
+    - name: Install dependencies
-      - name: Install Windows Dependencies - update PATH
+      if: steps.cache.outputs.cache-hit != 'true'
-        if: runner.os == 'Windows'
+      run: |
-        run: |
+        # choco install msys2
-          echo "PKG_CONFIG=C:\gtk-build\gtk\x64\release\bin\pkgconf.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+        # choco install visualstudio2022-workload-vctools
-          echo "C:\pkg-config-lite-0.28-1\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        # choco install pkgconfiglite
-          echo "C:\gtk-build\gtk\x64\release\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        py -m venv .venv
-          echo $env:GITHUB_PATH
+        .venv\Scripts\activate.ps1
-          echo $env:PATH
+        py -m pip install gvsbuild
-      - name: Install Windows dependencies - build gtk
+        # see https://github.com/wingtk/gvsbuild/pull/1004
-        if: runner.os == 'Windows' && steps.cache.outputs.cache-hit != 'true'
+        Move-Item "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
-        run: |
+        Move-Item "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
-          # choco install msys2
+        gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
-          # choco install visualstudio2022-workload-vctools
+        Move-Item "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
-          # choco install pkgconfiglite
+        Move-Item "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
-          py -m venv .venv
+    - name: Build
-          .venv\Scripts\activate.ps1
+      run: cargo build --verbose
-          py -m pip install gvsbuild
+    - name: Run tests
-          gvsbuild build --msys-dir=C:\msys64 gtk4 libadwaita librsvg
+      run: cargo test --verbose
-      - name: cargo build
+    - name: Check Formatting
-        if: matrix.job == 'build'
+      run: cargo fmt --check
-        run: cargo check --workspace --all-targets --all-features
+    - name: Clippy
+      run: cargo clippy --all-features --all-targets -- --deny warnings
+    - name: Copy Gtk Dlls
+      run: Get-Childitem -Path "C:\\gtk-build\\gtk\\x64\\release\\bin\\*.dll" -File -Recurse | Copy-Item -Destination "target\\debug"
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: lan-mouse-windows
+        path: |
+          target/debug/lan-mouse.exe
+          target/debug/*.dll
 
-      - name: cargo check
+  build-macos:
-        if: matrix.job == 'check'
+    runs-on: macos-15-intel
-        run: cargo check --workspace --all-targets --all-features
+    steps:
+    - uses: actions/checkout@v4
+    - name: install dependencies
+      run: brew install gtk4 libadwaita imagemagick
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose
+    - name: Check Formatting
+      run: cargo fmt --check
+    - name: Clippy
+      run: cargo clippy --all-features --all-targets -- --deny warnings
+    - name: Make icns
+      run: scripts/makeicns.sh
+    - name: Install cargo bundle
+      run: cargo install cargo-bundle
+    - name: Bundle
+      run: |
+        cargo bundle
+        scripts/copy-macos-dylib.sh
+    - name: Zip bundle
+      run: |
+        cd target/debug/bundle/osx
+        zip -r "Lan Mouse macOS (Intel).zip" "Lan Mouse.app"
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Lan Mouse macOS (Intel)
+        path: target/debug/bundle/osx/Lan Mouse macOS (Intel).zip
 
-      - name: cargo test
+  build-macos-aarch64:
-        if: matrix.job == 'test'
+    runs-on: macos-14
-        run: cargo test --workspace --all-features
+    steps:
-
+    - uses: actions/checkout@v4
-      - name: cargo clippy
+    - name: install dependencies
-        if: matrix.job == 'clippy'
+      run: brew install gtk4 libadwaita imagemagick
-        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
+    - name: Build
-
+      run: cargo build --verbose
-      - uses: clechasseur/rs-clippy-check@v4
+    - name: Run tests
-        if: matrix.job == 'clippy'
+      run: cargo test --verbose
-        with:
+    - name: Check Formatting
-          args: --workspace --all-targets --all-features
+      run: cargo fmt --check
+    - name: Clippy
+      run: cargo clippy --all-features --all-targets -- --deny warnings
+    - name: Make icns
+      run: scripts/makeicns.sh
+    - name: Install cargo bundle
+      run: cargo install cargo-bundle
+    - name: Bundle
+      run: |
+        cargo bundle
+        scripts/copy-macos-dylib.sh
+    - name: Zip bundle
+      run: |
+        cd target/debug/bundle/osx
+        zip -r "Lan Mouse macOS (ARM).zip" "Lan Mouse.app"
+    - name: Upload build artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Lan Mouse macOS (ARM)
+        path: target/debug/bundle/osx/Lan Mouse macOS (ARM).zip

.github/workflows/tagged-release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   linux-release-build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: install dependencies

input-capture/Cargo.toml

@@ -23,7 +23,6 @@ tokio = { version = "1.32.0", features = [
     "rt",
     "sync",
     "signal",
-    "time",
 ] }
 once_cell = "1.19.0"
 async-trait = "0.1.81"

input-capture/src/macos.rs

@@ -646,7 +646,6 @@ unsafe fn configure_cf_settings() -> Result<(), MacosCaptureCreationError> {
     let event_source = CGEventSource::new(CGEventSourceStateID::CombinedSessionState)
         .map_err(|_| MacosCaptureCreationError::EventSourceCreation)?;
     CGEventSourceSetLocalEventsSuppressionInterval(event_source, 0.05);
-    // FIXME Memory Leak
 
     // This is a private settings that allows the cursor to be hidden while in the background.
     // It is used by Barrier and other apps.

lan-mouse-ipc/Cargo.toml

@@ -12,5 +12,5 @@ log = "0.4.22"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.107"
 thiserror = "2.0.0"
-tokio = { version = "1.32.0", features = ["macros", "net", "io-util", "time"] }
+tokio = { version = "1.32.0", features = ["net", "io-util", "time"] }
 tokio-stream = { version = "0.1.15", features = ["io-util"] }

src/config.rs

@@ -5,8 +5,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::env::{self, VarError};
 use std::fmt::Display;
-use std::fs::{self, File};
+use std::fs;
-use std::io::Write;
 use std::net::IpAddr;
 use std::path::{Path, PathBuf};
 use std::{collections::HashSet, io};
@@ -420,7 +419,7 @@ impl Config {
             return;
         }
         if self.config_toml.is_none() {
-            self.config_toml = Some(Default::default());
+            self.config_toml = Default::default();
         }
         self.config_toml.as_mut().expect("config").clients =
             Some(clients.into_iter().map(|c| c.into()).collect::<Vec<_>>());
@@ -443,15 +442,10 @@ impl Config {
     pub fn write_back(&self) -> Result<(), io::Error> {
         log::info!("writing config to {:?}", &self.config_path);
         /* load the current configuration file */
-        let current_config = match fs::read_to_string(&self.config_path) {
+        let current_config = fs::read_to_string(&self.config_path)?;
-            Ok(c) => c.parse::<DocumentMut>().unwrap_or_default(),
+        let current_config = current_config.parse::<DocumentMut>().expect("fix me");
-            Err(e) => {
-                log::info!("{:?} {e} => creating new config", self.config_path());
-                Default::default()
-            }
-        };
         let _current_config =
-            toml_edit::de::from_document::<ConfigToml>(current_config).unwrap_or_default();
+            toml_edit::de::from_document::<ConfigToml>(current_config).expect("fixme");
 
         /* the new config */
         let new_config = self.config_toml.clone().unwrap_or_default();
@@ -467,11 +461,7 @@ impl Config {
          */
 
         /* write new config to file */
-        if let Some(p) = self.config_path().parent() {
+        fs::write(&self.config_path, new_config)?;
-            fs::create_dir_all(p)?;
-        }
-        let mut f = File::create(self.config_path())?;
-        f.write_all(new_config.as_bytes())?;
 
         Ok(())
     }