Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 06:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Download from blocks in marketplace working

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-08-09 11:08:14 -07:00
parent d599753771
commit 17acf0520d
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
interface/src/Application.cpp
View file

@ -2779,7 +2779,8 @@ bool Application::importFromZIP(const QString& filePath) {
QUrl empty;
// handle Blocks download from Marketplace
if (filePath.contains("vr.google.com/downloads")) {
qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true);
addAssetToWorldFromURL(filePath);
//qApp->getFileDownloadInterface()->runUnzip("", filePath, true, true);
} else {
qApp->getFileDownloadInterface()->runUnzip(filePath, empty, true, true);
}
@ -6220,8 +6221,16 @@ void Application::showAssetServerWidget(QString filePath) {
void Application::addAssetToWorldFromURL(QString url) {
qInfo(interfaceapp) << "Download model and add to world from" << url;
QString filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL.
QString filename;
if (url.contains("filename")) {
filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL.
}
if (url.contains("vr.google.com/downloads")) {
QRegExp blocksName("\/.*\.zip");
//filename = url.section(blocksName);
filename = "blocks";
}
if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) {
QString errorInfo = "You do not have permissions to write to the Asset Server.";
@ -6242,7 +6251,15 @@ void Application::addAssetToWorldFromURLRequestFinished() {
auto url = request->getUrl().toString();
auto result = request->getResult();
QString filename = url.section("filename=", 1, 1); // Filename from trailing "?filename=" URL parameter.
QString filename;
if (url.contains("filename")) {
filename = url.section("filename=", 1, 1); // Filename is in "?filename=" parameter at end of URL.
}
if (url.contains("vr.google.com/downloads")) {
QRegExp blocksName("\/.*\.zip");
//filename = url.section(blocksName);
filename = "blocks";
}
if (result == ResourceRequest::Success) {
qInfo(interfaceapp) << "Downloaded model from" << url;

4
libraries/script-engine/src/FileScriptingInterface.cpp
View file

@ -34,10 +34,10 @@ FileScriptingInterface::FileScriptingInterface(QObject* parent) : QObject(parent
void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool isZip) {
qCDebug(scriptengine) << "Url that was downloaded: " + url.toString();
if ((url.toString()).contains("vr.google.com/downloads")) {
/*if ((url.toString()).contains("vr.google.com/downloads")) {
path = downloadBlocksZip(url);
}
}*/
qCDebug(scriptengine) << "Path where download is saved: " + path;
QString fileName = "/" + path.section("/", -1);
QString tempDir = path;