toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-11 09:28:38 +00:00
Code Issues Releases Wiki Activity

Update music title right after switch to the next track

Browse Source
This commit is contained in:
Daniel Apatin 2018-05-23 19:24:58 +03:00 committed by GitHub
parent 091208e536
commit 088f141da3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
MTMR/Widgets/MusicBarItem.swift
View File

@ -32,9 +32,7 @@ class MusicBarItem: CustomButtonTouchBarItem {
self.tapClosure = { [weak self] in self?.playPause() } self.tapClosure = { [weak self] in self?.playPause() }
self.longTapClosure = { [weak self] in self?.nextTrack() } self.longTapClosure = { [weak self] in self?.nextTrack() }
DispatchQueue.main.async { self.refreshAndSchedule()
self.updatePlayer()
}
} }
@objc func marquee(){ @objc func marquee(){
@ -118,14 +116,17 @@ class MusicBarItem: CustomButtonTouchBarItem {
if (musicPlayer.className == "SpotifyApplication") { if (musicPlayer.className == "SpotifyApplication") {
let mp = (musicPlayer as SpotifyApplication) let mp = (musicPlayer as SpotifyApplication)
mp.nextTrack!() mp.nextTrack!()
updatePlayer()
return return
} else if (musicPlayer.className == "ITunesApplication") { } else if (musicPlayer.className == "ITunesApplication") {
let mp = (musicPlayer as iTunesApplication) let mp = (musicPlayer as iTunesApplication)
mp.nextTrack!() mp.nextTrack!()
updatePlayer()
return return
} else if (musicPlayer.className == "VOXApplication") { } else if (musicPlayer.className == "VOXApplication") {
let mp = (musicPlayer as VoxApplication) let mp = (musicPlayer as VoxApplication)
mp.next!() mp.next!()
updatePlayer()
return return
} else if (musicPlayer.className == "SafariApplication") { } else if (musicPlayer.className == "SafariApplication") {
// You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'. // You must enable the 'Allow JavaScript from Apple Events' option in Safari's Develop menu to use 'do JavaScript'.
@ -136,12 +137,15 @@ class MusicBarItem: CustomButtonTouchBarItem {
let tab = tab as! SafariTab let tab = tab as! SafariTab
if (tab.URL?.starts(with: "https://music.yandex.ru"))! { if (tab.URL?.starts(with: "https://music.yandex.ru"))! {
_ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_next')[0].click()", in: tab) _ = safariApplication.doJavaScript!("document.getElementsByClassName('player-controls__btn_next')[0].click()", in: tab)
updatePlayer()
return return
} else if ((tab.URL?.starts(with: "https://vk.com/audios"))! || (tab.URL?.starts(with: "https://vk.com/music"))!) { } 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) _ = safariApplication.doJavaScript!("document.getElementsByClassName('audio_page_player_next')[0].click()", in: tab)
updatePlayer()
return return
} else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! { } else if (tab.URL?.starts(with: "https://www.youtube.com/watch"))! {
_ = safariApplication.doJavaScript!("document.getElementsByClassName('ytp-next-button')[0].click()", in: tab) _ = safariApplication.doJavaScript!("document.getElementsByClassName('ytp-next-button')[0].click()", in: tab)
updatePlayer()
return return
} }
} }
@ -152,6 +156,15 @@ class MusicBarItem: CustomButtonTouchBarItem {
} }
} }
func refreshAndSchedule() {
DispatchQueue.main.async {
self.updatePlayer()
DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
self?.refreshAndSchedule()
}
}
}
func updatePlayer() { func updatePlayer() {
var iconUpdated = false var iconUpdated = false
var titleUpdated = false var titleUpdated = false
@ -215,9 +228,6 @@ class MusicBarItem: CustomButtonTouchBarItem {
} }
if (tempTitle == self.songTitle) { if (tempTitle == self.songTitle) {
DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
self?.updatePlayer()
}
return return
} else { } else {
self.songTitle = tempTitle self.songTitle = tempTitle
@ -251,9 +261,6 @@ class MusicBarItem: CustomButtonTouchBarItem {
self.title = "" self.title = ""
} }
} }
DispatchQueue.main.asyncAfter(deadline: .now() + self.interval) { [weak self] in
self?.updatePlayer()
}
} }
} }