Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 07:19:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup BatchLoader

Browse source
This commit is contained in:
Ryan Huffman 2015-08-27 09:39:12 -07:00
parent 8765329a46
commit 667db200c0
2 changed files with 3 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/networking/src/ResourceCache.cpp
View file

@ -190,7 +190,6 @@ void ResourceCache::requestCompleted(Resource* resource) {
i++; i++;
} }
if (highestIndex >= 0) { if (highestIndex >= 0) {
qDebug() << "trying to attempt a pending request";
attemptRequest(sharedItems->_pendingRequests.takeAt(highestIndex)); attemptRequest(sharedItems->_pendingRequests.takeAt(highestIndex));
} }
} }

41
libraries/script-engine/src/BatchLoader.cpp
View file

@ -50,47 +50,12 @@ void BatchLoader::start() {
checkFinished(); checkFinished();
}); });
// If we end up being destroyed before the reply finishes, clean it up
connect(this, &QObject::destroyed, request, &QObject::deleteLater);
qCDebug(scriptengine) << "Loading script at " << url; qCDebug(scriptengine) << "Loading script at " << url;
request->send(); request->send();
// if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
// QNetworkRequest request = QNetworkRequest(url);
// request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
// QNetworkReply* reply = networkAccessManager.get(request);
//
// qCDebug(scriptengine) << "Downloading file at" << url;
//
// connect(reply, &QNetworkReply::finished, [=]() {
// if (reply->error()) {
// _data.insert(url, QString());
// } else {
// _data.insert(url, reply->readAll());
// }
// reply->deleteLater();
// checkFinished();
// });
//
// // If we end up being destroyed before the reply finishes, clean it up
// connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
//
// } else {
// #ifdef _WIN32
// QString fileName = url.toString();
// #else
// QString fileName = url.toLocalFile();
// #endif
//
// qCDebug(scriptengine) << "Reading file at " << fileName;
//
// QFile scriptFile(fileName);
// if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
// QTextStream in(&scriptFile);
// _data.insert(url, in.readAll());
// } else {
// _data.insert(url, QString());
// }
// }
} }
checkFinished(); checkFinished();
} }