1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AssetDownloader Add a virtual method for resolving urls

Browse Source 
Pick-to: 6.8
Change-Id: Ie771fd955e6b44ff4825243791029c4fcea0d493
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Ali Kianian 2024-06-27 09:05:26 +03:00
parent 48e896baf6
commit 3e3cf6dca9
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/assets/downloader/assetdownloader.cpp
View File

@ -385,7 +385,7 @@ void AssetDownloader::start()
} }
storage->tempDir = d->m_temporaryDir->path(); storage->tempDir = d->m_temporaryDir->path();
d->setLocalDownloadDir(baseLocalDir(d->m_preferredLocalDownloadDir)); d->setLocalDownloadDir(baseLocalDir(d->m_preferredLocalDownloadDir));
precheckLocalFile(d->m_offlineAssetsFilePath); precheckLocalFile(resolvedUrl(d->m_offlineAssetsFilePath));
return SetupResult::Continue; return SetupResult::Continue;
}; };
@ -405,7 +405,7 @@ void AssetDownloader::start()
return DoneResult::Error; return DoneResult::Error;
} }
QFile file(pathFromUrl(d->m_offlineAssetsFilePath)); QFile file(pathFromUrl(resolvedUrl(d->m_offlineAssetsFilePath)));
if (!file.open(QIODevice::ReadOnly)) { if (!file.open(QIODevice::ReadOnly)) {
qWarning() << "Also failed to open" << d->m_offlineAssetsFilePath; qWarning() << "Also failed to open" << d->m_offlineAssetsFilePath;
return DoneResult::Error; return DoneResult::Error;
@ -560,6 +560,11 @@ void AssetDownloader::start()
[this](DoneWith result) { emit finished(result == DoneWith::Success); }); [this](DoneWith result) { emit finished(result == DoneWith::Success); });
} }
QUrl AssetDownloader::resolvedUrl(const QUrl &url) const
{
return url;
}
} // namespace Assets::Downloader } // namespace Assets::Downloader
QT_END_NAMESPACE QT_END_NAMESPACE

3
src/assets/downloader/assetdownloader.h
View File

@ -89,6 +89,9 @@ public:
public Q_SLOTS: public Q_SLOTS:
void start(); void start();
protected:
virtual QUrl resolvedUrl(const QUrl &url) const;
Q_SIGNALS: Q_SIGNALS:
void started(); void started();
void finished(bool success); void finished(bool success);