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

plugin installer update: handle ports != 80 and add Bob Bruce's repository

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11754 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
borysiasty 2009-10-04 12:12:01 +00:00
parent 3145b3b176
commit 46d8a4dd92
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/plugin_installer/LICENSE
View File

@ -1,5 +1,5 @@
Copyright (c) 2007 Matthew T. Perry Copyright (c) 2007 Matthew T. Perry
Copyright (c) 2008 Borys Jurgiel Copyright (c) 2008-2009 Borys Jurgiel
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of

2
python/plugins/plugin_installer/__init__.py
View File

@ -14,7 +14,7 @@ def name():
return "Plugin Installer" return "Plugin Installer"
def version(): def version():
return "Version 1.0.3" return "Version 1.0.4"
def description(): def description():
return "Downloads and installs QGIS python plugins" return "Downloads and installs QGIS python plugins"

8
python/plugins/plugin_installer/installer_data.py
View File

@ -29,7 +29,7 @@ mRepositories = dict of dicts: {repoName : {"url" QString,
"valid" bool, "valid" bool,
"QPHttp" QPHttp, "QPHttp" QPHttp,
"Relay" Relay, # Relay object for transmitting signals from QPHttp with adding the repoName information "Relay" Relay, # Relay object for transmitting signals from QPHttp with adding the repoName information
"xmlData" QDomDocument, "xmlData" QBuffer,
"state" int, (0 - disabled, 1-loading, 2-loaded ok, 3-error (to be retried), 4-rejected) "state" int, (0 - disabled, 1-loading, 2-loaded ok, 3-error (to be retried), 4-rejected)
"error" QString}} "error" QString}}
mPlugins = dict of dicts {id : {"name" QString, mPlugins = dict of dicts {id : {"name" QString,
@ -87,6 +87,7 @@ authorRepos = [("Carson Farmer's Repository", "http://www.ftools.ca/cfarmerQgis
("Volkan Kepoglu's Repository","http://ggit.metu.edu.tr/~volkan/plugins.xml", ""), ("Volkan Kepoglu's Repository","http://ggit.metu.edu.tr/~volkan/plugins.xml", ""),
("GIS-Lab Repository", "http://gis-lab.info/programs/qgis/qgis-repo.xml", ""), ("GIS-Lab Repository", "http://gis-lab.info/programs/qgis/qgis-repo.xml", ""),
("Marco Hugentobler's Repository","http://karlinapp.ethz.ch/python_plugins/python_plugins.xml", ""), ("Marco Hugentobler's Repository","http://karlinapp.ethz.ch/python_plugins/python_plugins.xml", ""),
("Bob Bruce's Repository", "http://www.mappinggeek.ca/QGISPythonPlugins/Bobs-QGIS-plugins.xml", ""),
("Sourcepole Repository", "http://build.sourcepole.ch/qgis/plugins.xml", "")] ("Sourcepole Repository", "http://build.sourcepole.ch/qgis/plugins.xml", "")]
@ -376,7 +377,10 @@ class Repositories(QObject):
self.mRepositories[key]["state"] = 1 self.mRepositories[key]["state"] = 1
url = QUrl(self.mRepositories[key]["url"]) url = QUrl(self.mRepositories[key]["url"])
path = QString(url.toPercentEncoding(url.path(), "!$&'()*+,;=:@/")) path = QString(url.toPercentEncoding(url.path(), "!$&'()*+,;=:@/"))
self.mRepositories[key]["QPHttp"] = QPHttp(url.host()) port = url.port()
if port < 0:
port = 80
self.mRepositories[key]["QPHttp"] = QPHttp(url.host(), port)
self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("requestFinished (int, bool)"), self.xmlDownloaded) self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("requestFinished (int, bool)"), self.xmlDownloaded)
self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("stateChanged ( int )"), self.mRepositories[key]["Relay"].stateChanged) self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("stateChanged ( int )"), self.mRepositories[key]["Relay"].stateChanged)
self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("dataReadProgress ( int , int )"), self.mRepositories[key]["Relay"].dataReadProgress) self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("dataReadProgress ( int , int )"), self.mRepositories[key]["Relay"].dataReadProgress)

5
python/plugins/plugin_installer/installer_gui.py
View File

@ -152,7 +152,10 @@ class QgsPluginInstallerInstallingDialog(QDialog, Ui_QgsPluginInstallerInstallin
tmpDir = QDir.tempPath() tmpDir = QDir.tempPath()
tmpPath = QDir.cleanPath(tmpDir+"/"+fileName) tmpPath = QDir.cleanPath(tmpDir+"/"+fileName)
self.file = QFile(tmpPath) self.file = QFile(tmpPath)
self.http = QPHttp(url.host()) port = url.port()
if port < 0:
port = 80
self.http = QPHttp(url.host(), port)
self.connect(self.http, SIGNAL("stateChanged ( int )"), self.stateChanged) self.connect(self.http, SIGNAL("stateChanged ( int )"), self.stateChanged)
self.connect(self.http, SIGNAL("dataReadProgress ( int , int )"), self.readProgress) self.connect(self.http, SIGNAL("dataReadProgress ( int , int )"), self.readProgress)
self.connect(self.http, SIGNAL("requestFinished (int, bool)"), self.requestFinished) self.connect(self.http, SIGNAL("requestFinished (int, bool)"), self.requestFinished)

2
python/plugins/plugin_installer/installer_plugin.py
View File

@ -187,4 +187,4 @@ class InstallerPlugin():
# ----------------------------------------- # # ----------------------------------------- #
def resetNewlyProcessedPlugins(self): def resetNewlyProcessedPlugins(self):
""" clear the dict of newly processed plugins """ """ clear the dict of newly processed plugins """
history.clear() history.clear()