eric: comparison eric7/WebBrowser/Download/DownloadItem.py

-:844c2713bf44
+:766e1566cb74
 from PyQt6.QtCore import (
 pyqtSlot, pyqtSignal, Qt, QTime, QUrl, QStandardPaths, QFileInfo, QDateTime
 )
 from PyQt6.QtGui import QPalette, QDesktopServices
 from PyQt6.QtWidgets import QWidget, QStyle, QDialog
-from PyQt6.QtWebEngineCore import QWebEngineDownloadItem
+from PyQt6.QtWebEngineCore import QWebEngineDownloadRequest
 from EricWidgets import EricFileDialog
 from .Ui_DownloadItem import Ui_DownloadItem
 """
 statusChanged = pyqtSignal()
 downloadFinished = pyqtSignal(bool)
 progress = pyqtSignal(int, int)
+# TODO: convert this to an enum
 Downloading = 0
 DownloadSuccessful = 1
 DownloadCancelled = 2
-def __init__(self, downloadItem=None, pageUrl=None, parent=None):
+def __init__(self, downloadRequest=None, pageUrl=None, parent=None):
 """
 Constructor
-@param downloadItem reference to the download object containing the
+@param downloadRequest reference to the download object containing the
 download data.
-@type QWebEngineDownloadItem
+@type QWebEngineDownloadRequest
 @param pageUrl URL of the calling page
 @type QUrl
 @param parent reference to the parent widget
 @type QWidget
 """
 self.pauseButton.setIcon(UI.PixmapCache.getIcon("pause"))
 self.stopButton.setIcon(UI.PixmapCache.getIcon("stopLoading"))
 self.openButton.setIcon(UI.PixmapCache.getIcon("open"))
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
-if not hasattr(QWebEngineDownloadItem, "pause"):
-# pause/resume was defined in Qt 5.10.0 / PyQt 5.10.0
-self.pauseButton.setEnabled(False)
-self.pauseButton.setVisible(False)
 self.__state = DownloadItem.Downloading
 icon = self.style().standardIcon(QStyle.StandardPixmap.SP_FileIcon)
 self.fileIcon.setPixmap(icon.pixmap(48, 48))
-self.__downloadItem = downloadItem
+self.__downloadRequest = downloadRequest
 if pageUrl is None:
 self.__pageUrl = QUrl()
 else:
 self.__pageUrl = pageUrl
 self.__bytesReceived = 0
 def __initialize(self):
 """
 Private method to initialize the widget.
 """
-if self.__downloadItem is None:
+if self.__downloadRequest is None:
 return
 self.__finishedDownloading = False
 self.__bytesReceived = 0
 self.__bytesTotal = -1
 # start timer for the download estimation
 self.__downloadTime = QTime.currentTime()
 # attach to the download item object
-self.__url = self.__downloadItem.url()
+self.__url = self.__downloadRequest.url()
-self.__downloadItem.downloadProgress.connect(self.__downloadProgress)
+self.__downloadRequest.receivedBytesChanged.connect(self.__downloadProgress)
-self.__downloadItem.finished.connect(self.__finished)
+self.__downloadRequest.isFinishedChanged.connect(self.__finished)
 # reset info
 self.datetimeLabel.clear()
 self.datetimeLabel.hide()
 self.infoLabel.clear()
 self.progressBar.setValue(0)
 if (
-self.__downloadItem.state() ==
+self.__downloadRequest.state() ==
-QWebEngineDownloadItem.DownloadState.DownloadRequested
+QWebEngineDownloadRequest.DownloadState.DownloadRequested
 ):
 self.__getFileName()
 if not self.__fileName:
-self.__downloadItem.cancel()
+self.__downloadRequest.cancel()
 else:
-self.__downloadItem.setPath(self.__fileName)
+self.__downloadRequest.setDownloadFileName(self.__fileName)
-self.__downloadItem.accept()
+self.__downloadRequest.accept()
 else:
-fileName = self.__downloadItem.path()
+fileName = self.__downloadRequest.downloadFileName()
 self.__setFileName(fileName)
 def __getFileName(self):
 """
 Private method to get the file name to save to from the user.
 """
 if self.__gettingFileName:
 return
-savePage = self.__downloadItem.type() == (
+savePage = self.__downloadRequest.isSavePageDownload()
-QWebEngineDownloadItem.DownloadType.SavePage
-)
 documentLocation = QStandardPaths.writableLocation(
 QStandardPaths.StandardLocation.DocumentsLocation)
 downloadDirectory = (
 WebBrowserWindow.downloadManager().downloadDirectory()
 ask = True
 self.__autoOpen = False
 if not savePage:
 from .DownloadAskActionDialog import DownloadAskActionDialog
-url = self.__downloadItem.url()
+url = self.__downloadRequest.url()
 mimetype = Utilities.MimeTypes.mimeType(originalFileName)
 dlg = DownloadAskActionDialog(
 QFileInfo(originalFileName).fileName(),
 mimetype,
 "{0}://{1}".format(url.scheme(), url.authority()),
 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 and original filename (string, string)
 """
-path = self.__downloadItem.path()
+path = self.__downloadRequest.downloadFileName()
 info = QFileInfo(path)
 baseName = info.completeBaseName()
 endName = info.suffix()
 origName = baseName
 @param checked flag indicating the state of the button
 @type bool
 """
 if checked:
-self.__downloadItem.pause()
+self.__downloadRequest.pause()
 else:
-self.__downloadItem.resume()
+self.__downloadRequest.resume()
 @pyqtSlot()
 def on_stopButton_clicked(self):
 """
 Private slot to stop the download.
 self.openButton.setVisible(False)
 self.pauseButton.setEnabled(False)
 self.pauseButton.setVisible(False)
 self.setUpdatesEnabled(True)
 self.__state = DownloadItem.DownloadCancelled
-self.__downloadItem.cancel()
+self.__downloadRequest.cancel()
 self.__setDateTime()
 self.downloadFinished.emit(False)
 @pyqtSlot()
 def on_openButton_clicked(self):
 """
 info = QFileInfo(self.__fileName)
 url = QUrl.fromLocalFile(info.absolutePath())
 QDesktopServices.openUrl(url)
-def __downloadProgress(self, bytesReceived, bytesTotal):
+@pyqtSlot()
-"""
+def __downloadProgress(self):
-Private method to show the download progress.
+"""
+Private slot to show the download progress.
-@param bytesReceived number of bytes received (integer)
+"""
-@param bytesTotal number of total bytes (integer)
+self.__bytesReceived = self.__downloadRequest.receivedBytes()
-"""
+self.__bytesTotal = self.__downloadRequest.totalBytes()
-self.__bytesReceived = bytesReceived
-self.__bytesTotal = bytesTotal
 currentValue = 0
 totalValue = 0
-if bytesTotal > 0:
+if self.__bytesTotal > 0:
-currentValue = bytesReceived * 100 / bytesTotal
+currentValue = self.__bytesReceived * 100 / self.__bytesTotal
 totalValue = 100
 self.progressBar.setValue(currentValue)
 self.progressBar.setMaximum(totalValue)
 self.progress.emit(currentValue, totalValue)
 Public method to get the total number of bytes of the download.
 @return total number of bytes (integer)
 """
 if self.__bytesTotal == -1:
-self.__bytesTotal = self.__downloadItem.totalBytes()
+self.__bytesTotal = self.__downloadRequest.totalBytes()
 return self.__bytesTotal
 def bytesReceived(self):
 """
 Public method to get the number of bytes received.
 if not self.downloading():
 return -1.0
 return (
 self.__bytesReceived * 1000.0 /
-self.__downloadTime.msecsTo(QTime.currentTime)
+self.__downloadTime.msecsTo(QTime.currentTime())
 )
 def __updateInfoLabel(self):
 """
 Private method to update the info label.
 """
 Private slot to handle the download finished.
 """
 self.__finishedDownloading = True
-noError = (self.__downloadItem.state() ==
+noError = (self.__downloadRequest.state() ==
-QWebEngineDownloadItem.DownloadState.DownloadCompleted)
+QWebEngineDownloadRequest.DownloadState.DownloadCompleted)
 self.progressBar.setVisible(False)
 self.pauseButton.setEnabled(False)
 self.pauseButton.setVisible(False)
 self.stopButton.setEnabled(False)

Mercurial Repositories > eric / file comparison

comparison: eric7/WebBrowser/Download/DownloadItem.py

eric7/WebBrowser/Download/DownloadItem.py