AaronFiore/electrum
1
0
Fork 0
Code Activity

labels: emit callback when labels received.

Browse Source 
write labels regardless if there's already a label set for an ID.
This commit is contained in:
Sander van Grieken
2023-12-12 16:24:13 +01:00
parent 831be3b680
commit 3a22cb9c48
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
electrum/gui/qml/qewallet.py
View File

@@ -72,7 +72,6 @@ class QEWallet(AuthMixin, QObject, QtEventListener):
saveTxSuccess = pyqtSignal([str], arguments=['txid']) saveTxSuccess = pyqtSignal([str], arguments=['txid'])
saveTxError = pyqtSignal([str,str,str], arguments=['txid', 'code', 'message']) saveTxError = pyqtSignal([str,str,str], arguments=['txid', 'code', 'message'])
importChannelBackupFailed = pyqtSignal([str], arguments=['message']) importChannelBackupFailed = pyqtSignal([str], arguments=['message'])
labelsUpdated = pyqtSignal()
otpRequested = pyqtSignal() otpRequested = pyqtSignal()
otpSuccess = pyqtSignal() otpSuccess = pyqtSignal()
otpFailed = pyqtSignal([str,str], arguments=['code','message']) otpFailed = pyqtSignal([str,str], arguments=['code','message'])

9
electrum/plugins/labels/labels.py
View File

@@ -7,6 +7,7 @@ from typing import Union, TYPE_CHECKING
import base64 import base64
from electrum import util
from electrum.plugin import BasePlugin, hook from electrum.plugin import BasePlugin, hook
from electrum.crypto import aes_encrypt_with_iv, aes_decrypt_with_iv from electrum.crypto import aes_encrypt_with_iv, aes_decrypt_with_iv
from electrum.i18n import _ from electrum.i18n import _
@@ -137,7 +138,7 @@ class LabelsPlugin(BasePlugin):
if response["labels"] is None or len(response["labels"]) == 0: if response["labels"] is None or len(response["labels"]) == 0:
self.logger.info('no new labels') self.logger.info('no new labels')
return return
#self.logger.debug(f"labels received {response!r}")
self.logger.info(f'received {len(response["labels"])} labels') self.logger.info(f'received {len(response["labels"])} labels')
result = {} result = {}
for label in response["labels"]: for label in response["labels"]:
@@ -156,14 +157,14 @@ class LabelsPlugin(BasePlugin):
result[key] = value result[key] = value
for key, value in result.items(): for key, value in result.items():
if force or not wallet._get_label(key): wallet._set_label(key, value)
wallet._set_label(key, value)
self.set_nonce(wallet, response["nonce"] + 1) self.set_nonce(wallet, response["nonce"] + 1)
util.trigger_callback('labels_received', wallet, result)
self.on_pulled(wallet) self.on_pulled(wallet)
def on_pulled(self, wallet: 'Abstract_Wallet') -> None: def on_pulled(self, wallet: 'Abstract_Wallet') -> None:
raise NotImplementedError() pass
@ignore_exceptions @ignore_exceptions
@log_exceptions @log_exceptions

3
electrum/plugins/labels/qml.py
View File

@@ -113,11 +113,8 @@ class Plugin(LabelsPlugin):
threading.Thread(target=pull_thread, args=[wallet]).start() threading.Thread(target=pull_thread, args=[wallet]).start()
def on_pulled(self, wallet): def on_pulled(self, wallet):
self.logger.info('on pulled')
_wallet = QEWallet.getInstanceFor(wallet) _wallet = QEWallet.getInstanceFor(wallet)
self.logger.debug('wallet ' + ('found' if _wallet else 'not found')) self.logger.debug('wallet ' + ('found' if _wallet else 'not found'))
if _wallet:
_wallet.labelsUpdated.emit()
@hook @hook
def init_qml(self, app): def init_qml(self, app):