[QGIS Commit] r11754 - trunk/qgis/python/plugins/plugin_installer

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2009-10-04 08:12:01 -0400 (Sun, 04 Oct 2009)
New Revision: 11754

Modified:
   trunk/qgis/python/plugins/plugin_installer/LICENSE
   trunk/qgis/python/plugins/plugin_installer/__init__.py
   trunk/qgis/python/plugins/plugin_installer/installer_data.py
   trunk/qgis/python/plugins/plugin_installer/installer_gui.py
   trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
Log:
plugin installer update: handle ports != 80 and add Bob Bruce's repository

Modified: trunk/qgis/python/plugins/plugin_installer/LICENSE
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/LICENSE	2009-10-03 23:04:37 UTC (rev 11753)
+++ trunk/qgis/python/plugins/plugin_installer/LICENSE	2009-10-04 12:12:01 UTC (rev 11754)
@@ -1,5 +1,5 @@
 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 

Modified: trunk/qgis/python/plugins/plugin_installer/__init__.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/__init__.py	2009-10-03 23:04:37 UTC (rev 11753)
+++ trunk/qgis/python/plugins/plugin_installer/__init__.py	2009-10-04 12:12:01 UTC (rev 11754)
@@ -14,7 +14,7 @@
   return "Plugin Installer"
 
 def version():
-  return "Version 1.0.3"
+  return "Version 1.0.4"
 
 def description():
   return "Downloads and installs QGIS python plugins"

Modified: trunk/qgis/python/plugins/plugin_installer/installer_data.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_data.py	2009-10-03 23:04:37 UTC (rev 11753)
+++ trunk/qgis/python/plugins/plugin_installer/installer_data.py	2009-10-04 12:12:01 UTC (rev 11754)
@@ -29,7 +29,7 @@
                                             "valid" bool,
                                             "QPHttp" QPHttp,
                                             "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)
                                             "error" QString}}
 mPlugins = dict of dicts {id : {"name" QString,
@@ -87,6 +87,7 @@
                 ("Volkan Kepoglu's Repository","http://ggit.metu.edu.tr/~volkan/plugins.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", ""),
+                ("Bob Bruce's Repository",     "http://www.mappinggeek.ca/QGISPythonPlugins/Bobs-QGIS-plugins.xml", ""),
                 ("Sourcepole Repository",      "http://build.sourcepole.ch/qgis/plugins.xml", "")]
 
 
@@ -376,7 +377,10 @@
     self.mRepositories[key]["state"] = 1
     url = QUrl(self.mRepositories[key]["url"])
     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("stateChanged ( int )"), self.mRepositories[key]["Relay"].stateChanged)
     self.connect(self.mRepositories[key]["QPHttp"], SIGNAL("dataReadProgress ( int , int )"), self.mRepositories[key]["Relay"].dataReadProgress)

Modified: trunk/qgis/python/plugins/plugin_installer/installer_gui.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2009-10-03 23:04:37 UTC (rev 11753)
+++ trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2009-10-04 12:12:01 UTC (rev 11754)
@@ -152,7 +152,10 @@
     tmpDir = QDir.tempPath()
     tmpPath = QDir.cleanPath(tmpDir+"/"+fileName)
     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("dataReadProgress ( int , int )"), self.readProgress)
     self.connect(self.http, SIGNAL("requestFinished (int, bool)"), self.requestFinished)

Modified: trunk/qgis/python/plugins/plugin_installer/installer_plugin.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2009-10-03 23:04:37 UTC (rev 11753)
+++ trunk/qgis/python/plugins/plugin_installer/installer_plugin.py	2009-10-04 12:12:01 UTC (rev 11754)
@@ -187,4 +187,4 @@
   # ----------------------------------------- #
   def resetNewlyProcessedPlugins(self):
     """ clear the dict of newly processed plugins """
-    history.clear()
+    history.clear()
\ No newline at end of file