mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-14 17:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feature/insight mission (#877)

Browse Source 
* Added insight scene/asset and new HiRISE layer
* Removed AWS layers from Mars and Mercury
This commit is contained in:
Micah Acinapura
2019-05-20 19:32:19 -04:00
committed by Alexander Bock
parent 5b4e83ac4e
commit 16cc0402d8
20 changed files with 1164 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/sync/syncs/httpsynchronization.cpp
View File

@@ -228,9 +228,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
filename + TempSuffix;
if (sizeData.find(line) != sizeData.end()) {
LWARNING(fmt::format(
"{}: Duplicate entries: {}", _identifier, line
));
LWARNING(fmt::format("{}: Duplicate entries: {}", _identifier, line));
continue;
}
@@ -242,11 +240,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
std::unique_ptr<AsyncHttpFileDownload>& fileDownload = downloads.back();
sizeData[line] = {
false,
0,
0,
};
sizeData[line] = { false, 0, 0 };
fileDownload->onProgress(
[this, line, &sizeData, &sizeDataMutex,
@@ -258,11 +252,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
std::lock_guard<std::mutex> guard(sizeDataMutex);
sizeData[line] = {
p.totalBytesKnown,
p.totalBytes,
p.downloadedBytes,
};
sizeData[line] = { p.totalBytesKnown, p.totalBytes, p.downloadedBytes };
SizeData size = std::accumulate(
sizeData.begin(),
@@ -312,9 +302,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
}
}
else {
LERROR(fmt::format(
"Error downloading file from URL {}", d->url()
));
LERROR(fmt::format("Error downloading file from URL {}", d->url()));
failed = true;
}
}