eric: comparison Helpviewer/Download/DownloadItem.py

-:d405dc3e2ed6
+:bb833c4bcf28
 """
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QTime, QFile, QFileInfo, QUrl, \
 QIODevice
 from PyQt4.QtGui import QWidget, QPalette, QStyle, QDesktopServices, QFileDialog
-from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
+from PyQt4.QtNetwork import QNetworkRequest, QNetworkReply
 from E5Gui import E5MessageBox
 from .Ui_DownloadItem import Ui_DownloadItem
 self.__page = webPage
 self.__toDownload = download
 self.__bytesReceived = 0
 self.__downloadTime = QTime()
 self.__output = QFile()
+self.__fileName = ""
 self.__startedSaving = False
 self.__finishedDownloading = False
 self.__gettingFileName = False
 self.__canceledFileSelect = False
 self.__autoOpen = False
 self.__startedSaving = False
 self.__finishedDownloading = False
 self.openButton.setEnabled(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.readyRead[()].connect(self.__readyRead)
 # reset info
 self.infoLabel.clear()
 self.progressBar.setValue(0)
 self.__getFileName()
-# start timer for the download estimation
-self.__downloadTime.start()
 if self.__reply.error() != QNetworkReply.NoError:
 self.__networkError()
 self.__finished()
 def __getFileName(self):
 return
 downloadDirectory = Helpviewer.HelpWindow.HelpWindow\
 .downloadManager().downloadDirectory()
-defaultFileName = self.__saveFileName(downloadDirectory)
+if self.__fileName:
-fileName = defaultFileName
+fileName = self.__fileName
+self.__toDownload = True
+ask = False
+else:
+defaultFileName = self.__saveFileName(downloadDirectory)
+fileName = defaultFileName
+ask = True
 self.__autoOpen = False
 if not self.__toDownload:
 res = E5MessageBox.question(self,
 self.trUtf8("Downloading"),
 self.trUtf8("""<p>You are about to download the file <b>{0}</b>.</p>"""
 self.__autoOpen = res == E5MessageBox.Open
 fileName = QDesktopServices.storageLocation(QDesktopServices.TempLocation) + \
 '/' + QFileInfo(fileName).completeBaseName()
-if not self.__autoOpen and self.__requestFilename:
+if ask and not self.__autoOpen and self.__requestFilename:
 self.__gettingFileName = True
 fileName = QFileDialog.getSaveFileName(
 None,
 self.trUtf8("Save File"),
 defaultFileName,
 self.on_stopButton_clicked()
 self.filenameLabel.setText(self.trUtf8("Download canceled: {0}")\
 .format(QFileInfo(defaultFileName).fileName()))
 self.__canceledFileSelect = True
 return
-fileInfo = QFileInfo(fileName)
-Helpviewer.HelpWindow.HelpWindow.downloadManager().setDownloadDirectory(
+fileInfo = QFileInfo(fileName)
-fileInfo.absoluteDir().absolutePath())
+Helpviewer.HelpWindow.HelpWindow.downloadManager().setDownloadDirectory(
-self.filenameLabel.setText(fileInfo.fileName())
+fileInfo.absoluteDir().absolutePath())
+self.filenameLabel.setText(fileInfo.fileName())
 self.__output.setFileName(fileName)
+self.__fileName = fileName
 # check file path for saving
-saveDirPath = QFileInfo(self.__output.fileName()).dir()
+saveDirPath = QFileInfo(self.__fileName).dir()
 if not saveDirPath.exists():
 if not saveDirPath.mkpath(saveDirPath.absolutePath()):
 self.progressBar.setVisible(False)
 self.on_stopButton_clicked()
 self.infoLabel.setText(
 self.trUtf8("Download directory ({0}) couldn't be created.")\
 .format(saveDirPath.absolutePath()))
 return
-self.filenameLabel.setText(QFileInfo(self.__output.fileName()).fileName())
+self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
 if self.__requestFilename:
 self.__readyRead()
 def __saveFileName(self, directory):
 """
 else:
 nam = Helpviewer.HelpWindow.HelpWindow.networkAccessManager()
 reply = nam.get(QNetworkRequest(self.__url))
 if self.__output.exists():
 self.__output.remove()
+self.__output = QFile()
 self.__reply = reply
 self.__initialize(tryAgain = True)
 self.statusChanged.emit()
 @pyqtSlot()
 def __finished(self):
 """
 Private slot to handle the download finished.
 """
-self.__readyRead()
 self.__finishedDownloading = True
 if not self.__startedSaving:
 return
 noError = self.__reply.error() == QNetworkReply.NoError
 """
 Public method to set the download icon.
 @param icon reference to the icon to be set (QIcon)
 """
-# TODO: adjust the size
 self.fileIcon.setPixmap(icon.pixmap(48, 48))
 def fileName(self):
 """
 Public method to get the name of the output file.
 @return name of the output file (string)
 """
-return self.__output.fileName()
+return self.__fileName
 def absoluteFilePath(self):
 """
 Public method to get the absolute path of the output file.
 @return absolute path of the output file (string)
 """
-return QFileInfo(self.__output).absoluteFilePath()
+return QFileInfo(self.__fileName).absoluteFilePath()
 def getData(self):
 """
 Public method to get the relevant download data.
 @return tuple of URL, save location and done flag
 (QUrl, string, boolean)
 """
-return (self.__url, QFileInfo(self.__output).filePath(),
+return (self.__url, QFileInfo(self.__fileName).filePath(),
 self.downloadedSuccessfully())
 def setData(self, data):
 """
 Public method to set the relevant download data.
 @param data tuple of URL, save location and done flag
 (QUrl, string, boolean)
 """
 self.__url = data[0]
-self.__output.setFileName(data[1])
+self.__fileName = data[1]
-self.filenameLabel.setText(QFileInfo(self.__output.fileName()).fileName())
+self.filenameLabel.setText(QFileInfo(self.__fileName).fileName())
+self.infoLabel.setText(self.__fileName)
 self.stopButton.setEnabled(False)
 self.stopButton.setVisible(False)
 self.openButton.setEnabled(data[2])
 self.openButton.setVisible(data[2])

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/Download/DownloadItem.py

Helpviewer/Download/DownloadItem.py