[formatting] reformat using "black -t py34"
getting rid of thinking about consistent formatting...
This commit is contained in:
tobi-wan-kenobi
parent
fa98bcbdd1
commit
30c1f712a6
119 changed files with 3961 additions and 3495 deletions
|
|
@ -32,18 +32,21 @@ import core.decorators
|
|||
import util.cli
|
||||
import util.format
|
||||
|
||||
|
||||
class Module(core.module.Module):
|
||||
def __init__(self, config, theme):
|
||||
super().__init__(config, theme, [])
|
||||
|
||||
self._layout = self.parameter('layout', 'cmus.prev cmus.main cmus.next cmus.shuffle cmus.repeat')
|
||||
self._fmt = self.parameter('format', '{artist} - {title} {position}/{duration}')
|
||||
self._server = self.parameter('server', None)
|
||||
self._passwd = self.parameter('passwd', None)
|
||||
self._layout = self.parameter(
|
||||
"layout", "cmus.prev cmus.main cmus.next cmus.shuffle cmus.repeat"
|
||||
)
|
||||
self._fmt = self.parameter("format", "{artist} - {title} {position}/{duration}")
|
||||
self._server = self.parameter("server", None)
|
||||
self._passwd = self.parameter("passwd", None)
|
||||
self._status = None
|
||||
self._shuffle = False
|
||||
self._repeat = False
|
||||
self._tags = defaultdict(lambda: '')
|
||||
self._tags = defaultdict(lambda: "")
|
||||
|
||||
# Create widgets
|
||||
widget_list = []
|
||||
|
|
@ -51,25 +54,48 @@ class Module(core.module.Module):
|
|||
for widget_name in self._layout.split():
|
||||
widget = core.widget.Widget(name=widget_name, module=self)
|
||||
widget_list.append(widget)
|
||||
self._cmd = 'cmus-remote'
|
||||
self._cmd = "cmus-remote"
|
||||
if self._server is not None:
|
||||
self._cmd = '{cmd} --server {server}'.format(cmd=self._cmd, server=self._server)
|
||||
self._cmd = "{cmd} --server {server}".format(
|
||||
cmd=self._cmd, server=self._server
|
||||
)
|
||||
if self._passwd is not None:
|
||||
self._cmd = '{cmd} --passwd {passwd}'.format(cmd=self._cmd, passwd=self._passwd)
|
||||
self._cmd = "{cmd} --passwd {passwd}".format(
|
||||
cmd=self._cmd, passwd=self._passwd
|
||||
)
|
||||
|
||||
if widget_name == 'cmus.prev':
|
||||
widget_map[widget] = {'button': core.input.LEFT_MOUSE, 'cmd': '{cmd} -r'.format(cmd=self._cmd)}
|
||||
elif widget_name == 'cmus.main':
|
||||
widget_map[widget] = {'button': core.input.LEFT_MOUSE, 'cmd': '{cmd} -u'.format(cmd=self._cmd)}
|
||||
if widget_name == "cmus.prev":
|
||||
widget_map[widget] = {
|
||||
"button": core.input.LEFT_MOUSE,
|
||||
"cmd": "{cmd} -r".format(cmd=self._cmd),
|
||||
}
|
||||
elif widget_name == "cmus.main":
|
||||
widget_map[widget] = {
|
||||
"button": core.input.LEFT_MOUSE,
|
||||
"cmd": "{cmd} -u".format(cmd=self._cmd),
|
||||
}
|
||||
widget.full_text(self.description)
|
||||
elif widget_name == 'cmus.next':
|
||||
widget_map[widget] = {'button': core.input.LEFT_MOUSE, 'cmd': '{cmd} -n'.format(cmd=self._cmd)}
|
||||
elif widget_name == 'cmus.shuffle':
|
||||
widget_map[widget] = {'button': core.input.LEFT_MOUSE, 'cmd': '{cmd} -S'.format(cmd=self._cmd)}
|
||||
elif widget_name == 'cmus.repeat':
|
||||
widget_map[widget] = {'button': core.input.LEFT_MOUSE, 'cmd': '{cmd} -R'.format(cmd=self._cmd)}
|
||||
elif widget_name == "cmus.next":
|
||||
widget_map[widget] = {
|
||||
"button": core.input.LEFT_MOUSE,
|
||||
"cmd": "{cmd} -n".format(cmd=self._cmd),
|
||||
}
|
||||
elif widget_name == "cmus.shuffle":
|
||||
widget_map[widget] = {
|
||||
"button": core.input.LEFT_MOUSE,
|
||||
"cmd": "{cmd} -S".format(cmd=self._cmd),
|
||||
}
|
||||
elif widget_name == "cmus.repeat":
|
||||
widget_map[widget] = {
|
||||
"button": core.input.LEFT_MOUSE,
|
||||
"cmd": "{cmd} -R".format(cmd=self._cmd),
|
||||
}
|
||||
else:
|
||||
raise KeyError('The cmus module does not support a {widget_name!r} widget'.format(widget_name=widget_name))
|
||||
raise KeyError(
|
||||
"The cmus module does not support a {widget_name!r} widget".format(
|
||||
widget_name=widget_name
|
||||
)
|
||||
)
|
||||
self.widgets(widget_list)
|
||||
|
||||
# Register input callbacks
|
||||
|
|
@ -88,44 +114,45 @@ class Module(core.module.Module):
|
|||
|
||||
def state(self, widget):
|
||||
returns = {
|
||||
'cmus.shuffle': 'shuffle-on' if self._shuffle else 'shuffle-off',
|
||||
'cmus.repeat': 'repeat-on' if self._repeat else 'repeat-off',
|
||||
'cmus.prev': 'prev',
|
||||
'cmus.next': 'next',
|
||||
"cmus.shuffle": "shuffle-on" if self._shuffle else "shuffle-off",
|
||||
"cmus.repeat": "repeat-on" if self._repeat else "repeat-off",
|
||||
"cmus.prev": "prev",
|
||||
"cmus.next": "next",
|
||||
}
|
||||
return returns.get(widget.name, self._status)
|
||||
|
||||
def _eval_line(self, line):
|
||||
if line.startswith('file '):
|
||||
if line.startswith("file "):
|
||||
full_file = line[5:]
|
||||
file1 = os.path.basename(full_file)
|
||||
file2 = os.path.splitext(file1)[0]
|
||||
self._tags.update({'file': full_file})
|
||||
self._tags.update({'file1': file1})
|
||||
self._tags.update({'file2': file2})
|
||||
self._tags.update({"file": full_file})
|
||||
self._tags.update({"file1": file1})
|
||||
self._tags.update({"file2": file2})
|
||||
return
|
||||
name, key, value = (line.split(' ', 2) + [None, None])[:3]
|
||||
name, key, value = (line.split(" ", 2) + [None, None])[:3]
|
||||
|
||||
if name == 'status':
|
||||
if name == "status":
|
||||
self._status = key
|
||||
if name == 'tag':
|
||||
if name == "tag":
|
||||
self._tags.update({key: value})
|
||||
if name in ['duration', 'position']:
|
||||
if name in ["duration", "position"]:
|
||||
self._tags.update({name: util.format.duration(int(key))})
|
||||
if name == 'set' and key == 'repeat':
|
||||
self._repeat = value == 'true'
|
||||
if name == 'set' and key == 'shuffle':
|
||||
self._shuffle = value == 'true'
|
||||
if name == "set" and key == "repeat":
|
||||
self._repeat = value == "true"
|
||||
if name == "set" and key == "shuffle":
|
||||
self._shuffle = value == "true"
|
||||
|
||||
def _load_song(self):
|
||||
info = ''
|
||||
info = ""
|
||||
try:
|
||||
info = util.cli.execute('{cmd} -Q'.format(cmd=self._cmd))
|
||||
info = util.cli.execute("{cmd} -Q".format(cmd=self._cmd))
|
||||
except RuntimeError:
|
||||
self._status = None
|
||||
|
||||
self._tags = defaultdict(lambda: '')
|
||||
for line in info.split('\n'):
|
||||
self._tags = defaultdict(lambda: "")
|
||||
for line in info.split("\n"):
|
||||
self._eval_line(line)
|
||||
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue