f29ddae47a
First, cache lookups were bugged... Second, the output needs to call data() first, everything else later. This is a bit nasty, and I'll consider re-visiting this, but right now, I don't see any other way, given that modules can now be iterated.
54 lines
1.5 KiB
Python
54 lines
1.5 KiB
Python
from __future__ import unicode_literals
|
|
|
|
import json
|
|
import bumblebee.output
|
|
|
|
class i3bar(bumblebee.output.Output):
|
|
def __init__(self, theme):
|
|
|
|
super(i3bar, self).__init__(theme)
|
|
self._data = []
|
|
|
|
def start(self):
|
|
return json.dumps({ "version": 1 }) + "["
|
|
|
|
def add(self, obj):
|
|
theme = self.theme()
|
|
|
|
while True:
|
|
d = obj.data()
|
|
data = {
|
|
u"full_text": "{}{}{}".format(theme.prefix(obj), d, theme.suffix(obj)),
|
|
"color": theme.color(obj),
|
|
"background": theme.background(obj),
|
|
}
|
|
|
|
if theme.urgent(obj) and obj.critical():
|
|
data["urgent"] = True
|
|
|
|
if theme.default_separators(obj) == False:
|
|
data["separator"] = False
|
|
data["separator_block_width"] = 0
|
|
if theme.separator(obj):
|
|
self._data.append({
|
|
u"full_text": theme.separator(obj),
|
|
"color": theme.background(obj),
|
|
"background": theme.previous_background(),
|
|
"separator": False,
|
|
"separator_block_width": 0,
|
|
})
|
|
|
|
self._data.append(data)
|
|
if obj.next() == False:
|
|
break
|
|
theme.next()
|
|
|
|
def get(self):
|
|
data = json.dumps(self._data)
|
|
self._data = []
|
|
return data + ","
|
|
|
|
def stop(self):
|
|
return "]"
|
|
|
|
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|