From b7ba99380ab087168b305abbed084a8fa323180e Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 12 Oct 2015 15:32:44 -0700 Subject: [PATCH] Pretty up loading debug --- libraries/networking/src/ResourceCache.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index e2f57f97a3..84af87f217 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -319,10 +319,10 @@ void Resource::attemptRequest() { void Resource::finishedLoading(bool success) { if (success) { - qDebug() << "Finished loading:" << _url; + qDebug().noquote() << "Finished loading:" << _url.toDisplayString(); _loaded = true; } else { - qDebug() << "Failed to load:" << _url; + qDebug().noquote() << "Failed to load:" << _url.toDisplayString(); _failedToLoad = true; } _loadPriorities.clear(); @@ -339,13 +339,13 @@ void Resource::makeRequest() { _request = ResourceManager::createResourceRequest(this, _activeUrl); if (!_request) { - qDebug() << "Failed to get request for " << _url; + qDebug().noquote() << "Failed to get request for" << _url.toDisplayString(); ResourceCache::requestCompleted(this); finishedLoading(false); return; } - qDebug() << "Starting request for: " << _url; + qDebug().noquote() << "Starting request for:" << _url.toDisplayString(); connect(_request, &ResourceRequest::progress, this, &Resource::handleDownloadProgress); connect(_request, &ResourceRequest::finished, this, &Resource::handleReplyFinished); @@ -368,7 +368,8 @@ void Resource::handleReplyFinished() { auto result = _request->getResult(); if (result == ResourceRequest::Success) { _data = _request->getData(); - qDebug() << "Request finished for " << _url << ", " << _activeUrl; + auto extraInfo = _url == _activeUrl ? "" : QString(", %1").arg(_activeUrl.toDisplayString()); + qDebug().noquote() << QString("Request finished for %1%2").arg(_url.toDisplayString(), extraInfo); finishedLoading(true); emit loaded(_data);