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

Code cleanup branch (#618)

Browse Source 
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
This commit is contained in:
Alexander Bock
2018-06-10 04:47:34 +00:00
committed by GitHub
parent 5de728442d
commit 4952f8f977
796 changed files with 22428 additions and 24063 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,17 +25,15 @@
#include <modules/sync/syncs/httpsynchronization.h>
#include <modules/sync/syncmodule.h>
#include <openspace/documentation/documentation.h>
#include <openspace/documentation/verifier.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/moduleengine.h>
#include <openspace/util/httprequest.h>
#include <ghoul/fmt.h>
#include <ghoul/filesystem/file.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <cstdio>
#include <fstream>
#include <numeric>
#include <memory>
#include <sstream>
namespace {
constexpr const char* KeyIdentifier = "Identifier";
@@ -123,22 +121,26 @@ void HttpSynchronization::start() {
return;
}
std::string query = std::string("?") + QueryKeyIdentifier + "=" + _identifier +
"&" + QueryKeyFileVersion + "=" + std::to_string(_version) +
"&" + QueryKeyApplicationVersion + "=" + std::to_string(ApplicationVersion);
const std::string& query =
std::string("?") + QueryKeyIdentifier + "=" + _identifier + "&" +
QueryKeyFileVersion + "=" + std::to_string(_version) + "&" +
QueryKeyApplicationVersion + "=" + std::to_string(ApplicationVersion);
_syncThread = std::thread([this](const std::string& q) {
for (const std::string& url : _synchronizationRepositories) {
if (trySyncFromUrl(url + q)) {
createSyncFile();
resolve();
return;
_syncThread = std::thread(
[this](const std::string& q) {
for (const std::string& url : _synchronizationRepositories) {
if (trySyncFromUrl(url + q)) {
createSyncFile();
resolve();
return;
}
}
}
if (!_shouldCancel) {
reject();
}
}, query);
if (!_shouldCancel) {
reject();
}
},
query
);
}
void HttpSynchronization::cancel() {
@@ -164,8 +166,8 @@ bool HttpSynchronization::nTotalBytesIsKnown() {
}
void HttpSynchronization::createSyncFile() {
std::string directoryName = directory();
std::string filepath = directoryName + ".ossync";
const std::string& directoryName = directory();
const std::string& filepath = directoryName + ".ossync";
FileSys.createDirectory(directoryName, ghoul::filesystem::FileSystem::Recursive::Yes);
@@ -175,7 +177,7 @@ void HttpSynchronization::createSyncFile() {
}
bool HttpSynchronization::hasSyncFile() {
std::string path = directory() + ".ossync";
const std::string& path = directory() + ".ossync";
return FileSys.fileExists(path);
}
@@ -200,7 +202,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
std::istringstream fileList(std::string(buffer.begin(), buffer.end()));
std::string line = "";
std::string line;
std::unordered_map<std::string, size_t> fileSizes;
std::mutex fileSizeMutex;
@@ -240,9 +242,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
fileSizes.begin(),
fileSizes.end(),
size_t(0),
[](size_t a, auto b) {
return a + b.second;
}
[](size_t a, auto b) { return a + b.second; }
);
}
}
@@ -272,9 +272,7 @@ bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
if (success != 0) {
LERRORC(
"HTTPSynchronization",
fmt::format(
"Error renaming file {} to {}", tempName, originalName
)
fmt::format("Error renaming file {} to {}", tempName, originalName)
);
failed = true;