eric: comparison Helpviewer/Download/DownloadItem.py

-:d388291f5b6c
+:b427350a9d97
 self.fileIcon.setPixmap(icon.pixmap(48, 48))
 self.__reply = reply
 self.__requestFilename = requestFilename
 self.__page = webPage
+self.__pageUrl = webPage and webPage.mainFrame().url() or QUrl()
 self.__toDownload = download
 self.__bytesReceived = 0
+self.__bytesTotal = -1
 self.__downloadTime = QTime()
 self.__output = QFile()
 self.__fileName = ""
 self.__startedSaving = False
 self.__finishedDownloading = False
 if self.__reply is None:
 return
 self.__startedSaving = False
 self.__finishedDownloading = False
+self.__bytesReceived = 0
+self.__bytesTotal = -1
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
 # start timer for the download estimation
 @pyqtSlot()
 def on_tryAgainButton_clicked(self):
 """
 Private slot to retry the download.
 """
+self.retry()
+def retry(self):
+"""
+Public slot to retry the download.
+"""
 if not self.tryAgainButton.isEnabled():
 return
 self.tryAgainButton.setEnabled(False)
 self.tryAgainButton.setVisible(False)
 @pyqtSlot()
 def on_stopButton_clicked(self):
 """
 Private slot to stop the download.
 """
+self.cancelDownload()
+def cancelDownload(self):
+"""
+Public slot to stop the download.
+"""
 self.setUpdatesEnabled(False)
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
 self.tryAgainButton.setEnabled(True)
 self.tryAgainButton.setVisible(True)
 @pyqtSlot()
 def on_openButton_clicked(self):
 """
 Private slot to open the downloaded file.
 """
-info = QFileInfo(self.__output)
+self.openFile()
+def openFile(self):
+"""
+Public slot to open the downloaded file.
+"""
+info = QFileInfo(self.__fileName)
 url = QUrl.fromLocalFile(info.absoluteFilePath())
+QDesktopServices.openUrl(url)
+def openFolder(self):
+"""
+Public slot to open the folder containing the downloaded file.
+"""
+info = QFileInfo(self.__fileName)
+url = QUrl.fromLocalFile(info.absolutePath())
 QDesktopServices.openUrl(url)
 def __readyRead(self):
 """
 Private slot to read the available data.
 self.infoLabel.setText(self.trUtf8("Error saving: {0}")\
 .format(self.__output.errorString()))
 self.on_stopButton_clicked()
 else:
 self.__startedSaving = True
-if (self.bytesTotal() == 0 and self.__reply.atEnd()) or \
+if self.__finishedDownloading:
-self.__finishedDownloading:
 self.__finished()
 def __networkError(self):
 """
 Private slot to handle a network error.
 @param bytesReceived number of bytes received (integer)
 @param bytesTotal number of total bytes (integer)
 """
 self.__bytesReceived = bytesReceived
+self.__bytesTotal = bytesTotal
 currentValue = 0
 totalValue = 0
 if bytesTotal > 0:
 currentValue = bytesReceived * 100 / bytesTotal
 totalValue = 100
 """
 Public method to get the total number of bytes of the download.
 @return total number of bytes (integer)
 """
-total = self.__reply.header(QNetworkRequest.ContentLengthHeader)
+if self.__bytesTotal == -1:
-if total is None:
+self.__bytesTotal = self.__reply.header(QNetworkRequest.ContentLengthHeader)
-total = 0
+if self.__bytesTotal is None:
-return total
+self.__bytesTotal = -1
+return self.__bytesTotal
 def bytesReceived(self):
 """
 Public method to get the number of bytes received.
 @return estimation for the remaining time (float)
 """
 if not self.downloading():
 return -1.0
-if self.bytesTotal() == 0:
+if self.bytesTotal() == -1:
 return -1.0
 timeRemaining = (self.bytesTotal() - self.bytesReceived()) / self.currentSpeed()
 # ETA should never be 0
 info = ""
 if running:
 remaining = ""
-if bytesTotal != 0:
+if bytesTotal > 0:
 remaining = timeString(timeRemaining)
 info = self.trUtf8("{0} of {1} ({2}/sec) - {3}")\
 .format(
 dataString(self.__bytesReceived),
-bytesTotal == 0 and self.trUtf8("?") \
+bytesTotal == -1 and self.trUtf8("?") \
 or dataString(bytesTotal),
 dataString(int(speed)),
 remaining)
 else:
-if self.__bytesReceived == bytesTotal or bytesTotal == 0:
+if self.__bytesReceived == bytesTotal or bytesTotal == -1:
 info = self.trUtf8("{0} downloaded")\
 .format(dataString(self.__output.size()))
 else:
 info = self.trUtf8("{0} of {1} - Stopped")\
 .format(dataString(self.__bytesReceived),
 Public method to check for a successful download.
 @return flag indicating a successful download (boolean)
 """
 return self.stopButton.isHidden() and self.tryAgainButton.isHidden()
+def downloadCanceled(self):
+"""
+Public method to check, if the download was cancelled.
+@return flag indicating a canceled download (boolean)
+"""
+return self.tryAgainButton.isEnabled()
 def __finished(self):
 """
 Private slot to handle the download finished.
 """
 def getData(self):
 """
 Public method to get the relevant download data.
-@return tuple of URL, save location and done flag
+@return tuple of URL, save location, flag and the
-(QUrl, string, boolean)
+URL of the related web page (QUrl, string, boolean,QUrl)
 """
 return (self.__url, QFileInfo(self.__fileName).filePath(),
-self.downloadedSuccessfully())
+self.downloadedSuccessfully(), self.__pageUrl)
 def setData(self, data):
 """
 Public method to set the relevant download data.
-@param data tuple of URL, save location and done flag
+@param data tuple of URL, save location, flag and the
-(QUrl, string, boolean)
+URL of the related web page (QUrl, string, boolean, QUrl)
 """
 self.__url = data[0]
 self.__fileName = data[1]
+self.__pageUrl = data[3]
 self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 self.infoLabel.setText(self.__fileName)
 self.stopButton.setEnabled(False)
 Public method to get the text of the info label.
 @return text of the info label (string)
 """
 return self.infoLabel.text()
+def getPageUrl(self):
+"""
+Public method to get the URL of the download page.
+@return URL of the download page (QUrl)
+"""
+return self.__pageUrl

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/Download/DownloadItem.py

Helpviewer/Download/DownloadItem.py