History

changes per CR

humbletim committed 6 years ago

Commit f41ef311 parent a7fb2941 file · +8 −8Browse files

Showing the changes to libraries/script-engine/src/ScriptCache.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/ScriptCache.cpp+8−8
@@ -87,8 +87,8 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable · 86 unmodified lines
8787 if (_scriptCache.contains(url) && !forceDownload) {
8888 auto entry = _scriptCache[url];
8989 if (url.isLocalFile() || url.scheme().isEmpty()) {
90− auto mtime = QFileInfo(url.toLocalFile()).lastModified();
91− QString localTime = ResourceRequest::toHttpDateString(mtime.toMSecsSinceEpoch());
90+ auto modifiedTime = QFileInfo(url.toLocalFile()).lastModified();
91+ QString localTime = ResourceRequest::toHttpDateString(modifiedTime.toMSecsSinceEpoch());
9292 QString cachedTime = entry["last-modified"].toString();
9393 if (cachedTime != localTime) {
9494 forceDownload = true;
@@ -97,10 +97,10 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable · 2 unmodified lines
9797 }
9898 }
9999 if (!forceDownload) {
100− lock.unlock();
101− qCDebug(scriptengine) << "Found script in cache:" << url.fileName();
102− contentAvailable(url.toString(), entry["data"].toString(), true, true, STATUS_CACHED);
103− return;
100+ lock.unlock();
101+ qCDebug(scriptengine) << "Found script in cache:" << url.fileName();
102+ contentAvailable(url.toString(), entry["data"].toString(), true, true, STATUS_CACHED);
103+ return;
104104 }
105105 }
106106 {
@@ -155,8 +155,8 @@ void ScriptCache::scriptContentAvailable(int maxRetries) { · 48 unmodified lines
155155 _activeScriptRequests.remove(url);
156156
157157 _scriptCache[url] = {
158− { "data", scriptContent = req->getData() },
159− { "last-modified", req->property("last-modified") },
158+ { "data", scriptContent = req->getData() },
159+ { "last-modified", req->property("last-modified") },
160160 };
161161 } else {
162162 auto result = req->getResult();