eric: comparison WebBrowser/Download/DownloadItem.py

-:cc296ba99a3f
+:6f958d5765f4
 from __future__ import unicode_literals
 import os
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QUrl, \
+from PyQt5.QtCore import pyqtSlot, pyqtSignal, PYQT_VERSION, Qt, QTime, QUrl, \
-QStandardPaths, QFileInfo
+QStandardPaths, QFileInfo, QDateTime
 from PyQt5.QtGui import QPalette, QDesktopServices
 from PyQt5.QtWidgets import QWidget, QStyle, QDialog
 from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem
 from E5Gui import E5FileDialog
 self.__originalFileName = ""
 self.__finishedDownloading = False
 self.__gettingFileName = False
 self.__canceledFileSelect = False
 self.__autoOpen = False
+self.__downloadedDateTime = QDateTime()
 self.__initialize()
 def __initialize(self):
 """
 self.__url = self.__downloadItem.url()
 self.__downloadItem.downloadProgress.connect(self.__downloadProgress)
 self.__downloadItem.finished.connect(self.__finished)
 # reset info
+self.datetimeLabel.clear()
+self.datetimeLabel.hide()
 self.infoLabel.clear()
 self.progressBar.setValue(0)
 if self.__downloadItem.state() == \
 QWebEngineDownloadItem.DownloadRequested:
 self.__getFileName()
 Private method to get the file name to save to from the user.
 """
 if self.__gettingFileName:
 return
-if qVersionTuple() >= (5, 8, 0):
+if qVersionTuple() >= (5, 8, 0) and PYQT_VERSION >= 0x50800:
 savePage = self.__downloadItem.type() == \
 QWebEngineDownloadItem.SavePage
-elif qVersionTuple() >= (5, 7, 0):
+elif qVersionTuple() >= (5, 7, 0) and PYQT_VERSION >= 0x50700:
 savePage = self.__downloadItem.savePageFormat() != \
 QWebEngineDownloadItem.UnknownSaveFormat
 else:
 savePage = self.__downloadItem.path().lower().endswith(
 (".mhtml", ".mht"))
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
 self.tr("Download canceled: {0}").format(
 QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
+self.__setDateTime()
 return
 if dlg.getAction() == "scan":
 self.__mainWindow.requestVirusTotalScan(url)
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
 self.tr("Download canceled: {0}")
 .format(QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
+self.__setDateTime()
 return
 self.__setFileName(fileName)
 def __setFileName(self, fileName):
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
 self.infoLabel.setText(self.tr(
 "Download directory ({0}) couldn't be created.")
 .format(saveDirPath.absolutePath()))
+self.__setDateTime()
 return
 self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 def __saveFileName(self, directory):
 self.openButton.setEnabled(False)
 self.openButton.setVisible(False)
 self.setUpdatesEnabled(True)
 self.__state = DownloadItem.DownloadCancelled
 self.__downloadItem.cancel()
+self.__setDateTime()
 self.downloadFinished.emit()
 @pyqtSlot()
 def on_openButton_clicked(self):
 """
 self.stopButton.setVisible(False)
 self.openButton.setEnabled(noError)
 self.openButton.setVisible(noError)
 self.__state = DownloadItem.DownloadSuccessful
 self.__updateInfoLabel()
+self.__setDateTime()
+self.__adjustSize()
 self.statusChanged.emit()
 self.downloadFinished.emit()
 if self.__autoOpen:
 self.__open()
 def getData(self):
 """
 Public method to get the relevant download data.
-@return tuple of URL, save location, flag and the
+@return tuple of URL, save location, flag, the
-URL of the related web page (QUrl, string, boolean,QUrl)
+URL of the related web page and the date and time
+of the download
+@rtype tuple of (QUrl, str, bool, QUrl, QDateTime)
 """
 return (self.__url, QFileInfo(self.__fileName).filePath(),
-self.downloadedSuccessfully(), self.__pageUrl)
+self.downloadedSuccessfully(), self.__pageUrl,
+self.__downloadedDateTime)
 def setData(self, data):
 """
 Public method to set the relevant download data.
-@param data tuple of URL, save location, flag and the
+@param data tuple of URL, save location, flag, the
-URL of the related web page (QUrl, string, boolean, QUrl)
+URL of the related web page and the date and time
+of the download
+@type QUrl, str, bool, QUrl, QDateTime
 """
 self.__url = data[0]
 self.__fileName = data[1]
 self.__pageUrl = data[3]
 self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 self.infoLabel.setText(self.__fileName)
+if len(data) == 5:
+self.__setDateTime(data[4])
+else:
+self.__setDateTime(QDateTime())
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
 self.openButton.setEnabled(data[2])
 self.openButton.setVisible(data[2])
 if data[2]:
 self.__state = DownloadItem.DownloadSuccessful
 else:
 self.__state = DownloadItem.DownloadCancelled
 self.progressBar.setVisible(False)
+self.__adjustSize()
 def getInfoData(self):
 """
 Public method to get the text of the info label.
 Public method to get the URL of the download page.
 @return URL of the download page (QUrl)
 """
 return self.__pageUrl
+def __adjustSize(self):
+"""
+Private method to adjust the size of the download item.
+"""
+self.ensurePolished()
+msh = self.minimumSizeHint()
+self.resize(max(self.width(), msh.width()), msh.height())
+def __setDateTime(self, dateTime=None):
+"""
+Private method to set the download date and time.
+@param dateTime date and time to be set
+@type QDateTime
+"""
+if dateTime is None:
+self.__downloadedDateTime = QDateTime.currentDateTime()
+else:
+self.__downloadedDateTime = dateTime
+if self.__downloadedDateTime.isValid():
+labelText = self.__downloadedDateTime.toString("yyyy-MM-dd hh:mm")
+self.datetimeLabel.setText(labelText)
+self.datetimeLabel.show()
+else:
+self.datetimeLabel.clear()
+self.datetimeLabel.hide()

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/Download/DownloadItem.py

WebBrowser/Download/DownloadItem.py