masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MPD: use formatp, remove now completly useless format_sparse

Browse Source
This commit is contained in:
enkore 2013-08-03 14:39:27 +02:00
parent 353c874447
commit c841736eac
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
i3pystatus/mpd.py
View File

@ -1,7 +1,7 @@
import socket import socket
from i3pystatus import IntervalModule from i3pystatus import IntervalModule, formatp
def format_time(seconds): def format_time(seconds):
return "{}:{:02}".format(*divmod(int(seconds), 60)) if seconds else "" return "{}:{:02}".format(*divmod(int(seconds), 60)) if seconds else ""
@ -10,7 +10,7 @@ class MPD(IntervalModule):
""" """
Displays various information from MPD (the music player daemon) Displays various information from MPD (the music player daemon)
Available formatters: Available formatters (uses formatp)
* `{title}` — (the title of the current song) * `{title}` — (the title of the current song)
* `{album}` — (the album of the current song, can be an empty string (e.g. for online streams)) * `{album}` — (the album of the current song, can be an empty string (e.g. for online streams))
* `{artist}` — (can be empty, too) * `{artist}` — (can be empty, too)
@ -23,12 +23,6 @@ class MPD(IntervalModule):
* `{volume}` — (Volume set in MPD) * `{volume}` — (Volume set in MPD)
Left click on the module play/pauses, right click (un)mutes. Left click on the module play/pauses, right click (un)mutes.
`format` is the default format string and `format_sparse` is the format string for
situations where only partial metadata is available (only title, no album or artist data)
, as often the case with internet radio.
If `format_sparse` is None (the default), the standard format string is used.
""" """
interval = 1 interval = 1
@ -36,7 +30,7 @@ class MPD(IntervalModule):
settings = ( settings = (
("host"), ("host"),
("port", "MPD port"), ("port", "MPD port"),
"format", "format_sparse", ("format", "formatp string"),
("status", "Dictionary mapping pause, play and stop to output") ("status", "Dictionary mapping pause, play and stop to output")
) )
@ -90,12 +84,8 @@ class MPD(IntervalModule):
} }
fstring = self.format
if not fdict["album"] and not fdict["artist"]:
fstring = self.format_sparse
self.output = { self.output = {
"full_text": fstring.format(**fdict).strip(), "full_text": formatp(self.format, **fdict).strip(),
} }
def on_leftclick(self): def on_leftclick(self):