Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2014-04-01 11:25:29 +02:00
commit e082550f80

View file

@ -6,6 +6,7 @@ import decimal
import httplib import httplib
import json import json
import threading import threading
import time
import re import re
from decimal import Decimal from decimal import Decimal
from electrum.plugins import BasePlugin from electrum.plugins import BasePlugin
@ -16,6 +17,8 @@ from electrum_gui.qt.amountedit import AmountEdit
EXCHANGES = ["BitcoinAverage", EXCHANGES = ["BitcoinAverage",
"BitcoinVenezuela", "BitcoinVenezuela",
"Bitcurex",
"Bitmarket",
"BitPay", "BitPay",
"Blockchain", "Blockchain",
"BTCChina", "BTCChina",
@ -37,7 +40,7 @@ class Exchanger(threading.Thread):
self.query_rates = threading.Event() self.query_rates = threading.Event()
self.use_exchange = self.parent.config.get('use_exchange', "Blockchain") self.use_exchange = self.parent.config.get('use_exchange', "Blockchain")
self.parent.exchanges = EXCHANGES self.parent.exchanges = EXCHANGES
self.parent.currencies = ["EUR","GBP","USD"] self.parent.currencies = ["EUR","GBP","USD","PLN"]
self.parent.win.emit(SIGNAL("refresh_exchanges_combo()")) self.parent.win.emit(SIGNAL("refresh_exchanges_combo()"))
self.parent.win.emit(SIGNAL("refresh_currencies_combo()")) self.parent.win.emit(SIGNAL("refresh_currencies_combo()"))
self.is_running = False self.is_running = False
@ -81,6 +84,8 @@ class Exchanger(threading.Thread):
update_rates = { update_rates = {
"BitcoinAverage": self.update_ba, "BitcoinAverage": self.update_ba,
"BitcoinVenezuela": self.update_bv, "BitcoinVenezuela": self.update_bv,
"Bitcurex": self.update_bx,
"Bitmarket": self.update_bm,
"BitPay": self.update_bp, "BitPay": self.update_bp,
"Blockchain": self.update_bc, "Blockchain": self.update_bc,
"BTCChina": self.update_CNY, "BTCChina": self.update_CNY,
@ -149,6 +154,36 @@ class Exchanger(threading.Thread):
pass pass
self.parent.set_currencies(quote_currencies) self.parent.set_currencies(quote_currencies)
def update_bm(self):
try:
jsonresp = self.get_json('www.bitmarket.pl', "/json/BTCPLN/ticker.json")
except Exception:
return
quote_currencies = {"PLN": 0.0}
pln_price = jsonresp["last"]
try:
quote_currencies["PLN"] = decimal.Decimal(str(pln_price))
with self.lock:
self.quote_currencies = quote_currencies
except KeyError:
pass
self.parent.set_currencies(quote_currencies)
def update_bx(self):
try:
jsonresp = self.get_json('pln.bitcurex.com', "/data/ticker.json")
except Exception:
return
quote_currencies = {"PLN": 0.0}
pln_price = jsonresp["last"]
try:
quote_currencies["PLN"] = decimal.Decimal(str(pln_price))
with self.lock:
self.quote_currencies = quote_currencies
except KeyError:
pass
self.parent.set_currencies(quote_currencies)
def update_CNY(self): def update_CNY(self):
try: try:
jsonresp = self.get_json('data.btcchina.com', "/data/ticker") jsonresp = self.get_json('data.btcchina.com', "/data/ticker")
@ -421,7 +456,7 @@ class Plugin(BasePlugin):
newtx = self.wallet.get_tx_history() newtx = self.wallet.get_tx_history()
v = newtx[[x[0] for x in newtx].index(str(item.data(0, Qt.UserRole).toPyObject()))][3] v = newtx[[x[0] for x in newtx].index(str(item.data(0, Qt.UserRole).toPyObject()))][3]
tx_info = {'timestamp':int(datetime.datetime.now().strftime("%s")), 'value': v } tx_info = {'timestamp':int(time.time()), 'value': v }
pass pass
tx_time = int(tx_info['timestamp']) tx_time = int(tx_info['timestamp'])
if cur_exchange == "CoinDesk": if cur_exchange == "CoinDesk":