squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-21 16:07:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix download from URLs on Windows

Browse Source 
Fix possible encoding problems in paths (Windows)
This commit is contained in:
Christophe Dumez
2011-02-07 20:13:46 +00:00
parent 8568b29cc1
commit 04b63829d7
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/downloadthread.cpp
View File

@@ -77,22 +77,28 @@ void DownloadThread::processDlFinished(QNetworkReply* reply) {
url = m_redirectMapping.take(url);
}
// Success
QTemporaryFile tmpfile;
tmpfile.setAutoRemove(false);
if (tmpfile.open()) {
QString filePath = tmpfile.fileName();
QTemporaryFile *tmpfile = new QTemporaryFile;
tmpfile->setAutoRemove(false);
if (tmpfile->open()) {
QString filePath = tmpfile->fileName();
qDebug("Temporary filename is: %s", qPrintable(filePath));
if(reply->isOpen() || reply->open(QIODevice::ReadOnly)) {
// TODO: Support GZIP compression
tmpfile.write(reply->readAll());
tmpfile.close();
tmpfile->write(reply->readAll());
tmpfile->close();
// XXX: For some reason, tmpfile has to be destroyed before
// the signal is sent or the file stays locked on Windows
// for some reason.
delete tmpfile;
// Send finished signal
emit downloadFinished(url, filePath);
} else {
delete tmpfile;
// Error when reading the request
emit downloadFailure(url, tr("I/O Error"));
}
} else {
delete tmpfile;
emit downloadFailure(url, tr("I/O Error"));
}
// Clean up
@@ -134,7 +140,7 @@ QNetworkReply* DownloadThread::downloadUrl(const QString &url){
#endif
// Process download request
qDebug("url is %s", qPrintable(url));
const QUrl qurl = QUrl::fromEncoded(url.toLocal8Bit());
const QUrl qurl = QUrl::fromEncoded(url.toUtf8());
QNetworkRequest request(qurl);
// Spoof Firefox 3.5 user agent to avoid
// Web server banning