+ music widget

MTMR.xcodeproj/project.pbxproj

@@ -23,6 +23,7 @@
 		6042B6AA2083E27000C525C8 /* DeprecatedCarbonAPI.c in Sources */ = {isa = PBXBuildFile; fileRef = 6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */; };
 		607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */; };
 		607EEA4D2087A8DA009DA5F0 /* CurrencyBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */; };
+		60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */; };
 		60F7D454208CC31400ABF5D2 /* InputSourceBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */; };
 		B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0008E542080286C003AD4DD /* SupportHelpers.swift */; };
 		B04B7BB72087398C00C835D0 /* BatteryBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */; };
@@ -68,6 +69,7 @@
 		6042B6A92083E27000C525C8 /* DeprecatedCarbonAPI.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = DeprecatedCarbonAPI.c; sourceTree = "<group>"; };
 		607EEA4A2087835F009DA5F0 /* WeatherBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WeatherBarItem.swift; sourceTree = "<group>"; };
 		607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyBarItem.swift; sourceTree = "<group>"; };
+		60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MusicBarItem.swift; sourceTree = "<group>"; };
 		60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputSourceBarItem.swift; sourceTree = "<group>"; };
 		B0008E542080286C003AD4DD /* SupportHelpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportHelpers.swift; sourceTree = "<group>"; };
 		B04B7BB62087398C00C835D0 /* BatteryBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryBarItem.swift; sourceTree = "<group>"; };
@@ -230,6 +232,7 @@
 				607EEA4C2087A8DA009DA5F0 /* CurrencyBarItem.swift */,
 				6042B6A62083E03A00C525C8 /* AppScrubberTouchBarItem.swift */,
 				60F7D453208CC31400ABF5D2 /* InputSourceBarItem.swift */,
+				60C44AFC20A373A100C0EC91 /* MusicBarItem.swift */,
 			);
 			path = Widgets;
 			sourceTree = "<group>";
@@ -356,6 +359,7 @@
 				B0008E552080286C003AD4DD /* SupportHelpers.swift in Sources */,
 				6042B6A72083E03A00C525C8 /* AppScrubberTouchBarItem.swift in Sources */,
 				B082B253205C7D8000BC04DC /* AppDelegate.swift in Sources */,
+				60C44AFD20A373A100C0EC91 /* MusicBarItem.swift in Sources */,
 				B059D624205E04F3006E6B86 /* CustomButtonTouchBarItem.swift in Sources */,
 				6027D1BA2080E52A004FFDC7 /* VolumeViewController.swift in Sources */,
 				607EEA4B2087835F009DA5F0 /* WeatherBarItem.swift in Sources */,

MTMR/CustomButtonTouchBarItem.swift

@@ -9,8 +9,8 @@
 import Cocoa
 
 class CustomButtonTouchBarItem: NSCustomTouchBarItem, NSGestureRecognizerDelegate {
-    private let tapClosure: (() -> ())?
+    public var tapClosure: (() -> ())?
-    private let longTapClosure: (() -> ())?
+    public var longTapClosure: (() -> ())?
     private(set) var button: NSButton!
     
     private var singleClick: NSClickGestureRecognizer!

MTMR/ItemsParsing.swift

@@ -125,6 +125,17 @@ class SupportedTypesHolder {
         },
         "sleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["sleepnow"]), longAction: .none, parameters: [:]) },
         "displaySleep": { _ in return (item: .staticButton(title: "☕️"), action: .shellScript(executable: "/usr/bin/pmset", parameters: ["displaysleepnow"]), longAction: .none,  parameters: [:])},
+        "music": { decoder in
+            enum CodingKeys: String, CodingKey { case refreshInterval }
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval)
+            return (
+                item: .music(interval: interval ?? 1800.00),
+                action: .none,
+                longAction: .none,
+                parameters: [:]
+            )
+        },
     ]
 
     static let sharedInstance = SupportedTypesHolder()
@@ -157,6 +168,7 @@ enum ItemType: Decodable {
     case weather(interval: Double, units: String, api_key: String, icon_type: String)
     case currency(interval: Double, from: String, to: String)
     case inputsource()
+    case music(interval: Double)
 
     private enum CodingKeys: String, CodingKey {
         case type
@@ -185,6 +197,7 @@ enum ItemType: Decodable {
         case weather
         case currency
         case inputsource
+        case music
     }
 
     init(from decoder: Decoder) throws {
@@ -223,6 +236,9 @@ enum ItemType: Decodable {
             self = .currency(interval: interval, from: from, to: to)
         case .inputsource:
             self = .inputsource()
+        case .music:
+            let interval = try container.decodeIfPresent(Double.self, forKey: .refreshInterval) ?? 1800.0
+            self = .music(interval: interval)
         }
     }
 }

MTMR/TouchBarController.swift

@@ -37,6 +37,8 @@ extension ItemType {
             return "com.toxblh.mtmr.currency"
         case .inputsource():
             return "com.toxblh.mtmr.inputsource."
+        case .music(interval: _):
+            return "com.toxblh.mtmr.music."
         }
     }
 
@@ -206,6 +208,8 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
             barItem = CurrencyBarItem(identifier: identifier, interval: interval, from: from, to: to, onTap: action, onLongTap: longAction)
         case .inputsource():
             barItem = InputSourceBarItem(identifier: identifier, onTap: action, onLongTap: longAction)
+        case .music(interval: let interval):
+            barItem = MusicBarItem(identifier: identifier, interval: interval, onLongTap: longAction)
         }
         
         if case .width(let value)? = item.additionalParameters[.width], let widthBarItem = barItem as? CanSetWidth {

MTMR/Widgets/MusicBarItem.swift

@@ -0,0 +1,374 @@
+//
+//  MusicBarItem.swift
+//  MTMR
+//
+//  Created by Daniel Apatin on 05.05.2018.
+//  Copyright © 2018 Anton Palgunov. All rights reserved.
+//
+
+import Cocoa
+import ScriptingBridge
+
+class MusicBarItem: CustomButtonTouchBarItem {
+    private let interval: TimeInterval
+    private var songTitle: String?
+    private var timer: Timer?
+    let buttonSize = NSSize(width: 21, height: 21)
+    
+    let playerBundleIdentifiers = [
+        "com.apple.iTunes",
+        "com.spotify.client",
+        "com.coppertino.Vox",
+        "com.google.Chrome",
+        "com.apple.Safari"
+    ]
+    
+    init(identifier: NSTouchBarItem.Identifier, interval: TimeInterval, onLongTap: @escaping () -> ()) {
+        self.interval = interval
+        
+        super.init(identifier: identifier, title: "⏳", onTap: onLongTap, onLongTap: onLongTap)
+        
+        button.bezelColor = .clear
+        button.imageScaling = .scaleProportionallyDown
+        button.imagePosition = .imageLeading
+        button.image?.size = NSSize(width: 24, height: 24)
+        
+        self.tapClosure = { [weak self] in self?.playPause() }
+        self.longTapClosure = { [weak self] in self?.nextTrack() }
+        
+        DispatchQueue.main.async {
+            self.updatePlayer()
+        }
+    }
+    
+    @objc func marquee(){
+        let str = self.button.title
+        if (str.count > 10) {
+            let indexFirst = str.index(str.startIndex, offsetBy: 0)
+            let indexSecond = str.index(str.startIndex, offsetBy: 1)
+            self.button.title = String(str.suffix(from: indexSecond)) + String(str[indexFirst])
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    @objc func playPause() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.playpause!()
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.playpause!()
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.playpause!()
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_play')[0].click()", in: tab)
+                                    break
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_play')[0].click()", in: tab)
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    safariApplication.doJavaScript!("document.getElementById('movie_player').click()", in: tab)
+                                    break
+                                }
+                            }
+                        }
+                    }
+                    //                    else if (musicPlayer.className == "GoogleChromeApplication") {
+                    //                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                    //                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                    //                        for window in chromeWindows! {
+                    //                            for tab in window.tabs!() {
+                    //                                let tab = tab as! GoogleChromeTab
+                    //                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('player-controls__btn_play')[0].click()")
+                    //                                    break
+                    //                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "document.getElementsByClassName('audio_page_player_ctrl')[0].click()")
+                    //                                    break
+                    //                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                    //                                    chromeApplication.executeJavaScript!(javascript: "alert(document.title)") // , id: tab
+                    //                                    break // document.getElementById('movie_player').click()
+                    //                                }
+                    //                            }
+                    //                        }
+                    //                    }
+                    break
+                }
+            }
+        }
+    }
+    
+    @objc func nextTrack() {
+        for ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        let mp = (musicPlayer as SpotifyApplication)
+                        mp.nextTrack!()
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        let mp = (musicPlayer as iTunesApplication)
+                        mp.nextTrack!()
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        let mp = (musicPlayer as VoxApplication)
+                        mp.next!()
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_next')[0].click()", in: tab)
+                                    break
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_next')[0].click()", in: tab)
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    safariApplication.doJavaScript!("document.getElementsByClassName('ytp-next-button')[0].click()", in: tab)
+                                    break
+                                }
+                            }
+                        }
+                    }
+                    break
+                }
+            }
+        }
+    }
+    
+    func updatePlayer() {
+        var iconUpdated = false
+        var titleUpdated = false
+        
+        for var ident in playerBundleIdentifiers {
+            if let musicPlayer = SBApplication(bundleIdentifier: ident) {
+                if (musicPlayer.isRunning) {
+                    var tempTitle = ""
+                    if (musicPlayer.className == "SpotifyApplication") {
+                        tempTitle = (musicPlayer as SpotifyApplication).title
+                    } else if (musicPlayer.className == "ITunesApplication") {
+                        tempTitle = (musicPlayer as iTunesApplication).title
+                    } else if (musicPlayer.className == "VOXApplication") {
+                        tempTitle = (musicPlayer as VoxApplication).title
+                    } else if (musicPlayer.className == "SafariApplication") {
+                        let safariApplication = musicPlayer as SafariApplication
+                        let safariWindows = safariApplication.windows?().compactMap({ $0 as? SafariWindow })
+                        for window in safariWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! SafariTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    //                                    if (!(tab.name?.hasSuffix("на Яндекс.Музыке"))!) {
+                                    tempTitle = (tab.name)!
+                                    break
+                                    //                                    }
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    tempTitle = (tab.name)!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = (tab.name)!
+                                    break
+                                }
+                            }
+                        }
+                        if tempTitle == "" {
+                            ident = ""
+                        }
+                    } else if (musicPlayer.className == "GoogleChromeApplication") {
+                        let chromeApplication = musicPlayer as GoogleChromeApplication
+                        let chromeWindows = chromeApplication.windows?().compactMap({ $0 as? GoogleChromeWindow })
+                        for window in chromeWindows! {
+                            for tab in window.tabs!() {
+                                let tab = tab as! GoogleChromeTab
+                                if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
+                                    if (!(tab.title?.hasSuffix("на Яндекс.Музыке"))!) {
+                                        tempTitle = tab.title!
+                                        break
+                                    }
+                                } else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) {
+                                    tempTitle = tab.title!
+                                    break
+                                } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
+                                    tempTitle = tab.title!
+                                    break
+                                }
+                            }
+                        }
+                        if tempTitle == "" {
+                            ident = ""
+                        }
+                    }
+                    
+                    if (tempTitle == self.songTitle) {
+                        DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+                            self?.updatePlayer()
+                        }
+                        return
+                    } else {
+                        self.songTitle = tempTitle
+                    }
+                    
+                    if (self.songTitle != "") {
+                        self.button.cell?.title = " " + self.songTitle! + "     "
+                        titleUpdated = true
+                        self.timer?.invalidate()
+                        self.timer = nil
+                        self.timer = Timer.scheduledTimer(timeInterval: 0.25, target: self, selector: #selector(self.marquee), userInfo: nil, repeats: true)
+                    }
+                    if ident != "" {
+                        if let appPath = NSWorkspace.shared.absolutePathForApplication(withBundleIdentifier: ident) {
+                            self.button.image = NSWorkspace.shared.icon(forFile: appPath)
+                            self.button.image?.size = self.buttonSize
+                            self.button.imagePosition = .imageLeft
+                            iconUpdated = true
+                        }
+                    }
+                    break
+                }
+            }
+        }
+        
+        DispatchQueue.main.async {
+            if !iconUpdated {
+                self.button.cell?.image = nil
+            }
+            
+            if !titleUpdated {
+                self.button.cell?.title = ""
+            }
+        }
+        DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
+            self?.updatePlayer()
+        }
+    }
+}
+
+@objc protocol SpotifyApplication {
+    @objc optional var currentTrack: SpotifyTrack {get}
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+    @objc optional func playpause()
+}
+extension SBApplication: SpotifyApplication{}
+
+@objc protocol SpotifyTrack {
+    @objc optional var artist: String {get}
+    @objc optional var name: String {get}
+}
+extension SBObject: SpotifyTrack{}
+
+extension SpotifyApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+
+@objc protocol iTunesApplication {
+    @objc optional var currentTrack: iTunesTrack {get}
+    @objc optional func playpause()
+    @objc optional func nextTrack()
+    @objc optional func previousTrack()
+}
+extension SBApplication: iTunesApplication{}
+
+@objc protocol iTunesTrack {
+    @objc optional var artist: String {get}
+    @objc optional var name: String {get}
+}
+extension SBObject: iTunesTrack{}
+
+extension iTunesApplication {
+    var title: String {
+        guard let t = currentTrack else { return "" }
+        return (t.artist ?? "") + " — " + (t.name ?? "")
+    }
+}
+
+
+
+@objc protocol VoxApplication {
+    @objc optional func playpause()
+    @objc optional func next()
+    @objc optional func previous()
+    @objc optional var track: String {get}
+    @objc optional var artist: String {get}
+}
+extension SBApplication: VoxApplication{}
+
+extension VoxApplication {
+    var title: String {
+        return (artist ?? "") + " — " + (track ?? "")
+    }
+}
+
+
+@objc public protocol SBObjectProtocol: NSObjectProtocol {
+    func get() -> Any!
+}
+
+@objc public protocol SBApplicationProtocol: SBObjectProtocol {
+    func activate()
+    var delegate: SBApplicationDelegate! { get set }
+}
+
+@objc public protocol SafariApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func doJavaScript(_ x: String!, in in_: Any!) -> Any // Applies a string of JavaScript code to a document.
+}
+extension SBApplication: SafariApplication {}
+
+@objc public protocol SafariWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+    //    @objc optional var document: SafariDocument { get } // The document whose contents are displayed in the window.
+    //    @objc optional func setCurrentTab(_ currentTab: SafariTab!) // The current tab.
+}
+extension SBObject: SafariWindow {}
+
+//@objc public protocol SafariDocument: SBObjectProtocol {
+//    @objc optional var name: String { get } // Its name.
+//    @objc optional var URL: String { get } // The current URL of the document.
+//}
+//extension SBObject: SafariDocument {}
+
+@objc public protocol SafariTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var name: String { get } // The name of the tab.
+}
+extension SBObject: SafariTab {}
+
+
+
+@objc public protocol GoogleChromeApplication: SBApplicationProtocol {
+    @objc optional func windows() -> SBElementArray
+    @objc optional func executeJavaScript(javascript: String!) -> Any // Applies a string of JavaScript code to a document. //, id: Any!
+}
+extension SBApplication: GoogleChromeApplication {}
+
+@objc public protocol GoogleChromeWindow: SBObjectProtocol {
+    @objc optional var name: String { get } // The title of the window.
+    @objc optional func tabs() -> SBElementArray
+}
+extension SBObject: GoogleChromeWindow {}
+
+@objc public protocol GoogleChromeTab: SBObjectProtocol {
+    @objc optional var URL: String { get } // The current URL of the tab.
+    @objc optional var title: String { get } // The name of the tab.
+}
+extension SBObject: GoogleChromeTab {}