Merge pull request #192 from fredj/currency_use_ft
[modules/current] Use markets.ft.com instead of fixer.io
This commit is contained in:
commit
851be18d72
1 changed files with 17 additions and 13 deletions
|
@ -14,7 +14,7 @@ Parameters:
|
|||
the base symbol and the rate list
|
||||
* currency.destinationdelimiter: Delimiter used for separating individual rates (defaults to "|")
|
||||
|
||||
Note: source and destination names right now must correspond to the names used by the API of http://fixer.io
|
||||
Note: source and destination names right now must correspond to the names used by the API of https://markets.ft.com
|
||||
"""
|
||||
|
||||
import bumblebee.input
|
||||
|
@ -28,27 +28,29 @@ except ImportError:
|
|||
pass
|
||||
|
||||
SYMBOL = {
|
||||
"GBP": u"£", "EUR": u"€", "USD": u"$"
|
||||
"GBP": u"£", "EUR": u"€", "USD": u"$", "JPY": u"¥"
|
||||
}
|
||||
|
||||
API_URL = "https://markets.ft.com/data/currencies/ajax/conversion?baseCurrency={}&comparison={}"
|
||||
|
||||
class Module(bumblebee.engine.Module):
|
||||
def __init__(self, engine, config):
|
||||
super(Module, self).__init__(engine, config,
|
||||
bumblebee.output.Widget(full_text=self.price)
|
||||
)
|
||||
self._data = {}
|
||||
self._data = []
|
||||
self._interval = int(self.parameter("interval", 1))
|
||||
self._base = self.parameter("source", "GBP")
|
||||
self._symbols = self.parameter("destination", "USD,EUR")
|
||||
self._symbols = self.parameter("destination", "USD,EUR").split(",")
|
||||
self._nextcheck = 0
|
||||
|
||||
def price(self, widget):
|
||||
if self._data == {}:
|
||||
if len(self._data) == 0:
|
||||
return "?"
|
||||
|
||||
rates = []
|
||||
for sym in self._data["rates"]:
|
||||
rates.append(u"{}{}".format(self._data["rates"][sym], SYMBOL[sym] if sym in SYMBOL else sym))
|
||||
for sym, rate in self._data:
|
||||
rates.append(u"{}{}".format(rate, SYMBOL[sym] if sym in SYMBOL else sym))
|
||||
|
||||
basefmt = u"{}".format(self.parameter("sourceformat", "{}: {}"))
|
||||
ratefmt = u"{}".format(self.parameter("destinationdelimiter", "|"))
|
||||
|
@ -58,12 +60,14 @@ class Module(bumblebee.engine.Module):
|
|||
def update(self, widgets):
|
||||
timestamp = int(time.time())
|
||||
if self._nextcheck < int(time.time()):
|
||||
self._data = {}
|
||||
self._data = []
|
||||
self._nextcheck = int(time.time()) + self._interval*60
|
||||
url = "http://api.fixer.io/latest?symbols={}&base={}".format(self._symbols, self._base)
|
||||
try:
|
||||
self._data = json.loads(requests.get(url).text)
|
||||
except Exception:
|
||||
pass
|
||||
for symbol in self._symbols:
|
||||
url = API_URL.format(self._base, symbol)
|
||||
try:
|
||||
response = requests.get(url).json()
|
||||
self._data.append((symbol, response['data']['exchangeRate']))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
Loading…
Reference in a new issue