Updates "update" prefs to reflect new changes

This commit is contained in:
blitzmann
2014-08-17 23:27:07 -04:00
parent 0881abae7b
commit 8928d394c0
4 changed files with 17 additions and 34 deletions

View File

@@ -251,10 +251,10 @@ class UpdateSettings():
def __init__(self):
# Settings
# all - If True, suppress all update notifications
# prerelease - If True, suppress only prerelease notifications
# Updates are completely suppressed via network settings
# prerelease - If True, suppress prerelease notifications
# version - Set to release tag that user does not want notifications for
serviceUpdateDefaultSettings = { "all": False, "prerelease": True, 'version': None }
serviceUpdateDefaultSettings = {"prerelease": True, 'version': None }
self.serviceUpdateSettings = SettingsProvider.getInstance().getSettings("pyfaServiceUpdateSettings", serviceUpdateDefaultSettings)
def get(self, type):
@@ -263,5 +263,4 @@ class UpdateSettings():
def set(self, type, value):
self.serviceUpdateSettings[type] = value
# @todo: "reopen fits" setting class
# @todo: migrate fit settings (from fit service) here?

View File

@@ -32,14 +32,9 @@ class CheckUpdateThread(threading.Thread):
self.network = service.Network.getInstance()
def run(self):
# Suppress all
if (self.settings.get('all')):
return
network = service.Network.getInstance()
try:
# @todo: use proxy settings?
response = network.request('https://api.github.com/repos/DarkFenX/Pyfa/releases', network.UPDATE)
jsonResponse = json.loads(response.read())
@@ -73,7 +68,7 @@ class CheckUpdateThread(threading.Thread):
if release['prerelease'] and rVersion > config.expansionVersion:
wx.CallAfter(self.callback, release) # Singularity -> Singularity
break
except: # for when there is no internet connection
except:
pass
def versiontuple(self, v):