eric: comparison PluginManager/PluginRepositoryDialog.py

-:ae44225e7e7c
+:ac12549e521a
 self.__onlineStateChanged)
 else:
 self.__networkConfigurationManager = None
 self.__onlineStateChanged(True)
-self.__doneMethod = None
-self.__inDownload = False
 self.__pluginsToDownload = []
 self.__pluginsDownloaded = []
 self.__isDownloadInstall = False
 self.__allDownloadedOk = False
 if status:
 self.__pluginsDownloaded.append(filename)
 if self.__isDownloadInstall:
 self.__allDownloadedOk &= status
-del self.__pluginsToDownload[0]
+self.__pluginsToDownload.pop(0)
 if len(self.__pluginsToDownload):
 self.__downloadPlugin()
 else:
 self.__downloadPluginsDone()
 Private method called, when the download of the plugins is finished.
 """
 self.__downloadButton.setEnabled(len(self.__selectedItems()))
 self.__downloadInstallButton.setEnabled(len(self.__selectedItems()))
 self.__installButton.setEnabled(True)
-self.__doneMethod = None
 if not self.__external:
 ui = e5App().getObject("UserInterface")
 else:
 ui = None
 if ui and ui.notificationsEnabled():
 self.__newItems = 0
 self.__updateLocalItems = 0
 self.__updateRemoteItems = 0
 self.downloadProgress.setValue(0)
-self.__doneMethod = None
 if os.path.exists(self.pluginRepositoryFile):
 self.__repositoryMissing = False
 f = QFile(self.pluginRepositoryFile)
 if f.open(QIODevice.ReadOnly):
 self.__downloadInstallButton.setEnabled(False)
 self.__downloadCancelButton.setEnabled(True)
 self.statusLabel.setText(url)
-self.__doneMethod = doneMethod
-self.__downloadURL = url
-self.__downloadFileName = filename
-self.__downloadIODevice = QFile(self.__downloadFileName + ".tmp")
-self.__downloadCancelled = False
 request = QNetworkRequest(QUrl(url))
 request.setAttribute(QNetworkRequest.CacheLoadControlAttribute,
 QNetworkRequest.AlwaysNetwork)
 reply = self.__networkManager.get(request)
-reply.finished.connect(lambda: self.__downloadFileDone(reply))
+reply.finished.connect(
+lambda: self.__downloadFileDone(reply, filename, doneMethod))
 reply.downloadProgress.connect(self.__downloadProgress)
 self.__replies.append(reply)
 else:
 E5MessageBox.warning(
 self,
 self.tr(
 """<p>Could not download the requested file"""
 """ from {0}.</p><p>Error: {1}</p>"""
 ).format(url, self.tr("Computer is offline.")))
-def __downloadFileDone(self, reply):
+def __downloadFileDone(self, reply, fileName, doneMethod):
 """
 Private method called, after the file has been downloaded
 from the Internet.
 @param reply reference to the reply object of the download
 @type QNetworkReply
+@param fileName local name of the file
+@type str
+@param doneMethod method to be called when done
+@type func
 """
 self.__updateButton.setEnabled(True)
 self.__downloadCancelButton.setEnabled(False)
 self.__onlineStateChanged(self.__isOnline())
 ok = True
 if reply in self.__replies:
 self.__replies.remove(reply)
 if reply.error() != QNetworkReply.NoError:
 ok = False
-if not self.__downloadCancelled:
+if reply.error() != QNetworkReply.OperationCanceledError:
 E5MessageBox.warning(
 self,
 self.tr("Error downloading file"),
 self.tr(
 """<p>Could not download the requested file"""
 """ from {0}.</p><p>Error: {1}</p>"""
-).format(self.__downloadURL, reply.errorString())
+).format(reply.url().toString(), reply.errorString())
 )
 self.downloadProgress.setValue(0)
-self.__downloadURL = None
-self.__downloadIODevice.remove()
-self.__downloadIODevice = None
 if self.repositoryList.topLevelItemCount():
 if self.repositoryList.currentItem() is None:
 self.repositoryList.setCurrentItem(
 self.repositoryList.topLevelItem(0))
 else:
 self.__downloadInstallButton.setEnabled(
 len(self.__selectedItems()))
 reply.deleteLater()
 return
-self.__downloadIODevice.open(QIODevice.WriteOnly)
+downloadIODevice = QFile(fileName + ".tmp")
+downloadIODevice.open(QIODevice.WriteOnly)
 # read data in chunks
 chunkSize = 64 * 1024 * 1024
 while True:
 data = reply.read(chunkSize)
 if data is None or len(data) == 0:
 break
-self.__downloadIODevice.write(data)
+downloadIODevice.write(data)
-self.__downloadIODevice.close()
+downloadIODevice.close()
-if QFile.exists(self.__downloadFileName):
+if QFile.exists(fileName):
-QFile.remove(self.__downloadFileName)
+QFile.remove(fileName)
-self.__downloadIODevice.rename(self.__downloadFileName)
+downloadIODevice.rename(fileName)
-self.__downloadIODevice = None
-self.__downloadURL = None
 reply.deleteLater()
-if self.__doneMethod is not None:
+if doneMethod is not None:
-self.__doneMethod(ok, self.__downloadFileName)
+doneMethod(ok, fileName)
-def __downloadCancel(self):
+def __downloadCancel(self, reply=None):
 """
 Private slot to cancel the current download.
-"""
-if self.__replies:
+@param reply reference to the network reply
-reply = self.__replies[0]
+@type QNetworkReply
-self.__downloadCancelled = True
+"""
-self.__pluginsToDownload = []
+if reply is None:
+if self.__replies:
+reply = self.__replies[0]
+self.__pluginsToDownload = []
+if reply is not None:
 reply.abort()
 def __downloadProgress(self, done, total):
 """
 Private slot to show the download progress.
 @param reply reference to the reply object (QNetworkReply)
 @param errors list of SSL errors (list of QSslError)
 """
 ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
 if ignored == E5SslErrorHandler.NotIgnored:
-self.__downloadCancelled = True
+self.__downloadCancel(reply)
 def getDownloadedPlugins(self):
 """
 Public method to get the list of recently downloaded plugin files.

Mercurial Repositories > eric / file comparison

comparison: PluginManager/PluginRepositoryDialog.py

PluginManager/PluginRepositoryDialog.py