X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=plugins%2Fqrscanner.py;h=0ff1fe936c7c83959800a0e3594f3853b547000a;hb=81d1e67253c8ca581e821a6cd9e5ee1502fffd08;hp=e8849ad37bb9d71fa2fc1ec4ca10caa001f17a9c;hpb=56168e85b8e469f9c042eda6704a31d016efe26a;p=electrum-nvc.git diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py index e8849ad..0ff1fe9 100644 --- a/plugins/qrscanner.py +++ b/plugins/qrscanner.py @@ -23,7 +23,7 @@ class Plugin(BasePlugin): def fullname(self): return 'QR scans' - def description(self): return "QR Scans.\nInstall the zbar package (http://zbar.sourceforge.net/download.html) to enable this plugin" + def description(self): return "QR Scans.\nInstall the zbar package to enable this plugin.\nOn linux, type: 'apt-get install python-zbar'" def __init__(self, gui, name): BasePlugin.__init__(self, gui, name) @@ -35,6 +35,8 @@ class Plugin(BasePlugin): try: proc = zbar.Processor() proc.init(video_device=self.video_device()) + except zbar.UnsupportedError: + return False except zbar.SystemError: # Cannot open video device pass @@ -42,33 +44,21 @@ class Plugin(BasePlugin): return True - def load_wallet(self, wallet): - b = QPushButton(_("Scan QR code")) - b.clicked.connect(self.fill_from_qr) - self.send_tab_grid.addWidget(b, 1, 5) - b2 = QPushButton(_("Scan TxQR")) - b2.clicked.connect(self.read_raw_qr) - - if not wallet.seed: - b3 = QPushButton(_("Show unsigned TxQR")) - b3.clicked.connect(self.show_raw_qr) - self.send_tab_grid.addWidget(b3, 7, 1) - self.send_tab_grid.addWidget(b2, 7, 2) - else: - self.send_tab_grid.addWidget(b2, 7, 1) + def init(self): + self.win = self.gui.main_window def is_available(self): return self._is_available - def create_send_tab(self, grid): - self.send_tab_grid = grid + def is_enabled(self): + return True - def scan_qr(self): + def scan_qr_hook(self): proc = zbar.Processor() try: proc.init(video_device=self.video_device()) except zbar.SystemError, e: - QMessageBox.warning(self.gui.main_window, _('Error'), _(e), _('OK')) + QMessageBox.warning(self.win, _('Error'), _(e), _('OK')) return proc.visible = True @@ -76,7 +66,7 @@ class Plugin(BasePlugin): while True: try: proc.process_one() - except: + except Exception: # User closed the preview window return {} @@ -85,171 +75,7 @@ class Plugin(BasePlugin): continue return r.data - def show_raw_qr(self): - r = unicode( self.gui.main_window.payto_e.text() ) - r = r.strip() - - # label or alias, with address in brackets - m = re.match('(.*?)\s*\<([1-9A-HJ-NP-Za-km-z]{26,})\>', r) - to_address = m.group(2) if m else r - - if not is_valid(to_address): - QMessageBox.warning(self.gui.main_window, _('Error'), _('Invalid Bitcoin Address') + ':\n' + to_address, _('OK')) - return - - try: - amount = self.gui.main_window.read_amount(unicode( self.gui.main_window.amount_e.text())) - except: - QMessageBox.warning(self.gui.main_window, _('Error'), _('Invalid Amount'), _('OK')) - return - try: - fee = self.gui.main_window.read_amount(unicode( self.gui.main_window.fee_e.text())) - except: - QMessageBox.warning(self.gui.main_window, _('Error'), _('Invalid Fee'), _('OK')) - return - - try: - tx = self.gui.main_window.wallet.mktx( [(to_address, amount)], None, fee) - except BaseException, e: - self.gui.main_window.show_message(str(e)) - return - - if tx.requires_fee(self.gui.main_window.wallet.verifier) and fee < MIN_RELAY_TX_FEE: - QMessageBox.warning(self.gui.main_window, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK')) - return - try: - out = { - "hex" : tx.hash(), - "complete" : "false" - } - - input_info = [] - - except BaseException, e: - self.gui.main_window.show_message(str(e)) - - try: - json_text = json.dumps(tx.as_dict()).replace(' ', '') - self.show_tx_qrcode(json_text, 'Unsigned Transaction') - except BaseException, e: - self.gui.main_window.show_message(str(e)) - - def show_tx_qrcode(self, data, title): - if not data: return - d = QDialog(self.gui.main_window) - d.setModal(1) - d.setWindowTitle(title) - d.setMinimumSize(250, 525) - vbox = QVBoxLayout() - qrw = QRCodeWidget(data) - vbox.addWidget(qrw, 0) - hbox = QHBoxLayout() - hbox.addStretch(1) - - def print_qr(self): - filename = "qrcode.bmp" - electrum_gui.bmp.save_qrcode(qrw.qr, filename) - QMessageBox.information(None, _('Message'), _("QR code saved to file") + " " + filename, _('OK')) - - b = QPushButton(_("Save")) - hbox.addWidget(b) - b.clicked.connect(print_qr) - - b = QPushButton(_("Close")) - hbox.addWidget(b) - b.clicked.connect(d.accept) - b.setDefault(True) - - vbox.addLayout(hbox, 1) - d.setLayout(vbox) - d.exec_() - - def read_raw_qr(self): - qrcode = self.scan_qr() - if qrcode: - tx_dict = self.gui.main_window.tx_dict_from_text(qrcode) - if tx_dict: - self.create_transaction_details_window(tx_dict) - - - def create_transaction_details_window(self, tx_dict): - tx = Transaction(tx_dict["hex"]) - - dialog = QDialog(self.gui.main_window) - dialog.setMinimumWidth(500) - dialog.setWindowTitle(_('Process Offline transaction')) - dialog.setModal(1) - - l = QGridLayout() - dialog.setLayout(l) - - l.addWidget(QLabel(_("Transaction status:")), 3,0) - l.addWidget(QLabel(_("Actions")), 4,0) - - if tx_dict["complete"] == False: - l.addWidget(QLabel(_("Unsigned")), 3,1) - if self.gui.main_window.wallet.seed : - b = QPushButton("Sign transaction") - input_info = json.loads(tx_dict["input_info"]) - b.clicked.connect(lambda: self.sign_raw_transaction(tx, input_info, dialog)) - l.addWidget(b, 4, 1) - else: - l.addWidget(QLabel(_("Wallet is de-seeded, can't sign.")), 4,1) - else: - l.addWidget(QLabel(_("Signed")), 3,1) - b = QPushButton("Broadcast transaction") - b.clicked.connect(lambda: self.gui.main_window.send_raw_transaction(tx, dialog)) - l.addWidget(b,4,1) - - l.addWidget( self.gui.main_window.generate_transaction_information_widget(tx), 0,0,2,3) - closeButton = QPushButton(_("Close")) - closeButton.clicked.connect(lambda: dialog.done(0)) - l.addWidget(closeButton, 4,2) - - dialog.exec_() - - def do_protect(self, func, args): - if self.gui.main_window.wallet.use_encryption: - password = self.gui.main_window.password_dialog() - if not password: - return - else: - password = None - - if args != (False,): - args = (self,) + args + (password,) - else: - args = (self,password) - apply( func, args) - - def protected(func): - return lambda s, *args: s.do_protect(func, args) - - @protected - def sign_raw_transaction(self, tx, input_info, dialog ="", password = ""): - try: - self.gui.main_window.wallet.signrawtransaction(tx, input_info, [], password) - txtext = json.dumps(tx.as_dict()).replace(' ', '') - self.show_tx_qrcode(txtext, 'Signed Transaction') - except BaseException, e: - self.gui.main_window.show_message(str(e)) - - - def fill_from_qr(self): - qrcode = parse_uri(self.scan_qr()) - if not qrcode: - return - - if 'address' in qrcode: - self.gui.main_window.payto_e.setText(qrcode['address']) - if 'amount' in qrcode: - self.gui.main_window.amount_e.setText(str(qrcode['amount'])) - if 'label' in qrcode: - self.gui.main_window.message_e.setText(qrcode['label']) - if 'message' in qrcode: - self.gui.main_window.message_e.setText("%s (%s)" % (self.gui.main_window.message_e.text(), qrcode['message'])) - def video_device(self): device = self.config.get("video_device", "default") if device == 'default': @@ -292,7 +118,7 @@ class Plugin(BasePlugin): if self.config.get("video_device") == "default": self.video_device_edit.setText("") else: - self.video_device_edit.setText(self.config.get("video_device")) + self.video_device_edit.setText(self.config.get("video_device",'')) else: custom_device_label.setVisible(False) self.video_device_edit.setVisible(False) @@ -332,52 +158,3 @@ class Plugin(BasePlugin): return True else: return False - - - -def parse_uri(uri): - if ':' not in uri: - # It's just an address (not BIP21) - return {'address': uri} - - if '//' not in uri: - # Workaround for urlparse, it don't handle bitcoin: URI properly - uri = uri.replace(':', '://') - - uri = urlparse(uri) - result = {'address': uri.netloc} - - if uri.path.startswith('?'): - params = parse_qs(uri.path[1:]) - else: - params = parse_qs(uri.path) - - for k,v in params.items(): - if k in ('amount', 'label', 'message'): - result[k] = v[0] - - return result - - - - - -if __name__ == '__main__': - # Run some tests - - assert(parse_uri('1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin://1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN?amount=10') == - {'amount': '10', 'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN?amount=10&label=slush&message=Small%20tip%20to%20slush') == - {'amount': '10', 'label': 'slush', 'message': 'Small tip to slush', 'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - -