Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-09 21:32:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove urls from logs in Interface

Browse source
This commit is contained in:
Howard Stearns 2018-11-06 13:47:07 -08:00
parent 5e01314d85
commit 05becb870f
9 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -6971,7 +6971,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
getMyAvatar()->useFullAvatarURL(url, modelName);
emit fullAvatarURLChanged(url, modelName);
} else {
qCDebug(interfaceapp) << "Declined to use the avatar: " << url;
qCDebug(interfaceapp) << "Declined to use the avatar";
}
});
};
@ -6999,7 +6999,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
break;
}
} else {
qCDebug(interfaceapp) << "Declined to agree to avatar license: " << url;
qCDebug(interfaceapp) << "Declined to agree to avatar license";
}
//auto offscreenUi = DependencyManager::get<OffscreenUi>();
@ -7036,7 +7036,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
DependencyManager::get<ScriptEngines>()->loadScript(fileName);
} else {
qCDebug(interfaceapp) << "Declined to run the script: " << scriptFilenameOrURL;
qCDebug(interfaceapp) << "Declined to run the script";
}
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
});
@ -7094,7 +7094,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
attachmentDataVec.push_back(attachmentData);
myAvatar->setAttachmentData(attachmentDataVec);
} else {
qCDebug(interfaceapp) << "User declined to wear the avatar attachment: " << url;
qCDebug(interfaceapp) << "User declined to wear the avatar attachment";
}
});
} else {
@ -7113,7 +7113,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
}
void Application::replaceDomainContent(const QString& url) {
qCDebug(interfaceapp) << "Attempting to replace domain content: " << url;
qCDebug(interfaceapp) << "Attempting to replace domain content";
QByteArray urlData(url.toUtf8());
auto limitedNodeList = DependencyManager::get<NodeList>();
const auto& domainHandler = limitedNodeList->getDomainHandler();
@ -7241,7 +7241,6 @@ void Application::showAssetServerWidget(QString filePath) {
}
void Application::addAssetToWorldFromURL(QString url) {
qInfo(interfaceapp) << "Download model and add to world from" << url;
QString filename;
if (url.contains("filename")) {
@ -7294,13 +7293,11 @@ void Application::addAssetToWorldFromURLRequestFinished() {
}
if (result == ResourceRequest::Success) {
qInfo(interfaceapp) << "Downloaded model from" << url;
QTemporaryDir temporaryDir;
temporaryDir.setAutoRemove(false);
if (temporaryDir.isValid()) {
QString temporaryDirPath = temporaryDir.path();
QString downloadPath = temporaryDirPath + "/" + filename;
qInfo(interfaceapp) << "Download path:" << downloadPath;
QFile tempFile(downloadPath);
if (tempFile.open(QIODevice::WriteOnly)) {

2
interface/src/AvatarBookmarks.cpp
View file

@ -180,7 +180,7 @@ void AvatarBookmarks::loadBookmark(const QString& bookmarkName) {
myAvatar->removeWearableAvatarEntities();
const QString& avatarUrl = bookmark.value(ENTRY_AVATAR_URL, "").toString();
myAvatar->useFullAvatarURL(avatarUrl);
qCDebug(interfaceapp) << "Avatar On " << avatarUrl;
qCDebug(interfaceapp) << "Avatar On";
const QList<QVariant>& attachments = bookmark.value(ENTRY_AVATAR_ATTACHMENTS, QList<QVariant>()).toList();
qCDebug(interfaceapp) << "Attach " << attachments;

12
interface/src/ModelPackager.cpp
View file

@ -83,10 +83,10 @@ bool ModelPackager::loadModel() {
QString("ModelPackager::loadModel()"),
QString("Could not open FST file %1").arg(_modelFile.filePath()),
QMessageBox::Ok);
qWarning() << QString("ModelPackager::loadModel(): Could not open FST file %1").arg(_modelFile.filePath());
qWarning() << "ModelPackager::loadModel(): Could not open FST file";
return false;
}
qCDebug(interfaceapp) << "Reading FST file : " << _modelFile.filePath();
qCDebug(interfaceapp) << "Reading FST file";
_mapping = FSTReader::readMapping(fst.readAll());
fst.close();
@ -102,11 +102,11 @@ bool ModelPackager::loadModel() {
QString("ModelPackager::loadModel()"),
QString("Could not open FBX file %1").arg(_fbxInfo.filePath()),
QMessageBox::Ok);
qWarning() << QString("ModelPackager::loadModel(): Could not open FBX file %1").arg(_fbxInfo.filePath());
qWarning() << "ModelPackager::loadModel(): Could not open FBX file";
return false;
}
try {
qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();
qCDebug(interfaceapp) << "Reading FBX file";
QByteArray fbxContents = fbx.readAll();
_hfmModel.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));
@ -114,7 +114,7 @@ bool ModelPackager::loadModel() {
// make sure we have some basic mappings
populateBasicMapping(_mapping, _fbxInfo.filePath(), *_hfmModel);
} catch (const QString& error) {
qCDebug(interfaceapp) << "Error reading " << _fbxInfo.filePath() << ": " << error;
qCDebug(interfaceapp) << "Error reading: " << error;
return false;
}
return true;
@ -132,7 +132,7 @@ bool ModelPackager::editProperties() {
// Make sure that a mapping for the root joint has been specified
QVariantHash joints = _mapping.value(JOINT_FIELD).toHash();
if (!joints.contains("jointRoot")) {
qWarning() << QString("%1 root joint not configured for skeleton.").arg(_modelFile.fileName());
qWarning() << "root joint not configured for skeleton.";
QString message = "Your did not configure a root joint for your skeleton model.\n\nPackaging will be canceled.";
QMessageBox msgBox;

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

@ -69,7 +69,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
} else {
++_errorCount;
_pendingReplacements.remove(migrationURL);
qWarning() << "Could not retrieve asset at" << migrationURL.toString();
qWarning() << "Could not retrieve asset";
checkIfFinished();
}
@ -79,7 +79,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
request->send();
} else {
++_errorCount;
qWarning() << "Could not create request for asset at" << migrationURL.toString();
qWarning() << "Could not create request for asset";
}
};
@ -209,7 +209,7 @@ void ATPAssetMigrator::migrateResource(ResourceRequest* request) {
// add this URL to our hash of AssetUpload to original URL
_originalURLs.insert(upload, request->getUrl());
qCDebug(asset_migrator) << "Starting upload of asset from" << request->getUrl();
qCDebug(asset_migrator) << "Starting upload of asset";
// connect to the finished signal so we know when the AssetUpload is done
QObject::connect(upload, &AssetUpload::finished, this, &ATPAssetMigrator::assetUploadFinished);
@ -239,7 +239,7 @@ void ATPAssetMigrator::assetUploadFinished(AssetUpload *upload, const QString& h
_pendingReplacements.remove(migrationURL);
++_errorCount;
qWarning() << "Failed to upload" << migrationURL << "- error was" << upload->getErrorString();
qWarning() << "Failed to upload" << "- error was" << upload->getErrorString();
}
checkIfFinished();
@ -281,7 +281,7 @@ void ATPAssetMigrator::setMappingFinished(SetMappingRequest* request) {
_pendingReplacements.remove(migrationURL);
++_errorCount;
qWarning() << "Error setting mapping for" << migrationURL << "- error was " << request->getErrorString();
qWarning() << "Error setting mapping for" << "- error was " << request->getErrorString();
}
checkIfFinished();

2
interface/src/commerce/Ledger.cpp
View file

@ -72,7 +72,7 @@ void Ledger::send(const QString& endpoint, const QString& success, const QString
const QString URL = "/api/v1/commerce/";
JSONCallbackParameters callbackParams(this, success, fail);
#if defined(DEV_BUILD) // Don't expose user's personal data in the wild. But during development this can be handy.
qCInfo(commerce) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
qCInfo(commerce) << "Sending" << QJsonDocument(request).toJson(QJsonDocument::Compact);
#endif
accountManager->sendRequest(URL + endpoint,
authType,

3
interface/src/commerce/QmlCommerce.cpp
View file

@ -396,8 +396,7 @@ bool QmlCommerce::uninstallApp(const QString& itemHref) {
QString scriptUrl = appFileJsonObject["scriptURL"].toString();
if (!DependencyManager::get<ScriptEngines>()->stopScript(scriptUrl.trimmed(), false)) {
qCWarning(commerce) << "Couldn't stop script during app uninstall. Continuing anyway. ScriptURL is:"
<< scriptUrl.trimmed();
qCWarning(commerce) << "Couldn't stop script during app uninstall. Continuing anyway.";
}
// Delete the .app.json from the filesystem

2
interface/src/raypick/CollisionPick.cpp
View file

@ -225,7 +225,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
}
const int32_t MAX_VERTICES_PER_STATIC_MESH = 1e6;
if (totalNumVertices > MAX_VERTICES_PER_STATIC_MESH) {
qWarning() << "model" << resource->getURL() << "has too many vertices" << totalNumVertices << "and will collide as a box.";
qWarning() << "model" << "has too many vertices" << totalNumVertices << "and will collide as a box.";
shapeInfo.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions);
return;
}

4
interface/src/scripting/GooglePolyScriptingInterface.cpp
View file

@ -95,7 +95,7 @@ QString GooglePolyScriptingInterface::getModelInfo(const QString& input) {
}
QString urlString(GET_POLY_URL);
urlString = urlString.replace("model", name) + "key=" + _authCode;
qCDebug(scriptengine) << "Google URL request: " << urlString;
qCDebug(scriptengine) << "Google URL request";
QUrl url(urlString);
QString json = parseJSON(url, 2).toString();
return json;
@ -129,7 +129,7 @@ QUrl GooglePolyScriptingInterface::formatURLQuery(const QString& keyword, const
}
QString GooglePolyScriptingInterface::getModelURL(const QUrl& url) {
qCDebug(scriptengine) << "Google URL request: " << url;
qCDebug(scriptengine) << "Google URL request";
if (!url.isEmpty()) {
return parseJSON(url, 1).toString();
} else {

2
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -355,7 +355,7 @@ void ContextOverlayInterface::requestOwnershipVerification(const QUuid& entityID
}
}
} else {
qCDebug(entities) << "Call to" << networkReply->url() << "failed with error" << networkReply->error() <<
qCDebug(entities) << "Call failed with error" << networkReply->error() <<
"More info:" << networkReply->readAll();
}