Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change getUrl to getATPUrl, use in ATPAssetMigrator

Browse source
This commit is contained in:
Stephen Birarda 2015-10-13 16:56:20 -07:00
parent 574089530a
commit 2caa7f6d64
6 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/assets/ATPAssetMigrator.cpp
View file

@ -171,7 +171,8 @@ void ATPAssetMigrator::assetUploadFinished(AssetUpload *upload, const QString& h
// successfully uploaded asset - make any required replacements found in the pending replacements
auto values = _pendingReplacements.values(modelURL);
QString atpURL = QString("%1:%2.%3").arg(URL_SCHEME_ATP).arg(hash).arg(upload->getExtension());
QString atpURL = getATPUrl(hash, upload->getExtension()).toString();
for (auto value : values) {
// replace the modelURL in this QJsonValueRef with the hash

5
libraries/networking/src/AssetRequest.cpp
View file

@ -127,8 +127,3 @@ void AssetRequest::start() {
});
});
}
QUrl AssetRequest::getUrl() const {
return ::getUrl(_hash, _extension);
}

2
libraries/networking/src/AssetRequest.h
View file

@ -46,7 +46,7 @@ public:
const QByteArray& getData() const { return _data; }
const State& getState() const { return _state; }
const Error& getError() const { return _error; }
QUrl getUrl() const;
QUrl getUrl() const { return ::getATPUrl(_hash, _extension); }
signals:
void finished(AssetRequest* thisRequest);

2
libraries/networking/src/AssetUpload.cpp
View file

@ -102,7 +102,7 @@ void AssetUpload::start() {
}
if (_error == NoError && hash == hashData(_data).toHex()) {
saveToCache(getUrl(hash, _extension), _data);
saveToCache(getATPUrl(hash, _extension), _data);
}
emit finished(this, hash);

4
libraries/networking/src/AssetUtils.cpp
View file

@ -19,7 +19,7 @@
#include "ResourceManager.h"
QUrl getUrl(const QString& hash, const QString& extension) {
QUrl getATPUrl(const QString& hash, const QString& extension) {
if (!extension.isEmpty()) {
return QUrl(QString("%1:%2.%3").arg(URL_SCHEME_ATP, hash, extension));
} else {
@ -66,4 +66,4 @@ bool saveToCache(const QUrl& url, const QByteArray& file) {
qCWarning(asset_client) << "No disk cache to save assets to.";
}
return false;
}
}

2
libraries/networking/src/AssetUtils.h
View file

@ -32,7 +32,7 @@ enum AssetServerError : uint8_t {
PermissionDenied
};
QUrl getUrl(const QString& hash, const QString& extension = QString());
QUrl getATPUrl(const QString& hash, const QString& extension = QString());
QByteArray hashData(const QByteArray& data);