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

No longer add .txt extension to all UrlSynchronizations

Browse Source
This commit is contained in:
Alexander Bock
2020-02-12 21:08:02 +01:00
parent cf7b1f7505
commit 7abac51223
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/sync/syncs/urlsynchronization.cpp
+4 -11
View File
@@ -46,7 +46,6 @@ namespace {
constexpr const char* KeyFilename = "Filename";
constexpr const char* TempSuffix = ".tmp";
constexpr const char* FileSuffix = ".txt";
} // namespace
namespace openspace {
@@ -128,10 +127,6 @@ UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
if (dict.hasValue<std::string>(KeyFilename)) {
_filename = dict.value<std::string>(KeyFilename);
std::size_t foundExt = _filename.find(FileSuffix);
if (foundExt == std::string::npos) {
_filename += FileSuffix;
}
}
bool useHash = true;
@@ -204,12 +199,10 @@ void UrlSynchronization::start() {
std::string lastPartOfUrl = url.substr(lastSlash + 1);
// We can not create filenames with questionmarks
lastPartOfUrl.erase(std::remove(lastPartOfUrl.begin(), lastPartOfUrl.end(), '?'), lastPartOfUrl.end());
std::size_t foundExt = lastPartOfUrl.find(FileSuffix);
if (foundExt == std::string::npos) {
lastPartOfUrl += FileSuffix;
}
lastPartOfUrl.erase(
std::remove(lastPartOfUrl.begin(), lastPartOfUrl.end(), '?'),
lastPartOfUrl.end()
);
_filename = lastPartOfUrl;
}
std::string fileDestination = directory() +