sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

[plugins] When a user clicks the "Reload all repositories" button

Browse Source 
manually in the plugin manager, then force a reload of the repositories
and don't rely on cached copies of the repo manifest

Otherwise it's not possible to force a refresh on certain types of
plugin repositories where it's not possible to modify the Cache-Control
attribute of the repo

Note that to avoid unnecessary server load, we still use cached
copies during startup and by default. It's only when a user explicitly
hits the "Reload all repositories" button that we force a non-cached
fetch.

Fixes #34351
This commit is contained in:
Nyall Dawson 2020-05-28 09:51:12 +10:00
parent 4eb10f2990
commit 98603b7866
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/pyplugin_installer/installer.py
View File

@ -119,7 +119,7 @@ class QgsPluginInstaller(QObject):
for key in repositories.allEnabled():
if reloadMode or repositories.all()[key]["state"] == 3: # if state = 3 (error or not fetched yet), try to fetch once again
repositories.requestFetching(key)
repositories.requestFetching(key, force_reload=reloadMode)
if repositories.fetchingInProgress():
fetchDlg = QgsPluginInstallerFetchingDialog(iface.mainWindow())

4
python/pyplugin_installer/installer_data.py
View File

@ -316,7 +316,7 @@ class Repositories(QObject):
settings.endGroup()
# ----------------------------------------- #
def requestFetching(self, key, url=None, redirectionCounter=0):
def requestFetching(self, key, url=None, redirectionCounter=0, force_reload=False):
""" start fetching the repository given by key """
self.mRepositories[key]["state"] = 1
if not url:
@ -327,6 +327,8 @@ class Repositories(QObject):
self.mRepositories[key]["QRequest"] = QNetworkRequest(url)
self.mRepositories[key]["QRequest"].setAttribute(QNetworkRequest.Attribute(QgsNetworkRequestParameters.AttributeInitiatorClass), "Relay")
self.mRepositories[key]["QRequest"].setAttribute(QNetworkRequest.FollowRedirectsAttribute, True)
if force_reload:
self.mRepositories[key]["QRequest"].setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.AlwaysNetwork)
authcfg = self.mRepositories[key]["authcfg"]
if authcfg and isinstance(authcfg, str):
if not QgsApplication.authManager().updateNetworkRequest(