Merge pull request #16 from leofilip:13-bug-isolate-the-media-controls

bug: Isolate the thumbbar media buttons

Author: leofilip

.last-build-version

@@ -0,0 +1 @@
+0.2.7

build-menu.ps1

@@ -89,8 +89,8 @@ function Set-Version {
 
     # compute suggested next patch
     $suggest = "$($cv.Major).$($cv.Minor).$($cv.Build + 1)"
-    $newver = Read-Host "Enter new version (e.g. $suggest)"
-    if ([string]::IsNullOrWhiteSpace($newver)) { Write-Host 'No version entered. Returning to menu.'; Pause; return }
+    $newver = Read-Host "Enter new version [$suggest]"
+    if ([string]::IsNullOrWhiteSpace($newver)) { $newver = $suggest }
 
     try {
         $nv = [Version]$newver
@@ -189,15 +189,57 @@ function Set-Version {
     Pause
 }
 
+function Test-VersionChanged {
+    $versionFile = Join-Path -Path $PSScriptRoot -ChildPath '.last-build-version'
+    $currentVersion = Get-CurrentVersion
+    
+    if (Test-Path $versionFile) {
+        $lastVersion = Get-Content $versionFile -Raw
+        $lastVersion = $lastVersion.Trim()
+        
+        if ($lastVersion -eq $currentVersion) {
+            Write-Host "Current version ($currentVersion) has not been incremented since last build." -ForegroundColor Yellow
+            $response = Read-Host "Do you want to set a new version now? (Y/N)"
+            if ($response -match '^[Yy]') {
+                Set-Version
+                return $true
+            }
+            else {
+                $continue = Read-Host "Continue with current version? (Y/N)"
+                if ($continue -notmatch '^[Yy]') {
+                    Write-Host "Operation cancelled." -ForegroundColor Yellow
+                    Pause
+                    return $false
+                }
+            }
+        }
+    }
+    
+    return $true
+}
+
+function Save-BuildVersion {
+    $versionFile = Join-Path -Path $PSScriptRoot -ChildPath '.last-build-version'
+    $currentVersion = Get-CurrentVersion
+    Set-Content -Path $versionFile -Value $currentVersion
+}
+
 function Start-DevMode {
+    if (-not (Test-VersionChanged)) { return }
+    
     Write-Host 'Running: cargo tauri dev' -ForegroundColor Cyan
     & cmd /c "cargo tauri dev"
+    Save-BuildVersion
     Pause
 }
 
 function Build-Release {
+    if (-not (Test-VersionChanged)) { return }
+    
     Write-Host 'Building: cargo tauri build' -ForegroundColor Cyan
     & cmd /c "cargo tauri build"
+    Save-BuildVersion
+    
     $msiFolder = Join-Path -Path $PSScriptRoot -ChildPath 'src-tauri\target\release\bundle\msi'
     if (Test-Path $msiFolder) {
         Write-Host "Opening installer folder: $msiFolder"

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "qobuz-player"
-version = "0.2.4"
+version = "0.2.7"
 description = "Web Container for Qobuz Web Player"
 authors = ["Leonardo Calé"]
 edition = "2024"

src-tauri/Cargo.toml

@@ -6,53 +6,39 @@ use tauri::{
     tray::{MouseButton, MouseButtonState, TrayIconBuilder, TrayIconEvent},
 };
 use raw_window_handle::HasWindowHandle;
-// no direct Emitter usage here; native thumbar sends media keys directly
 
 mod thumbar;
 
-// Note: we removed the `native_set_playing` command — the native thumbar
-// uses static icons now and the renderer/plugin is authoritative for
-// playback state. Renderer should listen for `thumbar-*` events and act.
-
 #[tauri::command]
 fn native_add_thumb_buttons() {
-    // Call into the native module to (re)create the thumbbar buttons.
     thumbar::add_thumb_buttons();
 }
 
 #[tauri::command]
 fn native_remove_thumb_buttons() {
-    // Remove the subclass and cleanup native icons.
     thumbar::remove_thumb_buttons();
 }
 
 fn main() {
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![native_add_thumb_buttons, native_remove_thumb_buttons])
-    .on_page_load(|_window, _payload| {
-            // When the page finishes loading, create the native thumbbar
-            // buttons for the main window so they appear automatically.
-            // The HWND is stored during `setup` so the native loader will
-            // be able to call ThumbBarAddButtons.
+        .on_page_load(|_window, _payload| {
             let _ = thumbar::add_thumb_buttons();
         })
     .plugin(tauri_plugin_media::init())
-    .plugin(tauri_plugin_single_instance::init(|_app, _args, _cwd| {}))
+    .plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
+        if let Some(window) = app.get_webview_window("main") {
+            let _ = window.unminimize();
+            let _ = window.show();
+            let _ = window.set_focus();
+        }
+    }))
         .setup(|app| {
-            // On Windows, set an explicit AppUserModelID so Explorer
-            // associates this process with the application identity and
-            // (when possible) updates the taskbar/pinned icon. This helps
-            // when icons change during development.
             #[cfg(target_os = "windows")]
             {
                 use windows::core::PCWSTR;
                 use windows::Win32::UI::Shell::SetCurrentProcessExplicitAppUserModelID;
 
-                // Use different AppUserModelID for dev vs release builds so Windows
-                // doesn't try to use the icon from the installed app location when
-                // running dev builds. This prevents the "icon not found" issue where
-                // Explorer looks for C:\Program Files\qobuz-player\qobuz-player.exe
-                // which doesn't exist during development.
                 #[cfg(debug_assertions)]
                 let app_id = "com.leo.qobuz-player.dev";
                 #[cfg(not(debug_assertions))]
@@ -62,14 +48,11 @@ fn main() {
                 let pcw = PCWSTR(id.as_ptr());
                 let _ = unsafe { SetCurrentProcessExplicitAppUserModelID(pcw) };
             }
-            // Build menu items (only production items). The dev helper was
-            // intentionally removed so development helpers don't clutter the
-            // codebase — continue developing the thumbar feature instead.
+            
             let show = MenuItem::with_id(app, "show", "Show", true, None::<&str>)?;
             let quit = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
             let menu = Menu::with_items(app, &[&show, &quit])?;
 
-            // Create tray icon
             TrayIconBuilder::new()
                 .icon(app.default_window_icon().unwrap().clone())
                 .menu(&menu)
@@ -95,7 +78,6 @@ fn main() {
                     } => {
                         let app = tray.app_handle();
                         if let Some(window) = app.get_webview_window("main") {
-                            // Toggle: if visible -> hide to tray; otherwise show/restore.
                             match window.is_visible() {
                                 Ok(true) => {
                                     let _ = window.hide();
@@ -104,8 +86,7 @@ fn main() {
                                     let _ = window.unminimize();
                                     let _ = window.show();
                                     let _ = window.set_focus();
-                                    // Reinitialize thumbar for this window in case the
-                                    // HWND changed during hide/minimize.
+                                    
                                     #[cfg(target_os = "windows")]
                                     if let Ok(wh) = window.window_handle() {
                                         match wh.into() {
@@ -123,13 +104,9 @@ fn main() {
                     _ => {}
                 })
                 .build(app)?;
-            // Initialize the thumbar scaffolding (Windows-only integration point)
-            // Pass the `App` reference so the thumbar module can locate the
-            // main window and emit events via the app handle.
+            
             thumbar::init_thumbar(app, "main");
-            // Attempt to store the main webview HWND now so native code can
-            // call ThumbBarAddButtons. This mirrors the logic used when the
-            // tray toggles the window and ensures a stored HWND early.
+            
             if let Some(window) = app.get_webview_window("main") {
                 if let Ok(wh) = window.window_handle() {
                     match wh.into() {
@@ -140,18 +117,7 @@ fn main() {
                     }
                 }
             }
-            // Thumbbar clicks are handled by the native module which now
-            // converts them into system media key events. Media state and
-            // SMTC integration are handled by `tauri-plugin-media`.
-            // We'll add the thumbbar buttons once the page loads so buttons
-            // appear automatically. Frontend can still call the commands
-            // `native_set_playing`, `native_add_thumb_buttons` and
-            // `native_remove_thumb_buttons` as needed to update state.
-            // Use `on_page_load` to trigger native creation when the main
-            // webview finishes loading.
-            // Note: we register the on_page_load handler on the Builder below.
-            // Thumbar scaffolding initialized; frontend can be wired to events
-            // once native thumbar implementation is present.
+            
             Ok(())
         })
         .on_window_event(|app, event| {