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

-:8a68afaf1ba2
+:506e35e424d5
 Module implementing a widget controlling a download.
 """
 import enum
 import os
+import pathlib
 from PyQt6.QtCore import (
-pyqtSlot, pyqtSignal, QTime, QUrl, QStandardPaths, QFileInfo, QDateTime
+pyqtSlot, pyqtSignal, QTime, QUrl, QStandardPaths, QDateTime
 )
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QWidget, QStyle, QDialog
 from PyQt6.QtWebEngineCore import QWebEngineDownloadRequest
 if not savePage:
 from .DownloadAskActionDialog import DownloadAskActionDialog
 url = self.__downloadRequest.url()
 mimetype = Utilities.MimeTypes.mimeType(originalFileName)
 dlg = DownloadAskActionDialog(
-QFileInfo(originalFileName).fileName(),
+pathlib.Path(originalFileName).name,
 mimetype,
 "{0}://{1}".format(url.scheme(), url.authority()),
 self)
 if (
 ):
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
 self.tr("Download canceled: {0}").format(
-QFileInfo(defaultFileName).fileName()))
+pathlib.Path(defaultFileName).name))
 self.__canceledFileSelect = True
 self.__setDateTime()
 return
 if dlg.getAction() == "scan":
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
 self.tr("VirusTotal scan scheduled: {0}").format(
-QFileInfo(defaultFileName).fileName()))
+pathlib.Path(defaultFileName).name))
 self.__canceledFileSelect = True
 return
 self.__autoOpen = dlg.getAction() == "open"
 tempLocation = QStandardPaths.writableLocation(
 QStandardPaths.StandardLocation.TempLocation)
 fileName = (
 tempLocation + '/' +
-QFileInfo(fileName).completeBaseName()
+pathlib.Path(fileName).stem
 )
 if ask and not self.__autoOpen:
 self.__gettingFileName = True
 fileName = EricFileDialog.getSaveFileName(
 if not fileName:
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
 self.filenameLabel.setText(
 self.tr("Download canceled: {0}")
-.format(QFileInfo(defaultFileName).fileName()))
+.format(pathlib.Path(defaultFileName).name))
 self.__canceledFileSelect = True
 self.__setDateTime()
 return
 self.__setFileName(fileName)
 Private method to set the file name to save the download into.
 @param fileName name of the file to save into
 @type str
 """
-fileInfo = QFileInfo(fileName)
+fpath = pathlib.Path(fileName)
 WebBrowserWindow.downloadManager().setDownloadDirectory(
-fileInfo.absoluteDir().absolutePath())
+fpath.parent.resolve())
-self.filenameLabel.setText(fileInfo.fileName())
+self.filenameLabel.setText(fpath.name)
-self.__fileName = fileName
+self.__fileName = str(fpath)
 # check file path for saving
-saveDirPath = QFileInfo(self.__fileName).dir()
+saveDirPath = pathlib.Path(self.__fileName).parent()
-if (
+if not saveDirPath.exists():
-not saveDirPath.exists() and
+saveDirPath.mkdir(parents=True)
-not saveDirPath.mkpath(saveDirPath.absolutePath())
-):
-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):
 """
 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.__downloadRequest.downloadFileName()
+fpath = pathlib.Path(self.__downloadRequest.downloadFileName())
-info = QFileInfo(path)
+origName = fpath.name
-baseName = info.completeBaseName()
+name = os.path.join(directory, origName)
-endName = info.suffix()
-origName = baseName
-if endName:
-origName += '.' + endName
-name = os.path.join(directory, baseName)
-if endName:
-name += '.' + endName
 return name, origName
 @pyqtSlot(bool)
 def on_pauseButton_clicked(self, checked):
 """
 def openFile(self):
 """
 Public slot to open the downloaded file.
 """
-info = QFileInfo(self.__fileName)
+url = QUrl.fromLocalFile(pathlib.Path(self.__fileName).resolve())
-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(pathlib.Path(self.__fileName).resolve())
-url = QUrl.fromLocalFile(info.absolutePath())
 QDesktopServices.openUrl(url)
 @pyqtSlot()
 def __downloadProgress(self):
 """
 """
 Public method to get the absolute path of the output file.
 @return absolute path of the output file (string)
 """
-return QFileInfo(self.__fileName).absoluteFilePath()
+return pathlib.Path(self.__fileName).resolve()
 def getData(self):
 """
 Public method to get the relevant download data.
 @rtype dict of {"URL": QUrl, "Location": str, "Done": bool,
 "PageURL": QUrl, "Downloaded": QDateTime}
 """
 return {
 "URL": self.__url,
-"Location": QFileInfo(self.__fileName).filePath(),
+"Location": self.__fileName,
 "Done": self.downloadedSuccessfully(),
 "PageURL": self.__pageUrl,
 "Downloaded": self.__downloadedDateTime
 }
 """
 self.__url = data["URL"]
 self.__fileName = data["Location"]
 self.__pageUrl = data["PageURL"]
-self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
+self.filenameLabel.setText(pathlib.Path(self.__fileName).name)
 self.infoLabel.setText(self.__fileName)
 try:
 self.__setDateTime(data["Downloaded"])
 except KeyError:

Mercurial Repositories > eric / file comparison

comparison: eric7/WebBrowser/Download/DownloadItem.py

eric7/WebBrowser/Download/DownloadItem.py