eric: comparison Helpviewer/Download/DownloadItem.py

-:47bc4ef30315
+:743900906d8e
 self.tryAgainButton.setIcon(UI.PixmapCache.getIcon("restart.png"))
 self.tryAgainButton.setEnabled(False)
 self.tryAgainButton.setVisible(False)
 self.stopButton.setIcon(UI.PixmapCache.getIcon("stopLoading.png"))
+self.pauseButton.setIcon(UI.PixmapCache.getIcon("pause.png"))
 self.openButton.setIcon(UI.PixmapCache.getIcon("open.png"))
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
 icon = self.style().standardIcon(QStyle.SP_FileIcon)
 self.__bytesReceived = 0
 self.__bytesTotal = -1
 self.__downloadTime = QTime()
 self.__output = QFile()
 self.__fileName = ""
+self.__originalFileName = ""
 self.__startedSaving = False
 self.__finishedDownloading = False
 self.__gettingFileName = False
 self.__canceledFileSelect = False
 self.__autoOpen = False
 self.__startedSaving = False
 self.__finishedDownloading = False
 self.__bytesReceived = 0
 self.__bytesTotal = -1
-self.openButton.setEnabled(False)
+##        self.openButton.setEnabled(False)
-self.openButton.setVisible(False)
+##        self.openButton.setVisible(False)
+##
 # start timer for the download estimation
 self.__downloadTime.start()
 # attach to the reply object
 self.__url = self.__reply.url()
 self.__reply.setParent(self)
+self.__reply.setReadBufferSize(0)
 self.__reply.readyRead[()].connect(self.__readyRead)
 self.__reply.error.connect(self.__networkError)
 self.__reply.downloadProgress.connect(self.__downloadProgress)
 self.__reply.metaDataChanged.connect(self.__metaDataChanged)
 self.__reply.finished[()].connect(self.__finished)
 downloadDirectory = Helpviewer.HelpWindow.HelpWindow\
 .downloadManager().downloadDirectory()
 if self.__fileName:
 fileName = self.__fileName
+originalFileName = self.__originalFileName
 self.__toDownload = True
 ask = False
 else:
-defaultFileName = self.__saveFileName(downloadDirectory)
+defaultFileName, originalFileName = self.__saveFileName(downloadDirectory)
 fileName = defaultFileName
+self.__originalFileName = originalFileName
 ask = True
 self.__autoOpen = False
 if not self.__toDownload:
 url = self.__reply.url()
 dlg = DownloadAskActionDialog(
-QFileInfo(fileName).fileName(),
+QFileInfo(originalFileName).fileName(),
 self.__reply.header(QNetworkRequest.ContentTypeHeader),
 "{0}://{1}".format(url.scheme(), url.authority()),
 self)
 if dlg.exec_() == QDialog.Rejected or dlg.getAction() == "cancel":
 self.progressBar.setVisible(False)
 fileInfo = QFileInfo(fileName)
 Helpviewer.HelpWindow.HelpWindow.downloadManager().setDownloadDirectory(
 fileInfo.absoluteDir().absolutePath())
 self.filenameLabel.setText(fileInfo.fileName())
-self.__output.setFileName(fileName)
+self.__output.setFileName(fileName + ".part")
 self.__fileName = fileName
 # check file path for saving
 saveDirPath = QFileInfo(self.__fileName).dir()
 if not saveDirPath.exists():
 def __saveFileName(self, directory):
 """
 Private method to calculate a name for the file to download.
 @param directory name of the directory to store the file into (string)
-@return proposed filename (string)
+@return proposed filename and original filename (string, string)
 """
 path = ""
 if self.__reply.hasRawHeader("Content-Disposition"):
 header = bytes(self.__reply.rawHeader("Content-Disposition")).decode()
 if header:
 endName = info.suffix()
 if not baseName:
 baseName = "unnamed_download"
+origName = baseName
+if endName:
+origName += '.' + endName
 name = directory + baseName
 if endName:
 name += '.' + endName
-i = 1
+##        i = 1
-while QFile.exists(name):
+##        while QFile.exists(name):
-# file exists already, don't overwrite
+##            # file exists already, don't overwrite
-name = directory + baseName + ('-{0:d}'.format(i))
+##            name = directory + baseName + ('-{0:d}'.format(i))
-if endName:
+##            if endName:
-name += '.' + endName
+##                name += '.' + endName
-i += 1
+##            i += 1
-return name
+return name, origName
 def __open(self):
 """
 Private slot to open the downloaded file.
 """
 self.tryAgainButton.setVisible(False)
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
 self.stopButton.setEnabled(True)
 self.stopButton.setVisible(True)
+self.pauseButton.setEnabled(True)
+self.pauseButton.setVisible(True)
 self.progressBar.setVisible(True)
 if self.__page:
 nam = self.__page.networkAccessManager()
 else:
 self.__output = QFile()
 self.__reply = reply
 self.__initialize(tryAgain=True)
 self.statusChanged.emit()
+@pyqtSlot(bool)
+def on_pauseButton_clicked(self, checked):
+"""
+Private slot to pause the download.
+@param checked flag indicating the state of the button (boolean)
+"""
+if checked:
+self.__reply.readyRead[()].disconnect(self.__readyRead)
+self.__reply.setReadBufferSize(16 * 1024)
+else:
+self.__reply.readyRead[()].connect(self.__readyRead)
+self.__reply.setReadBufferSize(0)
 @pyqtSlot()
 def on_stopButton_clicked(self):
 """
 Private slot to stop the download.
 """
 Public slot to stop the download.
 """
 self.setUpdatesEnabled(False)
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
+self.pauseButton.setEnabled(False)
+self.pauseButton.setVisible(False)
 self.tryAgainButton.setEnabled(True)
 self.tryAgainButton.setVisible(True)
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
 self.setUpdatesEnabled(True)
 noError = self.__reply.error() == QNetworkReply.NoError
 self.progressBar.setVisible(False)
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
+self.pauseButton.setEnabled(False)
+self.pauseButton.setVisible(False)
 self.openButton.setEnabled(noError)
 self.openButton.setVisible(noError)
 self.__output.close()
+if QFile.exists(self.__fileName):
+QFile.remove(self.__fileName)
+self.__output.rename(self.__fileName)
 self.__updateInfoLabel()
 self.statusChanged.emit()
 self.downloadFinished.emit()
 if self.__autoOpen:
 self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 self.infoLabel.setText(self.__fileName)
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
+self.pauseButton.setEnabled(False)
+self.pauseButton.setVisible(False)
 self.openButton.setEnabled(data[2])
 self.openButton.setVisible(data[2])
 self.tryAgainButton.setEnabled(not data[2])
 self.tryAgainButton.setVisible(not data[2])
 self.progressBar.setVisible(False)

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/Download/DownloadItem.py

Helpviewer/Download/DownloadItem.py