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

[modules/currency] Use a list for the data to preserve the order

Browse source
This commit is contained in:
Frederic Junod 2017-10-17 16:44:05 +02:00
parent 4b1ba93109
commit 1eb49ab53e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bumblebee/modules/currency.py
View file

@ -39,18 +39,18 @@ class Module(bumblebee.engine.Module):
super(Module, self).__init__(engine, config, super(Module, self).__init__(engine, config,
bumblebee.output.Widget(full_text=self.price) bumblebee.output.Widget(full_text=self.price)
) )
self._data = {} self._data = []
self._interval = int(self.parameter("interval", 1)) self._interval = int(self.parameter("interval", 1))
self._base = self.parameter("source", "GBP") self._base = self.parameter("source", "GBP")
self._symbols = self.parameter("destination", "USD,EUR").split(",") self._symbols = self.parameter("destination", "USD,EUR").split(",")
self._nextcheck = 0 self._nextcheck = 0
def price(self, widget): def price(self, widget):
if self._data == {}: if len(self._data) == 0:
return "?" return "?"
rates = [] rates = []
for sym, rate in self._data.items(): for sym, rate in self._data:
rates.append(u"{}{}".format(rate, SYMBOL[sym] if sym in SYMBOL else sym)) rates.append(u"{}{}".format(rate, SYMBOL[sym] if sym in SYMBOL else sym))
basefmt = u"{}".format(self.parameter("sourceformat", "{}: {}")) basefmt = u"{}".format(self.parameter("sourceformat", "{}: {}"))
@ -61,13 +61,13 @@ class Module(bumblebee.engine.Module):
def update(self, widgets): def update(self, widgets):
timestamp = int(time.time()) timestamp = int(time.time())
if self._nextcheck < int(time.time()): if self._nextcheck < int(time.time()):
self._data = {} self._data = []
self._nextcheck = int(time.time()) + self._interval*60 self._nextcheck = int(time.time()) + self._interval*60
for symbol in self._symbols: for symbol in self._symbols:
url = API_URL.format(self._base, symbol) url = API_URL.format(self._base, symbol)
try: try:
response = requests.get(url).json() response = requests.get(url).json()
self._data[symbol] = response['data']['exchangeRate'] self._data.append((symbol, response['data']['exchangeRate']))
except Exception: except Exception:
pass pass