fix install paths on windows

Author: aschey

platune-tray/src/main.rs

@@ -1,3 +1,5 @@
+#![windows_subsystem = "windows"]
+
 use std::collections::HashMap;
 use std::env::{self, current_exe};
 use std::path::PathBuf;
@@ -7,7 +9,6 @@ use daemon_slayer::client::config::Level;
 use daemon_slayer::client::{self, ServiceManager, State};
 use daemon_slayer::core::BoxedError;
 use daemon_slayer::tray::event_loop::ControlFlow;
-use daemon_slayer::tray::tray_icon::menu::accelerator::{Accelerator, Code, Modifiers};
 use daemon_slayer::tray::tray_icon::menu::{
     Menu, MenuEvent, MenuId, MenuItem, PredefinedMenuItem, Submenu,
 };
@@ -62,19 +63,11 @@ fn main() -> Result<(), BoxedError> {
     Ok(())
 }
 
+type MenuFn =
+    dyn Fn(State, &mpsc::Sender<PlayerCommand>, &mpsc::Sender<ManagerCommand>) -> ControlFlow;
+
 #[derive(Default)]
-struct MenuItemHandler(
-    HashMap<
-        MenuId,
-        Box<
-            dyn Fn(
-                State,
-                &mpsc::Sender<PlayerCommand>,
-                &mpsc::Sender<ManagerCommand>,
-            ) -> ControlFlow,
-        >,
-    >,
-);
+struct MenuItemHandler(HashMap<MenuId, Box<MenuFn>>);
 
 impl MenuItemHandler {
     fn add<F>(&mut self, menu: &MenuItem, f: F)
@@ -127,11 +120,7 @@ impl PlatuneMenuHandler {
         let next = MenuItem::new("Next", true, None);
         let previous = MenuItem::new("Previous", true, None);
         let player_stop = MenuItem::new("Stop", true, None);
-        let tray_quit = MenuItem::new(
-            "Quit",
-            true,
-            Some(Accelerator::new(Some(Modifiers::META), Code::KeyD)),
-        );
+        let tray_quit = MenuItem::new("Quit", true, None);
         let sep = PredefinedMenuItem::separator();
         main_menu
             .append_items(&[

platuned/server/src/bin/platunectl.rs

@@ -77,7 +77,7 @@ async fn run() -> Result<(), BoxedError> {
     let logger_builder = LoggerBuilder::new(label.clone());
 
     let health_check =
-        GrpcHealthCheck::new(format!("http://[::1]:{}", main_server_port()?)).unwrap();
+        GrpcHealthCheck::new(format!("http://127.0.0.1:{}", main_server_port()?)).unwrap();
 
     let console = Console::new(manager.clone(), LogSource::Ipc)
         .await
@@ -109,10 +109,14 @@ async fn run() -> Result<(), BoxedError> {
             #[cfg(target_os = "macos")]
             let app_path = "/Applications/Platune Tray.app/Contents/MacOS/platune-tray";
             #[cfg(windows)]
-            let app_path = exe_parent
-                .join("platune-tray.exe")
+            let app_path = directories::UserDirs::new()
+                .unwrap()
+                .home_dir()
+                .join("AppData\\Local\\Platune Tray\\platune-tray.exe")
                 .to_string_lossy()
                 .to_string();
+            #[cfg(windows)]
+            let app_path = format!("\"{app_path}\"");
             let auto_launch = AutoLaunchBuilder::new()
                 .set_app_name("Platune Tray")
                 .set_app_path(&app_path)

scripts/install-windows.ps1

@@ -0,0 +1,20 @@
+$repoDir = Resolve-Path $PSScriptRoot/..
+Set-Location $repoDir\platuned\server
+
+cargo build --release
+platunectl stop
+taskkill -f -im 'platune-tray'
+Set-Location $repoDir/platune-tray
+cargo packager --release
+
+Copy-Item "${repo_dir}\target\release\platuned" "${LOCAL_BIN}\" 
+Copy-Item "${repo_dir}\target\release\platunectl" "${LOCAL_BIN}\"
+Copy-Item "${repo_dir}\platune-cli"
+
+go build .
+Copy-Item .\cli "${LOCAL_BIN}\platune-cli"
+
+platunectl start
+&"${repo_dir}\target\release\platune-tray_0.1.0_x64-setup.exe"
+
+platunectl tray enable