mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 22:40:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

More simplification

Browse Source
This commit is contained in:
Alexander Bock
2020-06-18 09:58:31 +02:00
parent 1e0f427dcf
commit 02b109f4db
4 changed files with 51 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/profile.h
-7
View File
@@ -85,13 +85,6 @@ public:
void convertToSceneFile(const std::string& inProfilePath,
const std::string& outFilePath);
/**
* Returns the string contents of a profileFile object converted to scene/asset
* equivalent syntax.
* \param pf The profileFile object to be converted
* \return The full string contents of scene/asset equivalent of the profile file.
*/
std::string convertToScene(ProfileFile& pf);
/**
* Returns the Lua library that contains all Lua functions available to provide
include/openspace/scene/profilefile.h
-11
View File
@@ -177,9 +177,6 @@ std::string convertToSceneFile(const ProfileStruct& ps);
class ProfileFile {
public:
ProfileStruct profile;
using Lines = std::vector<std::string>;
/**
* Constructs object by reading the contents of a profile file and populates vector
* containers for all sections. This only pulls individual line entries into their
@@ -187,14 +184,6 @@ public:
* \param filename The profile file to read
*/
ProfileFile(const std::string& filename);
/**
* Writes the formatted contents of this object to a file.
* This function calls writeToString() in order to get everything in formatted
* form.
* \param filename The filename to write to.
*/
void writeToFile(const std::string& filename) const;
};
} // namespace openspace
src/scene/profile.cpp
+51 -24
View File
@@ -102,10 +102,6 @@ namespace {
}
}
void handleChangedRemove(std::vector<Profile::AssetEvent>& base, std::string asset) {
base.push_back({ std::move(asset), Profile::AssetEventType::Remove });
}
void addAssetsToProfileFile(ProfileFile& pf,
const std::vector<Profile::AssetEvent>& allAssets)
{
@@ -147,12 +143,53 @@ namespace {
}
}
}
} // namespace
void Profile::saveCurrentSettingsToProfile(const std::string& filename) {
ProfileFile pf = collateBaseWithChanges();
pf.writeToFile(filename);
if (filename.find('/') != std::string::npos) {
LERROR("Profile filename must not contain path (/) elements");
return;
}
else if (filename.find(':') != std::string::npos) {
LERROR("Profile filename must not contain path (:) elements");
return;
}
else if (filename.find('.') != std::string::npos) {
LERROR("Only provide the filename to save without file extension");
return;
}
const std::string absFilename = absPath("${ASSETS}/" + filename + ".profile");
if (FileSys.fileExists(absFilename)) {
LERROR(fmt::format(
"Unable to save profile '{}'. File of same name already exists.",
absFilename.c_str()
));
return;
}
std::ofstream outFile;
// @TODO (abock, 2020-06-15) Replace with non-throwing stream
try {
outFile.open(absFilename, std::ofstream::out);
}
catch (const std::ofstream::failure& e) {
LERROR(fmt::format(
"Exception opening profile file for write: {} ({})", absFilename, e.what()
));
}
try {
outFile << serialize(pf.profile);
}
catch (const std::ofstream::failure& e) {
LERROR("Data write error to file: "
+ absFilename + " (" + e.what() + ")");
}
outFile.close();
}
std::string Profile::saveCurrentSettingsToProfile_string() {
@@ -217,7 +254,7 @@ std::vector<Profile::AssetEvent> Profile::modifyAssetsToReflectChanges(ProfileFi
handleChangedAdd(assetDetails.base, i, assetDetails.changed, event.name);
}
else if (event.eventType == AssetEventType::Remove) {
handleChangedRemove(assetDetails.base, event.name);
assetDetails.base.push_back({ event.name, Profile::AssetEventType::Remove });
}
}
return assetDetails.base;
@@ -323,29 +360,19 @@ void Profile::convertToSceneFile(const std::string& inProfilePath,
outFile.open(outFilePath, std::ofstream::out);
}
catch (const std::ofstream::failure& e) {
LERROR("Exception opening scene file for write: " + outFilePath
+ " (" + e.what() + ")");
LERROR(fmt::format(
"Exception opening scene file for write: {} ({})", outFilePath, e.what()
));
}
try {
outFile << convertToScene(pf);
outFile << openspace::convertToSceneFile(pf.profile);
}
catch (const std::ofstream::failure& e) {
LERROR("Data write error to scene file: " + outFilePath
+ " (" + e.what() + ")");
LERROR(fmt::format(
"Data write error to scene file: {} ({})", outFilePath, e.what()
));
}
try {
outFile.close();
}
catch (const std::ofstream::failure& e) {
LERROR("Exception closing scene file after write: " + outFilePath
+ " (" + e.what() + ")");
}
}
std::string Profile::convertToScene(ProfileFile& pf) {
return openspace::convertToSceneFile(pf.profile);
}
scripting::LuaLibrary Profile::luaLibrary() {
src/scene/profilefile.cpp
-45
View File
@@ -606,49 +606,4 @@ ProfileFile::ProfileFile(const std::string& filename) {
profile = deserialize(content);
}
void ProfileFile::writeToFile(const std::string& filename) const {
if (filename.find('/') != std::string::npos) {
LERROR("Profile filename must not contain path (/) elements");
return;
}
else if (filename.find(':') != std::string::npos) {
LERROR("Profile filename must not contain path (:) elements");
return;
}
else if (filename.find('.') != std::string::npos) {
LERROR("Only provide the filename to save without file extension");
return;
}
const std::string absFilename = absPath("${ASSETS}/" + filename + ".profile");
if (FileSys.fileExists(absFilename)) {
LERROR(fmt::format(
"Unable to save profile '{}'. File of same name already exists.",
absFilename.c_str()
));
return;
}
std::ofstream outFile;
// @TODO (abock, 2020-06-15) Replace with non-throwing stream
try {
outFile.open(absFilename, std::ofstream::out);
}
catch (const std::ofstream::failure& e) {
LERROR(fmt::format(
"Exception opening profile file for write: {} ({})", absFilename, e.what()
));
}
try {
outFile << serialize(profile);
}
catch (const std::ofstream::failure& e) {
LERROR("Data write error to file: "
+ absFilename + " (" + e.what() + ")");
}
outFile.close();
}
} // namespace openspace