Merge pull request #609 from multiplex55/remove-linux

Remove linux

Author: multiplex55

Cargo.lock

@@ -52,38 +52,26 @@ sysinfo = "0.35"
 chrono = "0.4"
 screenshots = "0.8.10"
 image = { version = "0.24", default-features = false, features = ["png"] }
-notify-rust = { version = "4", optional = true }
 ipconfig = "0.3"
 reqwest = { version = "0.11", default-features = false, features = ["blocking", "rustls-tls"] }
 base64 = "0.21"
 hex = "0.4"
 rand = "0.8"
 lipsum = "0.9"
 egui_commonmark = "0.15.0"
-rfd = { version = "0.15.3", features = ["xdg-portal", "common-controls-v6"] }
+rfd = { version = "0.15.3", features = ["common-controls-v6"] }
 slab = "0.4.11"
-
-[target.'cfg(unix)'.dependencies]
-xcb = "1.6.0"
-
-[target.'cfg(target_os = "windows")'.dependencies]
 rdev = { git = "https://github.com/Narsil/rdev", rev = "c14f2dc5c8100a96c5d7e3013de59d6aa0b9eae2" }
 rodio = { version = "0.17", default-features = false, features = ["wav"] }
 
-
-
 [features]
 unstable_grab = []
-notify = ["notify-rust"]
 
 [dev-dependencies]
 tempfile = "3"
 criterion = "0.5"
 serial_test = "2"
 
-[target.'cfg(unix)'.dev-dependencies]
-xcb = "1.6.0"
-
 [build-dependencies]
 embed-resource = "2"
 

Cargo.toml

@@ -1,9 +1,10 @@
 # Multi Launcher
 <img width="480" height="480" alt="Green_MultiLauncher" src="https://github.com/user-attachments/assets/8a68f544-536c-4eb5-8c0a-c5ef43e21c2d" />
 
-Multi Launcher is a lightweight application launcher built with Rust and `eframe`.
-It supports configurable hotkeys, basic plugin architecture and file indexing to
-quickly open applications or files.
+Multi Launcher is a lightweight application launcher for Windows built with Rust
+and `eframe`. The project targets Windows exclusively. It supports configurable
+hotkeys, basic plugin architecture and file indexing to quickly open
+applications or files.
 
 
 ## Use Cases
@@ -50,19 +51,12 @@ cargo build --release --features unstable_grab
 This feature is defined in `Cargo.toml` and enables the underlying `rdev`
 capability used to grab keyboard events.
 
-To show a system notification when a timer or alarm fires, build with the
-`notify` feature. This pulls in the optional `notify-rust` dependency:
-
-```
-cargo build --release --features notify
-```
-
 For debugging, enable **Debug logging** in the settings window. When this
 option is active, you can further adjust the verbosity by setting the
 `RUST_LOG` environment variable before running the program:
 
-```bash
-RUST_LOG=info cargo run --release --features unstable_grab
+```powershell
+$env:RUST_LOG="info"; cargo run --release --features unstable_grab
 ```
 
 Enable persistent log files by adding a `log_file` entry to `settings.json`.
@@ -452,8 +446,8 @@ When compiled this way the executable is built with `windows_subsystem = "window
 
 When diagnosing hotkey issues it can be helpful to enable info level logging:
 
-```bash
-RUST_LOG=info cargo run
+```powershell
+$env:RUST_LOG="info"; cargo run
 ```
 ## Tips
 

README.md

@@ -1,8 +1,4 @@
-#[cfg(target_os = "windows")]
 fn main() {
     // no custom macros are passed to the resource compiler
     embed_resource::compile("Resources/windows.rc", embed_resource::NONE);
 }
-
-#[cfg(not(target_os = "windows"))]
-fn main() {}

build.rs

@@ -22,25 +22,14 @@ fn send_key(vk: windows::Win32::UI::Input::KeyboardAndMouse::VIRTUAL_KEY) {
     }
 }
 
-#[cfg(target_os = "linux")]
-fn playerctl(cmd: &str) {
-    let _ = std::process::Command::new("playerctl").arg(cmd).spawn();
-}
-
 #[cfg(target_os = "windows")]
 pub fn play() -> anyhow::Result<()> {
     use windows::Win32::UI::Input::KeyboardAndMouse::VK_MEDIA_PLAY_PAUSE;
     send_key(VK_MEDIA_PLAY_PAUSE);
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
-pub fn play() -> anyhow::Result<()> {
-    playerctl("play");
-    Ok(())
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "linux")))]
+#[cfg(not(target_os = "windows"))]
 pub fn play() -> anyhow::Result<()> {
     Ok(())
 }
@@ -52,13 +41,7 @@ pub fn pause() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
-pub fn pause() -> anyhow::Result<()> {
-    playerctl("pause");
-    Ok(())
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "linux")))]
+#[cfg(not(target_os = "windows"))]
 pub fn pause() -> anyhow::Result<()> {
     Ok(())
 }
@@ -70,13 +53,7 @@ pub fn next() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
-pub fn next() -> anyhow::Result<()> {
-    playerctl("next");
-    Ok(())
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "linux")))]
+#[cfg(not(target_os = "windows"))]
 pub fn next() -> anyhow::Result<()> {
     Ok(())
 }
@@ -88,13 +65,7 @@ pub fn prev() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[cfg(target_os = "linux")]
-pub fn prev() -> anyhow::Result<()> {
-    playerctl("previous");
-    Ok(())
-}
-
-#[cfg(not(any(target_os = "windows", target_os = "linux")))]
+#[cfg(not(target_os = "windows"))]
 pub fn prev() -> anyhow::Result<()> {
     Ok(())
 }

src/actions/media.rs

@@ -1,16 +1,10 @@
-#[cfg(target_os = "windows")]
 use chrono::Local;
-#[cfg(target_os = "windows")]
 use std::borrow::Cow;
 use std::path::PathBuf;
 
-#[cfg(target_os = "windows")]
 use crate::plugins::screenshot::screenshot_dir;
-#[cfg(target_os = "windows")]
 use screenshots::Screen;
-#[cfg(target_os = "windows")]
 use windows::Win32::Foundation::RECT;
-#[cfg(target_os = "windows")]
 use windows::Win32::UI::WindowsAndMessaging::{GetForegroundWindow, GetWindowRect};
 
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -20,7 +14,6 @@ pub enum Mode {
     Desktop,
 }
 
-#[cfg(target_os = "windows")]
 pub fn capture_raw(mode: Mode) -> anyhow::Result<image::RgbaImage> {
     match mode {
         Mode::Desktop => {
@@ -85,7 +78,6 @@ pub fn capture_raw(mode: Mode) -> anyhow::Result<image::RgbaImage> {
     }
 }
 
-#[cfg(target_os = "windows")]
 pub fn capture(mode: Mode, clipboard: bool) -> anyhow::Result<PathBuf> {
     let dir = screenshot_dir();
     std::fs::create_dir_all(&dir)?;
@@ -110,7 +102,3 @@ pub fn capture(mode: Mode, clipboard: bool) -> anyhow::Result<PathBuf> {
     Ok(path)
 }
 
-#[cfg(not(target_os = "windows"))]
-pub fn capture(_mode: Mode, _clipboard: bool) -> anyhow::Result<PathBuf> {
-    anyhow::bail!("screenshot not supported on this platform")
-}

src/actions/screenshot.rs

@@ -1,18 +1,10 @@
 pub fn run(cmd: &str) -> anyhow::Result<()> {
-    #[cfg(target_os = "windows")]
-    {
-        let mut command = {
-            let mut c = std::process::Command::new("cmd");
-            c.arg("/C").arg(cmd);
-            c
-        };
-        command.spawn().map(|_| ()).map_err(|e| e.into())
-    }
-    #[cfg(not(target_os = "windows"))]
-    {
-        let _ = cmd;
-        Ok(())
-    }
+    let mut command = {
+        let mut c = std::process::Command::new("cmd");
+        c.arg("/C").arg(cmd);
+        c
+    };
+    command.spawn().map(|_| ()).map_err(|e| e.into())
 }
 
 pub fn add(name: &str, args: &str) -> anyhow::Result<()> {

src/actions/shell.rs

@@ -15,88 +15,61 @@ pub fn process_kill(pid: u32) {
     }
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn process_switch(pid: u32) {
-    #[cfg(target_os = "windows")]
-    {
-        super::super::window_manager::activate_process(pid);
-    }
+    super::super::window_manager::activate_process(pid);
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn window_switch(hwnd: isize) {
-    #[cfg(target_os = "windows")]
-    {
-        use windows::Win32::Foundation::HWND;
-        super::super::window_manager::force_restore_and_foreground(HWND(hwnd as _));
-    }
+    use windows::Win32::Foundation::HWND;
+    super::super::window_manager::force_restore_and_foreground(HWND(hwnd as _));
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn window_close(hwnd: isize) {
-    #[cfg(target_os = "windows")]
-    {
-        use windows::Win32::Foundation::{HWND, LPARAM, WPARAM};
-        use windows::Win32::UI::WindowsAndMessaging::{PostMessageW, WM_CLOSE};
-        unsafe {
-            let _ = PostMessageW(HWND(hwnd as _), WM_CLOSE, WPARAM(0), LPARAM(0));
-        }
+    use windows::Win32::Foundation::{HWND, LPARAM, WPARAM};
+    use windows::Win32::UI::WindowsAndMessaging::{PostMessageW, WM_CLOSE};
+    unsafe {
+        let _ = PostMessageW(HWND(hwnd as _), WM_CLOSE, WPARAM(0), LPARAM(0));
     }
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn set_brightness(v: u32) {
-    #[cfg(target_os = "windows")]
     super::super::launcher::set_display_brightness(v);
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn set_volume(v: u32) {
-    #[cfg(target_os = "windows")]
     super::super::launcher::set_system_volume(v);
 }
 
 pub fn mute_active_window() {
-    #[cfg(target_os = "windows")]
     super::super::launcher::mute_active_window();
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn set_process_volume(pid: u32, level: u32) {
-    #[cfg(target_os = "windows")]
     super::super::launcher::set_process_volume(pid, level);
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn toggle_process_mute(pid: u32) {
-    #[cfg(target_os = "windows")]
     super::super::launcher::toggle_process_mute(pid);
 }
 
 pub fn recycle_clean() {
-    #[cfg(target_os = "windows")]
-    {
-        // Emptying the recycle bin can take a noticeable amount of time on
-        // Windows. Running it on the current thread would block the UI and
-        // cause `launch_action` to return slowly, which in turn makes the
-        // `recycle_plugin` test fail. Spawn a background thread instead so the
-        // command returns immediately while the cleanup happens asynchronously.
-        //
-        // To keep callers responsive, dispatch a success event right away and
-        // perform the actual cleanup in the background. Any errors from the
-        // cleanup are ignored since we have already notified listeners.
-        std::thread::spawn(|| {
-            let _ = super::super::launcher::clean_recycle_bin();
-        });
-        crate::gui::send_event(crate::gui::WatchEvent::Recycle(Ok(())));
-    }
+    // Emptying the recycle bin can take a noticeable amount of time on
+    // Windows. Running it on the current thread would block the UI and
+    // cause `launch_action` to return slowly, which in turn makes the
+    // `recycle_plugin` test fail. Spawn a background thread instead so the
+    // command returns immediately while the cleanup happens asynchronously.
+    //
+    // To keep callers responsive, dispatch a success event right away and
+    // perform the actual cleanup in the background. Any errors from the
+    // cleanup are ignored since we have already notified listeners.
+    std::thread::spawn(|| {
+        let _ = super::super::launcher::clean_recycle_bin();
+    });
+    crate::gui::send_event(crate::gui::WatchEvent::Recycle(Ok(())));
 }
 
-#[cfg_attr(not(target_os = "windows"), allow(unused_variables))]
 pub fn browser_tab_switch(runtime_id: &[i32]) {
-    #[cfg(target_os = "windows")]
-    {
-        use windows::core::VARIANT;
+    use windows::core::VARIANT;
         use windows::Win32::System::Com::{
             CoCreateInstance, CoInitializeEx, CoUninitialize, CLSCTX_INPROC_SERVER,
             COINIT_APARTMENTTHREADED,
@@ -298,5 +271,4 @@ pub fn browser_tab_switch(runtime_id: &[i32]) {
             }
             CoUninitialize();
         }
-    }
 }

src/actions/system.rs

@@ -1,18 +1,14 @@
-#[cfg(target_os = "windows")]
 use crate::workspace::is_valid_key_combo;
-#[cfg(target_os = "windows")]
 use log::{error, info, warn};
 use serde::{Deserialize, Serialize};
 use std::fmt;
-#[cfg(target_os = "windows")]
 use windows::Win32::UI::Input::KeyboardAndMouse::{
     RegisterHotKey, HOT_KEY_MODIFIERS, MOD_CONTROL, MOD_ALT, MOD_SHIFT, MOD_WIN,
 };
 
 #[derive(Clone, Serialize, Deserialize)]
 pub struct Hotkey {
     pub key_sequence: String,
-    #[cfg(target_os = "windows")]
     #[serde(skip)]
     pub id: Option<i32>,
 }
@@ -24,7 +20,6 @@ impl fmt::Display for Hotkey {
 }
 
 impl Hotkey {
-    #[cfg(target_os = "windows")]
     pub fn new(key_sequence: &str) -> Result<Self, String> {
         if is_valid_key_combo(key_sequence) {
             Ok(Self {
@@ -36,7 +31,6 @@ impl Hotkey {
         }
     }
 
-    #[cfg(target_os = "windows")]
     pub fn register(&mut self, app: &crate::gui::LauncherApp, id: i32) -> bool {
         let mut modifiers: u32 = 0;
         let mut vk_code: Option<u32> = None;