mirror/mpdevil
1
0
Fork 0
mirror of https://github.com/SoongNoonien/mpdevil.git synced 2023-08-10 21:12:44 +03:00
Code Issues Projects Releases Wiki Activity

simplified _on_song_changed in MainWindow

Browse Source
This commit is contained in:
Martin Wagner 2022-02-01 20:08:08 +01:00
parent 3ff526d964
commit b524efc817
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mpdevil.py
View File

@ -573,16 +573,18 @@ class Song(collections.UserDict):
else: else:
return None return None
def get_markup(self): def get_album_with_date(self):
if "date" in self: if "date" in self:
album=GLib.markup_escape_text(f"{self['album'][0]} ({self['date']})") return f"{self['album'][0]} ({self['date']})"
else: else:
album=GLib.markup_escape_text(self["album"][0]) return self["album"][0]
def get_markup(self):
if "artist" in self: if "artist" in self:
title=f"<b>{GLib.markup_escape_text(self['title'][0])}</b> • {GLib.markup_escape_text(str(self['artist']))}" title=f"<b>{GLib.markup_escape_text(self['title'][0])}</b> • {GLib.markup_escape_text(str(self['artist']))}"
else: else:
title=f"<b>{GLib.markup_escape_text(self['title'][0])}</b>" title=f"<b>{GLib.markup_escape_text(self['title'][0])}</b>"
return f"{title}\n<small>{album}</small>" return f"{title}\n<small>{GLib.markup_escape_text(self.get_album_with_date())}</small>"
class BinaryCover(bytes): class BinaryCover(bytes):
def get_pixbuf(self, size): def get_pixbuf(self, size):
@ -3596,19 +3598,16 @@ class MainWindow(Gtk.ApplicationWindow):
def _on_song_changed(self, *args): def _on_song_changed(self, *args):
song=self._client.currentsong() song=self._client.currentsong()
if song: if song:
if "date" in song: album=song.get_album_with_date()
date=f"({song['date']})" title=" • ".join(filter(None, (song["title"][0], str(song["artist"]))))
else:
date=""
album_with_date=" ".join(filter(None, (song["album"][0], date)))
if self._use_csd: if self._use_csd:
self.set_title(" • ".join(filter(None, (str(song["title"]), str(song["artist"]))))) self.set_title(title)
self._header_bar.set_subtitle(album_with_date) self._header_bar.set_subtitle(album)
else: else:
self.set_title(" • ".join(filter(None, (str(song["title"]), str(song["artist"]), album_with_date)))) self.set_title(" • ".join(filter(None, (title, album))))
if self._settings.get_boolean("send-notify"): if self._settings.get_boolean("send-notify"):
if not self.is_active() and self._client.status()["state"] == "play": if not self.is_active() and self._client.status()["state"] == "play":
self._notify.update(str(song["title"]), f"{song['artist']}\n{album_with_date}") self._notify.update(str(song["title"]), f"{song['artist']}\n{album}")
pixbuf=self._client.get_cover(song).get_pixbuf(400) pixbuf=self._client.get_cover(song).get_pixbuf(400)
self._notify.set_image_from_pixbuf(pixbuf) self._notify.set_image_from_pixbuf(pixbuf)
self._notify.show() self._notify.show()