diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml index 9eb9bde7df..ad337a6361 100644 --- a/interface/resources/qml/hifi/AssetServer.qml +++ b/interface/resources/qml/hifi/AssetServer.qml @@ -81,14 +81,16 @@ Windows.ScrollingWindow { } function doDeleteFile(paths) { + console.log("Deleting " + paths); + Assets.deleteMappings(paths, function(err) { if (err) { - console.log("Asset browser - error deleting paths: ", err); + console.log("Asset browser - error deleting paths: ", paths, err); - box = errorMessageBox("There was an error deleting:\n" + err); + box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err); box.selected.connect(reload); } else { - console.log("Asset browser - finished deleting paths"); + console.log("Asset browser - finished deleting paths: ", paths); reload(); } }); @@ -115,11 +117,11 @@ Windows.ScrollingWindow { Assets.renameMapping(oldPath, newPath, function(err) { if (err) { - console.log("Asset browser - error renaming:", err); + console.log("Asset browser - error renaming: ", oldPath, "=>", newPath, " - error ", err); box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err); box.selected.connect(reload); } else { - console.log("Asset browser - finished rename"); + console.log("Asset browser - finished rename: ", oldPath, "=>", newPath); } reload(); @@ -278,7 +280,7 @@ Windows.ScrollingWindow { gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0); } - print("Asset browser - adding asset " + name + " to world."); + print("Asset browser - adding asset " + url + " (" + name + ") to world."); // Entities.addEntity doesn't work from QML, so we use this. Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity); @@ -424,7 +426,7 @@ Windows.ScrollingWindow { uploadProgressLabel.text = "In progress..."; }, function(err, path) { - print(err); + print(err, path); if (err === "") { uploadProgressLabel.text = "Upload Complete"; timer.interval = 1000; @@ -435,7 +437,7 @@ Windows.ScrollingWindow { uploadOpen = false; }); timer.start(); - console.log("Asset Browser - finished uploading"); + console.log("Asset Browser - finished uploading: ", fileUrl); reload(); } else { uploadSpinner.visible = false; @@ -443,7 +445,7 @@ Windows.ScrollingWindow { uploadOpen = false; if (err !== -1) { - console.log("Asset Browser - error uploading:", err); + console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err); var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err); box.selected.connect(reload); } diff --git a/interface/resources/qml/hifi/RootHttpRequest.qml b/interface/resources/qml/hifi/RootHttpRequest.qml index b1397dfcbf..0219b4eeab 100644 --- a/interface/resources/qml/hifi/RootHttpRequest.qml +++ b/interface/resources/qml/hifi/RootHttpRequest.qml @@ -20,7 +20,6 @@ Item { // Public function for initiating an http request. // REQUIRES parent to be root to have sendToScript! function request(options, callback) { - console.debug('HttpRequest'); httpCalls[httpCounter] = callback; var message = {method: 'http.request', params: options, id: httpCounter++, jsonrpc: "2.0"}; parent.sendToScript(message); @@ -33,7 +32,6 @@ Item { return; } delete httpCalls[message.id]; - console.debug('HttpRequest response'); callback(message.error, message.response); } } diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index 3c8226f9c1..18d6bc9f78 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -1009,7 +1009,7 @@ Rectangle { try { // Not all calls to onFileOpenChanged() connect an event. Window.browseChanged.disconnect(onFileOpenChanged); } catch (e) { - console.log('Purchases.qml ignoring'); + console.log('Purchases.qml ignoring', e); } if (filename) { Commerce.installApp(filename); diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml index 72a5c32507..f665032b01 100644 --- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml +++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml @@ -81,16 +81,16 @@ Rectangle { } function doDeleteFile(paths) { - console.log("Deleting paths"); + console.log("Deleting " + paths); Assets.deleteMappings(paths, function(err) { if (err) { - console.log("Asset browser - error deleting paths: ", err); + console.log("Asset browser - error deleting paths: ", paths, err); - box = errorMessageBox("There was an error deleting:\n" + err); + box = errorMessageBox("There was an error deleting:\n" + paths + "\n" + err); box.selected.connect(reload); } else { - console.log("Asset browser - finished deleting paths"); + console.log("Asset browser - finished deleting paths: ", paths); reload(); } }); @@ -113,10 +113,15 @@ Rectangle { box.selected.connect(reload); } + console.log("Asset browser - renaming " + oldPath + " to " + newPath); + Assets.renameMapping(oldPath, newPath, function(err) { if (err) { + console.log("Asset browser - error renaming: ", oldPath, "=>", newPath, " - error ", err); box = errorMessageBox("There was an error renaming:\n" + oldPath + " to " + newPath + "\n" + err); box.selected.connect(reload); + } else { + console.log("Asset browser - finished rename: ", oldPath, "=>", newPath); } reload(); @@ -275,7 +280,7 @@ Rectangle { gravity = Vec3.multiply(Vec3.fromPolar(Math.PI / 2, 0), 0); } - print("Asset browser - adding asset " + name + " to world."); + print("Asset browser - adding asset " + url + " (" + name + ") to world."); // Entities.addEntity doesn't work from QML, so we use this. Entities.addModelEntity(name, url, "", shapeType, dynamic, collisionless, grabbable, addPosition, gravity); @@ -421,7 +426,7 @@ Rectangle { uploadProgressLabel.text = "In progress..."; }, function(err, path) { - print(err); + print(err, path); if (err === "") { uploadProgressLabel.text = "Upload Complete"; timer.interval = 1000; @@ -432,6 +437,7 @@ Rectangle { uploadOpen = false; }); timer.start(); + console.log("Asset Browser - finished uploading: ", fileUrl); reload(); } else { uploadSpinner.visible = false; @@ -439,7 +445,7 @@ Rectangle { uploadOpen = false; if (err !== -1) { - console.log("Asset Browser - error uploading:", err); + console.log("Asset Browser - error uploading: ", fileUrl, " - error ", err); var box = errorMessageBox("There was an error uploading:\n" + fileUrl + "\n" + err); box.selected.connect(reload); } diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp index 25cde7df94..4a82b64535 100644 --- a/interface/src/ModelPackager.cpp +++ b/interface/src/ModelPackager.cpp @@ -83,7 +83,7 @@ bool ModelPackager::loadModel() { QString("ModelPackager::loadModel()"), QString("Could not open FST file %1").arg(_modelFile.filePath()), QMessageBox::Ok); - qWarning() << "ModelPackager::loadModel(): Could not open FST file"; + qWarning() << QString("ModelPackager::loadModel(): Could not open FST file %1").arg(_modelFile.filePath()); return false; } qCDebug(interfaceapp) << "Reading FST file"; @@ -106,7 +106,7 @@ bool ModelPackager::loadModel() { return false; } try { - qCDebug(interfaceapp) << "Reading FBX file"; + qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath(); QByteArray fbxContents = fbx.readAll(); _hfmModel.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath())); diff --git a/libraries/entities/src/EntityEditFilters.cpp b/libraries/entities/src/EntityEditFilters.cpp index 37132e50df..a763c0f146 100644 --- a/libraries/entities/src/EntityEditFilters.cpp +++ b/libraries/entities/src/EntityEditFilters.cpp @@ -222,7 +222,7 @@ static bool hasCorrectSyntax(const QScriptProgram& program) { const auto error = syntaxCheck.errorMessage(); const auto line = QString::number(syntaxCheck.errorLineNumber()); const auto column = QString::number(syntaxCheck.errorColumnNumber()); - const auto message = QString("[SyntaxError] %1 in %2(%3)").arg(error, line, column); + const auto message = QString("[SyntaxError] %1 in %2:%3(%4)").arg(error, program.fileName(), line, column); qCritical() << qPrintable(message); return false; } @@ -235,8 +235,8 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName const auto line = QString::number(engine.uncaughtExceptionLineNumber()); engine.clearExceptions(); - static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 on line %2"; - auto message = QString(SCRIPT_EXCEPTION_FORMAT).arg(exception, line); + static const QString SCRIPT_EXCEPTION_FORMAT = "[UncaughtException] %1 in %2:%3"; + auto message = QString(SCRIPT_EXCEPTION_FORMAT).arg(exception, fileName, line); if (!backtrace.empty()) { static const auto lineSeparator = "\n "; message += QString("\n[Backtrace]%1%2").arg(lineSeparator, backtrace.join(lineSeparator)); diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index 088a1f0121..9e77968384 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -696,12 +696,14 @@ bool Octree::readFromFile(const char* fileName) { bool Octree::readJSONFromGzippedFile(QString qFileName) { QFile file(qFileName); if (!file.open(QIODevice::ReadOnly)) { + qCritical() << "Cannot open gzipped json file for reading: " << qFileName; return false; } QByteArray compressedJsonData = file.readAll(); QByteArray jsonData; if (!gunzip(compressedJsonData, jsonData)) { + qCritical() << "json File not in gzip format: " << qFileName; return false; } diff --git a/scripts/modules/request.js b/scripts/modules/request.js index 5464b1bffa..37f3ac0d7b 100644 --- a/scripts/modules/request.js +++ b/scripts/modules/request.js @@ -75,3 +75,9 @@ module.exports = { httpRequest.send(options.body || null); } }; + +// =========================================================================================== +// @function - debug logging +function debug() { + print('RequestModule | ' + [].slice.call(arguments).join(' ')); +}