tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #968 from mreinhardt/feature/fix-now-playing-spotify-comma-error 

Fix NowPlaying segment when comma in artist or title
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2014-08-09 15:26:30 +04:00
parent 6cc86c825e 91826e4483
commit 11168bf709
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
powerline/segments/common.py
View File

@ -1035,6 +1035,7 @@ class NowPlayingSegment(Segment):
} }
def player_spotify_apple_script(self, pl): def player_spotify_apple_script(self, pl):
status_delimiter = '-~`/='
ascript = ''' ascript = '''
tell application "System Events" tell application "System Events"
set process_list to (name of every process) set process_list to (name of every process)
@ -1047,13 +1048,8 @@ class NowPlayingSegment(Segment):
set artist_name to artist of current track set artist_name to artist of current track
set album_name to album of current track set album_name to album of current track
set track_length to duration of current track set track_length to duration of current track
set trim_length to 40 set now_playing to "" & player state & "{0}" & album_name & "{0}" & artist_name & "{0}" & track_name & "{0}" & track_length
set now_playing to player state & album_name & artist_name & track_name & track_length return now_playing
if length of now_playing is less than trim_length then
set now_playing_trim to now_playing
else
set now_playing_trim to characters 1 thru trim_length of now_playing as string
end if
else else
return player state return player state
end if end if
@ -1062,13 +1058,13 @@ class NowPlayingSegment(Segment):
else else
return "stopped" return "stopped"
end if end if
''' '''.format(status_delimiter)
spotify = asrun(pl, ascript) spotify = asrun(pl, ascript)
if not asrun: if not asrun:
return None return None
spotify_status = spotify.split(", ") spotify_status = spotify.split(status_delimiter)
state = self._convert_state(spotify_status[0]) state = self._convert_state(spotify_status[0])
if state == 'stop': if state == 'stop':
return None return None