CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-09-29 08:51:43 +13:00
Code Issues Projects Releases Wiki Activity

Small fixes

Browse source
This commit is contained in:
Dummerle 2021-12-13 21:57:21 +01:00
parent cc95d231b6
commit b9253d0971
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
rare/components/tabs/settings/ubisoft_activation.py
View file

@ -1,3 +1,4 @@
import time
import webbrowser import webbrowser
from logging import getLogger from logging import getLogger
@ -13,7 +14,7 @@ logger = getLogger("Ubisoft")
class Signals(QObject): class Signals(QObject):
worker_finished = pyqtSignal(set, set, str) worker_finished = pyqtSignal(set, set, str)
connected = pyqtSignal(str) linked = pyqtSignal(str)
class UbiGetInfoWorker(QRunnable): class UbiGetInfoWorker(QRunnable):
@ -55,14 +56,18 @@ class UbiConnectWorker(QRunnable):
self.partner_link_id = partner_link_id self.partner_link_id = partner_link_id
def run(self) -> None: def run(self) -> None:
if not self.ubi_account_id: # debug
time.sleep(2)
self.signals.linked.emit("")
return
try: try:
shared.core.egs.store_claim_uplay_code(self.ubi_account_id, self.partner_link_id) shared.core.egs.store_claim_uplay_code(self.ubi_account_id, self.partner_link_id)
shared.core.egs.store_redeem_uplay_codes(self.ubi_account_id) shared.core.egs.store_redeem_uplay_codes(self.ubi_account_id)
except Exception as e: except Exception as e:
self.signals.connected.emit(str(e)) self.signals.linked.emit(str(e))
return return
else: else:
self.signals.connected.emit("") self.signals.linked.emit("")
class UbiLinkWidget(QWidget): class UbiLinkWidget(QWidget):
@ -72,37 +77,40 @@ class UbiLinkWidget(QWidget):
self.game = game self.game = game
self.ubi_account_id = ubi_account_id self.ubi_account_id = ubi_account_id
self.title_label = QLabel(game.app_title)
self.layout().addWidget(self.title_label)
self.ok_indicator = QLabel() self.ok_indicator = QLabel()
self.ok_indicator.setVisible(False) self.ok_indicator.setPixmap(icon("fa.info-circle", color="grey").pixmap(20, 20))
self.ok_indicator.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Preferred) self.ok_indicator.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Preferred)
self.layout().addWidget(self.ok_indicator) self.layout().addWidget(self.ok_indicator)
self.title_label = QLabel(game.app_title) self.link_button = QPushButton(self.tr("Redeem to Ubisoft") + ": Test" if shared.args.debug else "")
self.layout().addWidget(self.title_label) self.layout().addWidget(self.link_button)
if not shared.args.debug: self.link_button.clicked.connect(self.activate)
self.link_button = QPushButton(self.tr("Redeem to Ubisoft"))
self.layout().addWidget(self.link_button)
self.link_button.clicked.connect(self.activate)
else:
btn = QPushButton("Redeem to ubisoft: Test")
self.layout().addWidget(btn)
btn.clicked.connect(lambda: self.worker_finished("Any Error"))
def activate(self): def activate(self):
self.link_button.setDisabled(True)
# self.ok_indicator.setPixmap(icon("mdi.loading", color="grey").pixmap(20, 20))
self.ok_indicator.setPixmap(icon("mdi.transit-connection-horizontal", color="grey").pixmap(20, 20))
if shared.args.debug: if shared.args.debug:
self.worker_finished("Connection Error") worker = UbiConnectWorker(None, None)
return else:
worker = UbiConnectWorker(self.ubi_account_id, self.game.partner_link_id) worker = UbiConnectWorker(self.ubi_account_id, self.game.partner_link_id)
worker.signals.worker_finished.connect(self.worker_finished) worker.signals.linked.connect(self.worker_finished)
QThreadPool.globalInstance().start(worker) QThreadPool.globalInstance().start(worker)
def worker_finished(self, error): def worker_finished(self, error):
self.ok_indicator.setVisible(True)
if not error: if not error:
self.ok_indicator.setPixmap(icon("ei.ok-circle", color="green").pixmap(QSize(20, 20))) self.ok_indicator.setPixmap(icon("ei.ok-circle", color="green").pixmap(QSize(20, 20)))
self.link_button.setDisabled(True)
self.link_button.setText(self.tr("Already activated"))
else: else:
self.ok_indicator.setPixmap(icon("fa.info-circle", color="red").pixmap(QSize(20, 20))) self.ok_indicator.setPixmap(icon("fa.info-circle", color="red").pixmap(QSize(20, 20)))
self.ok_indicator.setToolTip(error) self.ok_indicator.setToolTip(error)
self.link_button.setText(self.tr("Try again"))
self.link_button.setDisabled(False)
class UbiActivationHelper(QObject): class UbiActivationHelper(QObject):