Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11849 from elisa-lj11/blocks

Browse source 
Zip file structures replicated in asset server
This commit is contained in:
Elisa Lupin-Jimenez 2017-11-20 16:13:51 -08:00 committed by GitHub
commit 3211aa7d13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Application.cpp
View file

@ -6333,20 +6333,14 @@ void Application::addAssetToWorldUnzipFailure(QString filePath) {
addAssetToWorldError(filename, "Couldn't unzip file " + filename + "."); addAssetToWorldError(filename, "Couldn't unzip file " + filename + ".");
} }
void Application::addAssetToWorld(QString filePath, QString zipFile, bool isZip, bool isBlocks) { void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, bool isBlocks) {
// Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget(). // Automatically upload and add asset to world as an alternative manual process initiated by showAssetServerWidget().
QString mapping; QString mapping;
QString path = filePath;
QString filename = filenameFromPath(path); QString filename = filenameFromPath(path);
if (isZip) { if (isZip || isBlocks) {
QString assetFolder = zipFile.section("/", -1); QString assetName = zipFile.section("/", -1).remove(QRegExp("[.]zip(.*)$"));
assetFolder.remove(".zip"); QString assetFolder = path.section("model_repo/", -1);
mapping = "/" + assetFolder + "/" + filename; mapping = "/" + assetName + "/" + assetFolder;
} else if (isBlocks) {
qCDebug(interfaceapp) << "Path to asset folder: " << zipFile;
QString assetFolder = zipFile.section('/', -1);
assetFolder.remove(".zip?noDownload=false");
mapping = "/" + assetFolder + "/" + filename;
} else { } else {
mapping = "/" + filename; mapping = "/" + filename;
} }
@ -6732,8 +6726,10 @@ void Application::handleUnzip(QString zipFile, QStringList unzipFile, bool autoA
if (autoAdd) { if (autoAdd) {
if (!unzipFile.isEmpty()) { if (!unzipFile.isEmpty()) {
for (int i = 0; i < unzipFile.length(); i++) { for (int i = 0; i < unzipFile.length(); i++) {
qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i); if (QFileInfo(unzipFile.at(i)).isFile()) {
addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks); qCDebug(interfaceapp) << "Preparing file for asset server: " << unzipFile.at(i);
addAssetToWorld(unzipFile.at(i), zipFile, isZip, isBlocks);
}
} }
} else { } else {
addAssetToWorldUnzipFailure(zipFile); addAssetToWorldUnzipFailure(zipFile);

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

@ -55,7 +55,7 @@ void FileScriptingInterface::runUnzip(QString path, QUrl url, bool autoAdd, bool
QStringList fileList = unzipFile(path, tempDir); QStringList fileList = unzipFile(path, tempDir);
if (!fileList.isEmpty()) { if (!fileList.isEmpty()) {
qCDebug(scriptengine) << "File to upload: " + fileList.first(); qCDebug(scriptengine) << "First file to upload: " + fileList.first();
} else { } else {
qCDebug(scriptengine) << "Unzip failed"; qCDebug(scriptengine) << "Unzip failed";
} }

2
unpublishedScripts/marketplace/blocks/blocksApp.js
View file

@ -14,7 +14,7 @@
(function () { (function () {
var APP_NAME = "BLOCKS"; var APP_NAME = "BLOCKS";
var APP_URL = "https://vr.google.com/objects/"; var APP_URL = "https://poly.google.com/";
var APP_OUTDATED_URL = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/updateToBlocks.html"; var APP_OUTDATED_URL = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/updateToBlocks.html";
var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg"; var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg";
var APP_ICON_ACTIVE = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-a.svg"; var APP_ICON_ACTIVE = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-a.svg";