check for Spotify Windows app

Author: LabyStudio

rust/src/session.rs

@@ -7,17 +7,25 @@ lazy_static! {
     static ref SPOTIFY_SESSION_CACHE: Mutex<Option<GlobalSystemMediaTransportControlsSession>> = Mutex::new(None);
 }
 
+pub fn is_spotify(session: &GlobalSystemMediaTransportControlsSession) -> Result<bool> {
+    let app_id = session.SourceAppUserModelId()?;
+    let app_id = app_id.to_string();
+
+    Ok(
+        app_id == "Spotify.exe" ||
+            (app_id.starts_with("SpotifyAB") && app_id.ends_with("!Spotify"))
+    )
+}
+
 pub fn get_spotify_session() -> Result<Option<GlobalSystemMediaTransportControlsSession>> {
     let mut cache = SPOTIFY_SESSION_CACHE.lock().unwrap();
 
     if let Some(session) = cache.as_ref() {
         // Validate cached session
-        if let Ok(app_id) = session.SourceAppUserModelId() {
-            if app_id == "Spotify.exe" {
-                // Session still valid
-                return Ok(Some(session.clone()));
-            }
+        if is_spotify(session)? {
+            return Ok(Some(session.clone()));
         }
+
         // Session invalid: clear cache
         *cache = None;
     }
@@ -28,8 +36,8 @@ pub fn get_spotify_session() -> Result<Option<GlobalSystemMediaTransportControls
     let sessions = manager.GetSessions()?;
 
     for session in sessions {
-        let source_app_id = session.SourceAppUserModelId()?;
-        if source_app_id == "Spotify.exe" {
+        if is_spotify(&session)? {
+            // Found a valid Spotify session, cache it
             *cache = Some(session.clone());
             return Ok(Some(session));
         }

src/main/java/de/labystudio/spotifyapi/platform/windows/WinSpotifyAPI.java

@@ -139,7 +139,7 @@ public int getPosition() {
 
     @Override
     public boolean hasPosition() {
-        if (this.process == null) {
+        if (!this.isConnected()) {
             return false;
         }