X-Git-Url: https://git.r.bdr.sh/rbdr/lyricli/blobdiff_plain/8d584ce755e90c6f5260f7f2828e5a294004148b..caee5d1375cb0680b4ccec0d760b73a6fee460b4:/src/sources/spotify.rs?ds=inline diff --git a/src/sources/spotify.rs b/src/sources/spotify.rs index e4bf19c..bd627db 100644 --- a/src/sources/spotify.rs +++ b/src/sources/spotify.rs @@ -1,8 +1,15 @@ use std::ffi::CStr; use std::io::Result; -use cocoa::{base::{nil, id}, foundation::NSString}; -use objc::{class, msg_send, sel, sel_impl, runtime::{Class, 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; @@ -18,7 +25,6 @@ impl Spotify { } impl LyricsSource for Spotify { - fn name(&self) -> String { "spotify".to_string() } @@ -27,17 +33,18 @@ impl LyricsSource for Spotify { unsafe { let app: Id = { let cls = class!(SBApplication); - let bundle_identifier = NSString::alloc(nil).init_str("com.spotify.Client"); + 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]; + let app: *mut Object = + msg_send![cls, applicationWithBundleIdentifier:bundle_identifier]; Id::from_ptr(app) } else { - return None + return None; } }; @@ -53,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(); - - return Some(Track { - name, - artist - }) + return Some(Track { name, artist }); } } }