Load env in all cargo tasks

[rbdr/lyricli] / src / sources / spotify.rs

diff --git a/src/sources/spotify.rs b/src/sources/spotify.rs
index b23ea736150a05b490c9df3df55eb24c03bf979c..bd627dba10e41d47909d3bed024a61627315b3dc 100644 (file)
--- a/src/sources/spotify.rs
+++ b/src/sources/spotify.rs
@@ -1,8 +1,15 @@
 use std::ffi::CStr;
 use std::io::Result;
 
 use std::ffi::CStr;
 use std::io::Result;
 

-use cocoa::{base::nil, foundation::NSString};
-use objc::{class, msg_send, sel, sel_impl, runtime::Object};
+use cocoa::{
+    base::{id, nil},
+    foundation::NSString,
+};
+use objc::{
+    class, msg_send,
+    runtime::{Class, Object},
+    sel, sel_impl,
+};

 use objc_id::Id;
 
 use crate::Track;
 use objc_id::Id;
 
 use crate::Track;


@@ -18,7 +25,6 @@ impl Spotify {
 }
 
 impl LyricsSource for Spotify {
 }
 
 impl LyricsSource for Spotify {

-

     fn name(&self) -> String {
         "spotify".to_string()
     }
     fn name(&self) -> String {
         "spotify".to_string()
     }


@@ -27,9 +33,19 @@ impl LyricsSource for Spotify {
         unsafe {
             let app: Id<Object> = {
                 let cls = class!(SBApplication);
         unsafe {
             let app: Id<Object> = {
                 let cls = class!(SBApplication);

-                let bundle_identifier = NSString::alloc(nil).init_str("com.spotify.Client"); 
-                let app: *mut Object = msg_send![cls, applicationWithBundleIdentifier:bundle_identifier];
-                Id::from_ptr(app)
+                let bundle_identifier = NSString::alloc(nil).init_str("com.spotify.Client");
+
+                let workspace_class = Class::get("NSWorkspace").unwrap();
+                let shared_workspace: id = msg_send![workspace_class, sharedWorkspace];
+                let app_url: id = msg_send![shared_workspace, URLForApplicationWithBundleIdentifier:bundle_identifier];
+
+                if app_url != nil {
+                    let app: *mut Object =
+                        msg_send![cls, applicationWithBundleIdentifier:bundle_identifier];
+                    Id::from_ptr(app)
+                } else {
+                    return None;
+                }

             };
 
             if msg_send![app, isRunning] {
             };
 
             if msg_send![app, isRunning] {


@@ -44,11 +60,7 @@ impl LyricsSource for Spotify {
                     let name = CStr::from_ptr(name_ptr).to_string_lossy().into_owned();
                     let artist = CStr::from_ptr(artist_ptr).to_string_lossy().into_owned();
 
                     let name = CStr::from_ptr(name_ptr).to_string_lossy().into_owned();
                     let artist = CStr::from_ptr(artist_ptr).to_string_lossy().into_owned();
 

-
-                    return Some(Track {
-                        name,
-                        artist
-                    })
+                    return Some(Track { name, artist });

                 }
             }
         }
                 }
             }
         }