sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Plugin Manager] Don't crash on invalid values from QSettings

Browse Source
This commit is contained in:
Borys Jurgiel 2013-06-14 09:49:32 +02:00
parent 820a0f783f
commit 2a81aba5ae
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
python/pyplugin_installer/installer_data.py
View File

@ -189,7 +189,11 @@ class QPNetworkAccessManager(QNetworkAccessManager):
elif proxyType in ["5","FtpCachingProxy"] and QT_VERSION >= 0X040400: self.proxy.setType(QNetworkProxy.FtpCachingProxy) elif proxyType in ["5","FtpCachingProxy"] and QT_VERSION >= 0X040400: self.proxy.setType(QNetworkProxy.FtpCachingProxy)
else: self.proxy.setType(QNetworkProxy.DefaultProxy) else: self.proxy.setType(QNetworkProxy.DefaultProxy)
self.proxy.setHostName(settings.value("/proxyHost","", type=unicode)) self.proxy.setHostName(settings.value("/proxyHost","", type=unicode))
self.proxy.setPort(settings.value("/proxyPort", 0, type=int)) try:
# QSettings may contain non-int value...
self.proxy.setPort(settings.value("/proxyPort", 0, type=int))
except:
pass
self.proxy.setUser(settings.value("/proxyUser", "", type=unicode)) self.proxy.setUser(settings.value("/proxyUser", "", type=unicode))
self.proxy.setPassword(settings.value("/proxyPassword", "", type=unicode)) self.proxy.setPassword(settings.value("/proxyPassword", "", type=unicode))
self.setProxy(self.proxy) self.setProxy(self.proxy)
@ -320,7 +324,12 @@ class Repositories(QObject):
def checkingOnStartInterval(self): def checkingOnStartInterval(self):
""" return checking for news and updates interval """ """ return checking for news and updates interval """
settings = QSettings() settings = QSettings()
i = settings.value(settingsGroup+"/checkOnStartInterval", 1, type=int) try:
# QSettings may contain non-int value...
i = settings.value(settingsGroup+"/checkOnStartInterval", 1, type=int)
except:
# fallback do 1 day by default
i = 1
if i < 0: i = 1 if i < 0: i = 1
# allowed values: 0,1,3,7,14,30 days # allowed values: 0,1,3,7,14,30 days
interval = 0 interval = 0
@ -350,7 +359,11 @@ class Repositories(QObject):
if self.checkingOnStartInterval() == 0: if self.checkingOnStartInterval() == 0:
return True return True
settings = QSettings() settings = QSettings()
interval = settings.value(settingsGroup+"/checkOnStartLastDate",type=QDate).daysTo(QDate.currentDate()) try:
# QSettings may contain ivalid value...
interval = settings.value(settingsGroup+"/checkOnStartLastDate",type=QDate).daysTo(QDate.currentDate())
except:
interval = 0
if interval >= self.checkingOnStartInterval(): if interval >= self.checkingOnStartInterval():
return True return True
else: else: