plugins: separate GUIs using child classes
This commit is contained in:
@@ -7,15 +7,6 @@ import sys
|
||||
import traceback
|
||||
from functools import partial
|
||||
|
||||
try:
|
||||
import PyQt4
|
||||
except Exception:
|
||||
sys.exit("Error: Could not import PyQt4 on Linux systems, you may try 'sudo apt-get install python-qt4'")
|
||||
|
||||
from PyQt4.QtGui import *
|
||||
from PyQt4.QtCore import *
|
||||
import PyQt4.QtCore as QtCore
|
||||
import PyQt4.QtGui as QtGui
|
||||
import aes
|
||||
import base64
|
||||
|
||||
@@ -23,8 +14,6 @@ import electrum
|
||||
from electrum.plugins import BasePlugin, hook
|
||||
from electrum.i18n import _
|
||||
|
||||
from electrum_gui.qt import HelpButton, EnterButton
|
||||
from electrum_gui.qt.util import ThreadedButton, Buttons, CancelButton, OkButton
|
||||
|
||||
class Plugin(BasePlugin):
|
||||
|
||||
@@ -32,34 +21,6 @@ class Plugin(BasePlugin):
|
||||
BasePlugin.__init__(self, parent, config, name)
|
||||
self.target_host = 'sync.bytesized-hosting.com:9090'
|
||||
self.wallets = {}
|
||||
self.obj = QObject()
|
||||
self.obj.connect(self.obj, SIGNAL('labels:pulled'), self.on_pulled)
|
||||
|
||||
@hook
|
||||
def on_new_window(self, window):
|
||||
wallet = window.wallet
|
||||
nonce = self.get_nonce(wallet)
|
||||
self.print_error("wallet", wallet.basename(), "nonce is", nonce)
|
||||
mpk = ''.join(sorted(wallet.get_master_public_keys().values()))
|
||||
if not mpk:
|
||||
return
|
||||
|
||||
password = hashlib.sha1(mpk).digest().encode('hex')[:32]
|
||||
iv = hashlib.sha256(password).digest()[:16]
|
||||
wallet_id = hashlib.sha256(mpk).digest().encode('hex')
|
||||
self.wallets[wallet] = (password, iv, wallet_id)
|
||||
|
||||
# If there is an auth token we can try to actually start syncing
|
||||
t = threading.Thread(target=self.pull_thread, args=(window, False))
|
||||
t.setDaemon(True)
|
||||
t.start()
|
||||
|
||||
@hook
|
||||
def on_close_window(self, window):
|
||||
self.wallets.pop(window.wallet)
|
||||
|
||||
def version(self):
|
||||
return "0.0.1"
|
||||
|
||||
def encode(self, wallet, msg):
|
||||
password, iv, wallet_id = self.wallets[wallet]
|
||||
@@ -85,9 +46,6 @@ class Plugin(BasePlugin):
|
||||
self.print_error("set", wallet.basename(), "nonce to", nonce)
|
||||
wallet.storage.put("wallet_nonce", nonce, force_write)
|
||||
|
||||
def requires_settings(self):
|
||||
return True
|
||||
|
||||
@hook
|
||||
def set_label(self, wallet, item, label):
|
||||
if not wallet in self.wallets:
|
||||
@@ -105,47 +63,6 @@ class Plugin(BasePlugin):
|
||||
# Caller will write the wallet
|
||||
self.set_nonce(wallet, nonce + 1, force_write=False)
|
||||
|
||||
def settings_widget(self, window):
|
||||
return EnterButton(_('Settings'),
|
||||
partial(self.settings_dialog, window))
|
||||
|
||||
def settings_dialog(self, window):
|
||||
print "window:", window
|
||||
d = QDialog(window)
|
||||
vbox = QVBoxLayout(d)
|
||||
layout = QGridLayout()
|
||||
vbox.addLayout(layout)
|
||||
|
||||
layout.addWidget(QLabel("Label sync options: "),2,0)
|
||||
|
||||
self.upload = ThreadedButton("Force upload",
|
||||
partial(self.push_thread, window),
|
||||
self.done_processing)
|
||||
layout.addWidget(self.upload, 2, 1)
|
||||
|
||||
self.download = ThreadedButton("Force download",
|
||||
partial(self.pull_thread, window, True),
|
||||
self.done_processing)
|
||||
layout.addWidget(self.download, 2, 2)
|
||||
|
||||
self.accept = OkButton(d, _("Done"))
|
||||
vbox.addLayout(Buttons(CancelButton(d), self.accept))
|
||||
|
||||
if d.exec_():
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def on_pulled(self, window, nonce):
|
||||
wallet = window.wallet
|
||||
wallet.storage.put('labels', wallet.labels, False)
|
||||
self.set_nonce(wallet, nonce)
|
||||
window.labelsChanged.emit()
|
||||
|
||||
def done_processing(self):
|
||||
QMessageBox.information(None, _("Labels synchronised"),
|
||||
_("Your labels have been synchronised."))
|
||||
|
||||
def do_request(self, method, url = "/labels", is_batch=False, data=None):
|
||||
url = 'https://' + self.target_host + url
|
||||
kwargs = {'headers': {}}
|
||||
@@ -162,8 +79,7 @@ class Plugin(BasePlugin):
|
||||
raise BaseException(response["error"])
|
||||
return response
|
||||
|
||||
def push_thread(self, window):
|
||||
wallet = window.wallet
|
||||
def push_thread(self, wallet):
|
||||
wallet_id = self.wallets[wallet][2]
|
||||
bundle = {"labels": [],
|
||||
"walletId": wallet_id,
|
||||
@@ -179,14 +95,14 @@ class Plugin(BasePlugin):
|
||||
'externalId': encoded_key})
|
||||
self.do_request("POST", "/labels", True, bundle)
|
||||
|
||||
def pull_thread(self, window, force):
|
||||
wallet = window.wallet
|
||||
def pull_thread(self, wallet, force):
|
||||
wallet_id = self.wallets[wallet][2]
|
||||
nonce = 1 if force else self.get_nonce(wallet) - 1
|
||||
self.print_error("asking for labels since nonce", nonce)
|
||||
try:
|
||||
response = self.do_request("GET", ("/labels/since/%d/for/%s" % (nonce, wallet_id) ))
|
||||
if response["labels"] is None:
|
||||
self.print_error('no new labels')
|
||||
return
|
||||
result = {}
|
||||
for label in response["labels"]:
|
||||
@@ -208,9 +124,86 @@ class Plugin(BasePlugin):
|
||||
wallet.labels[key] = value
|
||||
|
||||
self.print_error("received %d labels" % len(response))
|
||||
self.obj.emit(SIGNAL('labels:pulled'), window,
|
||||
response["nonce"] + 1)
|
||||
# do not write to disk because we're in a daemon thread
|
||||
wallet.storage.put('labels', wallet.labels, False)
|
||||
self.set_nonce(wallet, response["nonce"] + 1, False)
|
||||
self.on_pulled(wallet)
|
||||
|
||||
except Exception as e:
|
||||
traceback.print_exc(file=sys.stderr)
|
||||
self.print_error("could not retrieve labels")
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
from PyQt4.QtGui import *
|
||||
from PyQt4.QtCore import *
|
||||
import PyQt4.QtCore as QtCore
|
||||
import PyQt4.QtGui as QtGui
|
||||
from electrum_gui.qt import HelpButton, EnterButton
|
||||
from electrum_gui.qt.util import ThreadedButton, Buttons, CancelButton, OkButton
|
||||
|
||||
class QtPlugin(Plugin):
|
||||
|
||||
def __init__(self, *args):
|
||||
Plugin.__init__(self, *args)
|
||||
self.obj = QObject()
|
||||
|
||||
def requires_settings(self):
|
||||
return True
|
||||
|
||||
def settings_widget(self, window):
|
||||
return EnterButton(_('Settings'),
|
||||
partial(self.settings_dialog, window))
|
||||
|
||||
def settings_dialog(self, window):
|
||||
d = QDialog(window)
|
||||
vbox = QVBoxLayout(d)
|
||||
layout = QGridLayout()
|
||||
vbox.addLayout(layout)
|
||||
layout.addWidget(QLabel("Label sync options: "), 2, 0)
|
||||
self.upload = ThreadedButton("Force upload",
|
||||
partial(self.push_thread, window.wallet),
|
||||
self.done_processing)
|
||||
layout.addWidget(self.upload, 2, 1)
|
||||
self.download = ThreadedButton("Force download",
|
||||
partial(self.pull_thread, window.wallet, True),
|
||||
self.done_processing)
|
||||
layout.addWidget(self.download, 2, 2)
|
||||
self.accept = OkButton(d, _("Done"))
|
||||
vbox.addLayout(Buttons(CancelButton(d), self.accept))
|
||||
if d.exec_():
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def on_pulled(self, wallet):
|
||||
self.obj.emit(SIGNAL('labels_changed'), wallet)
|
||||
|
||||
def done_processing(self):
|
||||
QMessageBox.information(None, _("Labels synchronised"),
|
||||
_("Your labels have been synchronised."))
|
||||
|
||||
@hook
|
||||
def on_new_window(self, window):
|
||||
window.connect(window.app, SIGNAL('labels_changed'), window.update_tabs)
|
||||
wallet = window.wallet
|
||||
nonce = self.get_nonce(wallet)
|
||||
self.print_error("wallet", wallet.basename(), "nonce is", nonce)
|
||||
mpk = ''.join(sorted(wallet.get_master_public_keys().values()))
|
||||
if not mpk:
|
||||
return
|
||||
password = hashlib.sha1(mpk).digest().encode('hex')[:32]
|
||||
iv = hashlib.sha256(password).digest()[:16]
|
||||
wallet_id = hashlib.sha256(mpk).digest().encode('hex')
|
||||
self.wallets[wallet] = (password, iv, wallet_id)
|
||||
# If there is an auth token we can try to actually start syncing
|
||||
t = threading.Thread(target=self.pull_thread, args=(wallet, False))
|
||||
t.setDaemon(True)
|
||||
t.start()
|
||||
|
||||
@hook
|
||||
def on_close_window(self, window):
|
||||
self.wallets.pop(window.wallet)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user