mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed progresscallback from downloadToMemory

Browse Source
This commit is contained in:
Michael Nilsson
2016-05-05 11:07:00 -04:00
parent df030b4529
commit d0e6c8dd6e
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/engine/downloadmanager.h
View File

@@ -78,8 +78,7 @@ public:
std::shared_ptr<FileFuture> downloadToMemory(
const std::string& url, std::string& memoryBuffer,
DownloadFinishedCallback finishedCallback = DownloadFinishedCallback(),
DownloadProgressCallback progressCallback = DownloadProgressCallback()
DownloadFinishedCallback finishedCallback = DownloadFinishedCallback()
);
std::vector<std::shared_ptr<FileFuture>> downloadRequestFiles(const std::string& identifier,

17
src/engine/downloadmanager.cpp
View File

@@ -205,28 +205,19 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadFile(
std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadToMemory(
const std::string& url, std::string& memoryBuffer,
DownloadFinishedCallback finishedCallback, DownloadProgressCallback progressCallback)
DownloadFinishedCallback finishedCallback)
{
std::shared_ptr<FileFuture> future = std::make_shared<FileFuture>(std::string("memory"));
LDEBUG("Start downloading file: '" << url << "' into memory");
auto downloadFunction = [url, finishedCallback, progressCallback, future, &memoryBuffer]() {
auto downloadFunction = [url, finishedCallback, future, &memoryBuffer]() {
CURL* curl = curl_easy_init();
if (curl) {
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &memoryBuffer);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writeToMemory);
ProgressInformation p = {
future,
std::chrono::system_clock::now(),
&progressCallback
};
curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, xferinfo);
curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &p);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
curl_easy_setopt(curl, CURLOPT_TIMEOUT, 5L);
CURLcode res = curl_easy_perform(curl);
@@ -238,14 +229,14 @@ std::shared_ptr<DownloadManager::FileFuture> DownloadManager::downloadToMemory(
future->format = std::string(ct);
future->isFinished = true;
}
} else{
} else {
future->errorMessage = curl_easy_strerror(res);
future->isAborted = true;
}
if (finishedCallback)
finishedCallback(*future);
curl_easy_cleanup(curl);
}