Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

reinstate the emitted signals for invalid version/error checking for updates

Browse Source
This commit is contained in:
Miguel Jacq 2018-01-23 16:51:13 +11:00
parent 70a624c331
commit a28f427c0c
No known key found for this signature in database
GPG Key ID: 5418373DFF79BA19
2 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
onionshare_gui/settings_dialog.py
View File

@ -564,26 +564,35 @@ class SettingsDialog(QtWidgets.QDialog):
autoupdate_timestamp = settings.get('autoupdate_timestamp') autoupdate_timestamp = settings.get('autoupdate_timestamp')
self._update_autoupdate_timestamp(autoupdate_timestamp) self._update_autoupdate_timestamp(autoupdate_timestamp)
# Check for updates def close_forced_update_thread():
def update_available(update_url, installed_version, latest_version):
Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
forced_update_thread.quit() forced_update_thread.quit()
# Enable buttons # Enable buttons
self._enable_buttons() self._enable_buttons()
# Update timestamp # Update timestamp
update_timestamp() update_timestamp()
# Check for updates
def update_available(update_url, installed_version, latest_version):
Alert(strings._("update_available", True).format(update_url, installed_version, latest_version))
close_forced_update_thread()
def update_not_available(): def update_not_available():
Alert(strings._('update_not_available', True)) Alert(strings._('update_not_available', True))
forced_update_thread.quit() close_forced_update_thread()
# Enable buttons
self._enable_buttons() def update_error():
# Update timestamp Alert(strings._('update_error_check_error', True), QtWidgets.QMessageBox.Warning)
update_timestamp() close_forced_update_thread()
def update_invalid_version():
Alert(strings._('update_error_invalid_latest_version', True).format(e.latest_version), QtWidgets.QMessageBox.Warning)
close_forced_update_thread()
forced_update_thread = UpdateThread(self.onion, self.config, force=True) forced_update_thread = UpdateThread(self.onion, self.config, force=True)
forced_update_thread.update_available.connect(update_available) forced_update_thread.update_available.connect(update_available)
forced_update_thread.update_not_available.connect(update_not_available) forced_update_thread.update_not_available.connect(update_not_available)
forced_update_thread.update_error.connect(update_error)
forced_update_thread.update_invalid_version.connect(update_invalid_version)
forced_update_thread.start() forced_update_thread.start()
def save_clicked(self): def save_clicked(self):

18
onionshare_gui/update_checker.py
View File

@ -51,6 +51,8 @@ class UpdateChecker(QtCore.QObject):
""" """
update_available = QtCore.pyqtSignal(str, str, str) update_available = QtCore.pyqtSignal(str, str, str)
update_not_available = QtCore.pyqtSignal() update_not_available = QtCore.pyqtSignal()
update_error = QtCore.pyqtSignal()
update_invalid_version = QtCore.pyqtSignal()
def __init__(self, onion, config=False): def __init__(self, onion, config=False):
super(UpdateChecker, self).__init__() super(UpdateChecker, self).__init__()
@ -120,12 +122,14 @@ class UpdateChecker(QtCore.QObject):
except Exception as e: except Exception as e:
common.log('UpdateChecker', 'check', '{}'.format(e)) common.log('UpdateChecker', 'check', '{}'.format(e))
self.update_error.emit()
raise UpdateCheckerCheckError raise UpdateCheckerCheckError
# Validate that latest_version looks like a version string # Validate that latest_version looks like a version string
# This regex is: 1-3 dot-separated numeric components # This regex is: 1-3 dot-separated numeric components
version_re = r"^(\d+\.)?(\d+\.)?(\d+)$" version_re = r"^(\d+\.)?(\d+\.)?(\d+)$"
if not re.match(version_re, latest_version): if not re.match(version_re, latest_version):
self.update_invalid_version.emit()
raise UpdateCheckerInvalidLatestVersion(latest_version) raise UpdateCheckerInvalidLatestVersion(latest_version)
# Update the last checked timestamp (dropping the seconds and milliseconds) # Update the last checked timestamp (dropping the seconds and milliseconds)
@ -148,6 +152,8 @@ class UpdateChecker(QtCore.QObject):
class UpdateThread(QtCore.QThread): class UpdateThread(QtCore.QThread):
update_available = QtCore.pyqtSignal(str, str, str) update_available = QtCore.pyqtSignal(str, str, str)
update_not_available = QtCore.pyqtSignal() update_not_available = QtCore.pyqtSignal()
update_error = QtCore.pyqtSignal()
update_invalid_version = QtCore.pyqtSignal()
def __init__(self, onion, config=False, force=False): def __init__(self, onion, config=False, force=False):
super(UpdateThread, self).__init__() super(UpdateThread, self).__init__()
@ -162,6 +168,8 @@ class UpdateThread(QtCore.QThread):
u = UpdateChecker(self.onion, self.config) u = UpdateChecker(self.onion, self.config)
u.update_available.connect(self._update_available) u.update_available.connect(self._update_available)
u.update_not_available.connect(self._update_not_available) u.update_not_available.connect(self._update_not_available)
u.update_error.connect(self._update_error)
u.update_invalid_version.connect(self._update_invalid_version)
try: try:
u.check(config=self.config,force=self.force) u.check(config=self.config,force=self.force)
@ -179,3 +187,13 @@ class UpdateThread(QtCore.QThread):
common.log('UpdateThread', '_update_not_available') common.log('UpdateThread', '_update_not_available')
self.active = False self.active = False
self.update_not_available.emit() self.update_not_available.emit()
def _update_error(self):
common.log('UpdateThread', '_update_error')
self.active = False
self.update_error.emit()
def _update_invalid_version(self):
common.log('UpdateThread', '_update_invalid_version')
self.active = False
self.update_invalid_version.emit()