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

Fix with asset_helper

Browse Source 
Initial cleanup of Sync module
This commit is contained in:
Alexander Bock
2018-02-24 00:46:28 -05:00
parent c1c6e1397c
commit ee7e1b9b96
7 changed files with 105 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
modules/sync/syncmodule.cpp
View File

@@ -58,21 +58,19 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
KeyHttpSynchronizationRepositories);
for (const std::string& key : dictionary.keys()) {
_httpSynchronizationRepositories.push_back(
dictionary.value<std::string>(key)
);
_synchronizationRepositories.push_back(dictionary.value<std::string>(key));
}
}
if (configuration.hasKey(KeySynchronizationRoot)) {
_synchronizationRoot = configuration.value<std::string>(KeySynchronizationRoot);
} else {
LWARNING(
"No synchronization root specified."
"Resource synchronization will be disabled."
LWARNINGC(
"SyncModule",
"No synchronization root specified. Disabling resource synchronization"
);
//_synchronizationEnabled = false;
// TODO: Make it possible to disable synchronization manyally.
// TODO: Make it possible to disable synchronization manually.
// Group root and enabled into a sync config object that can be passed to syncs.
}
@@ -85,7 +83,7 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
return new HttpSynchronization(
dictionary,
_synchronizationRoot,
_httpSynchronizationRepositories
_synchronizationRepositories
);
}
);
@@ -96,7 +94,7 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
return new TorrentSynchronization(
dictionary,
_synchronizationRoot,
&_torrentClient
_torrentClient
);
}
);
@@ -105,6 +103,8 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
ghoul_assert(fTask, "No task factory existed");
fTask->registerClass<SyncAssetTask>("SyncAssetTask");
_torrentClient.initialize();
// Deinitialize
@@ -113,6 +113,18 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
});
}
std::string SyncModule::synchronizationRoot() const {
return _synchronizationRoot;
}
void SyncModule::addHttpSynchronizationRepository(std::string repository) {
_synchronizationRepositories.push_back(std::move(repository));
}
std::vector<std::string> SyncModule::httpSynchronizationRepositories() const {
return _synchronizationRepositories;
}
std::vector<documentation::Documentation> SyncModule::documentations() const {
return {
HttpSynchronization::Documentation(),
@@ -120,20 +132,4 @@ std::vector<documentation::Documentation> SyncModule::documentations() const {
};
}
std::string SyncModule::synchronizationRoot() const {
return _synchronizationRoot;
}
void SyncModule::addHttpSynchronizationRepository(const std::string& repository) {
_httpSynchronizationRepositories.push_back(repository);
}
std::vector<std::string> SyncModule::httpSynchronizationRepositories() const {
return _httpSynchronizationRepositories;
}
TorrentClient* SyncModule::torrentClient() {
return &_torrentClient;
}
} // namespace openspace