l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/cmus] Refactor and simplify code

Browse source
This commit is contained in:
Tobias Witek 2017-08-19 16:07:52 +02:00
parent c72432e80b
commit 5e007acb5c
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
bumblebee/modules/cmus.py
View file

@ -60,15 +60,28 @@ class Module(bumblebee.engine.Module):
self._load_song() self._load_song()
def state(self, widget): def state(self, widget):
if widget.name == "cmus.shuffle": returns = {
return "shuffle-on" if self._shuffle else "shuffle-off" "cmus.shuffle": "shuffle-on" if self._shuffle else "shuffle-off",
if widget.name == "cmus.repeat": "cmus.repeat": "repeat-on" if self._repeat else "repeat-off",
return "repeat-on" if self._repeat else "repeat-off" "cmus.prev": "prev",
if widget.name == "cmus.prev": "cmus.next": "next",
return "prev" }
if widget.name == "cmus.next": return returns.get(widget.name, self._status)
return "next"
return self._status def _eval_line(self, line):
items = line.split(" ", 2)
name, key, value = (line.split(" ", 2) + [None, None])[:3]
if name == "status":
self._status = key
if name == "tag":
self._tags.update({key: value})
if name in ["duration", "position"]:
self._tags.update({key:bumblebee.util.durationfmt(int(key))})
if name == "set" and key == "repeat":
self._repeat = value == "true"
if name == "set" and key == "shuffle":
self._shuffle = value == "true"
def _load_song(self): def _load_song(self):
info = "" info = ""
@ -76,21 +89,9 @@ class Module(bumblebee.engine.Module):
info = bumblebee.util.execute("cmus-remote -Q") info = bumblebee.util.execute("cmus-remote -Q")
except RuntimeError: except RuntimeError:
self._status = None self._status = None
pass
self._tags = defaultdict(lambda: '') self._tags = defaultdict(lambda: '')
for line in info.split("\n"): for line in info.split("\n"):
if line.startswith("status"): self._eval_line(line)
self._status = line.split(" ", 2)[1]
if line.startswith("tag"):
key, value = line.split(" ", 2)[1:]
self._tags.update({ key: value })
for key in ["duration", "position"]:
if line.startswith(key):
dur = int(line.split(" ")[1])
self._tags.update({key:bumblebee.util.durationfmt(dur)})
if line.startswith("set repeat "):
self._repeat = False if "false" in line else True
if line.startswith("set shuffle "):
self._shuffle = False if "false" in line else True
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4