FIXED: Saving works on Android now!
I honestly changed too much stuff trying to pinpoint a fix. I might be stupid. I have no idea what I did that fixed this.
This commit is contained in:
@@ -1143,6 +1143,8 @@ void Minecraft::init()
|
||||
checkGlError("Init complete");
|
||||
#endif
|
||||
|
||||
options.load();
|
||||
|
||||
setIsCreativeMode(false); // false means it's Survival Mode
|
||||
reloadOptions();
|
||||
}
|
||||
|
||||
@@ -283,6 +283,10 @@ void Options::save() {
|
||||
optionsFile.save(stringVec);
|
||||
}
|
||||
|
||||
void Options::setOptionsFilePath(const std::string& path) {
|
||||
optionsFile.setOptionsPath(path + "/options.txt");
|
||||
}
|
||||
|
||||
void Options::notifyOptionUpdate(OptionId key, bool value) {
|
||||
minecraft->optionUpdated(key, value);
|
||||
}
|
||||
|
||||
@@ -100,15 +100,10 @@ public:
|
||||
// elements werent initialized so i was getting a garbage pointer and a crash
|
||||
m_options.fill(nullptr);
|
||||
initTable();
|
||||
load();
|
||||
// load() is deferred to init() where path is configured correctly
|
||||
}
|
||||
|
||||
void initTable();
|
||||
|
||||
void set(OptionId key, int value);
|
||||
void set(OptionId key, float value);
|
||||
void set(OptionId key, const std::string& value);
|
||||
void toggle(OptionId key);
|
||||
void initTable();
|
||||
|
||||
int getIntValue(OptionId key) {
|
||||
auto option = opt<OptionInt>(key);
|
||||
@@ -144,6 +139,11 @@ public:
|
||||
|
||||
void load();
|
||||
void save();
|
||||
void set(OptionId key, int value);
|
||||
void set(OptionId key, float value);
|
||||
void set(OptionId key, const std::string& value);
|
||||
void setOptionsFilePath(const std::string& path);
|
||||
void toggle(OptionId key);
|
||||
|
||||
void notifyOptionUpdate(OptionId key, bool value);
|
||||
void notifyOptionUpdate(OptionId key, float value);
|
||||
|
||||
@@ -4,6 +4,12 @@
|
||||
#include <errno.h>
|
||||
#include <platform/log.h>
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
OptionsFile::OptionsFile() {
|
||||
#ifdef __APPLE__
|
||||
settingsPath = "./Documents/options.txt";
|
||||
@@ -14,6 +20,14 @@ OptionsFile::OptionsFile() {
|
||||
#endif
|
||||
}
|
||||
|
||||
void OptionsFile::setOptionsPath(const std::string& path) {
|
||||
settingsPath = path;
|
||||
}
|
||||
|
||||
std::string OptionsFile::getOptionsPath() const {
|
||||
return settingsPath;
|
||||
}
|
||||
|
||||
void OptionsFile::save(const StringVector& settings) {
|
||||
FILE* pFile = fopen(settingsPath.c_str(), "w");
|
||||
if(pFile != NULL) {
|
||||
@@ -22,10 +36,33 @@ void OptionsFile::save(const StringVector& settings) {
|
||||
}
|
||||
fclose(pFile);
|
||||
} else {
|
||||
LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
|
||||
if (errno != ENOENT)
|
||||
LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
|
||||
|
||||
// Ensure parent directory exists for safekeeping if path contains directories
|
||||
std::string dir = settingsPath;
|
||||
size_t fpos = dir.find_last_of("/\\");
|
||||
if (fpos != std::string::npos) {
|
||||
dir.resize(fpos);
|
||||
struct stat st;
|
||||
if (stat(dir.c_str(), &st) != 0) {
|
||||
// attempt recursive mkdir
|
||||
std::string toCreate;
|
||||
for (size_t i = 0; i <= dir.size(); ++i) {
|
||||
if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
|
||||
if (!toCreate.empty()) {
|
||||
mkdir(toCreate.c_str(), 0755);
|
||||
}
|
||||
}
|
||||
if (i < dir.size())
|
||||
toCreate.push_back(dir[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
StringVector OptionsFile::getOptionStrings() {
|
||||
StringVector returnVector;
|
||||
FILE* pFile = fopen(settingsPath.c_str(), "r");
|
||||
@@ -46,7 +83,8 @@ StringVector OptionsFile::getOptionStrings() {
|
||||
}
|
||||
fclose(pFile);
|
||||
} else {
|
||||
LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
|
||||
if (errno != ENOENT)
|
||||
LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
|
||||
}
|
||||
return returnVector;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,9 @@ public:
|
||||
OptionsFile();
|
||||
void save(const StringVector& settings);
|
||||
StringVector getOptionStrings();
|
||||
|
||||
void setOptionsPath(const std::string& path);
|
||||
std::string getOptionsPath() const;
|
||||
|
||||
private:
|
||||
std::string settingsPath;
|
||||
};
|
||||
|
||||
@@ -187,6 +187,33 @@ static bool ensureDirectoryExists(const std::string& path) {
|
||||
return _mkdir(path.c_str()) == 0 || errno == EEXIST;
|
||||
#else
|
||||
struct stat st;
|
||||
if (stat(path.c_str(), &st) == 0 && S_ISDIR(st.st_mode))
|
||||
return true;
|
||||
|
||||
std::string subPath;
|
||||
size_t i = 0;
|
||||
while (i < path.length()) {
|
||||
i = path.find_first_of("/\\", i);
|
||||
if (i == std::string::npos) {
|
||||
subPath = path;
|
||||
} else {
|
||||
subPath = path.substr(0, i);
|
||||
}
|
||||
|
||||
if (!subPath.empty()) {
|
||||
if (stat(subPath.c_str(), &st) != 0) {
|
||||
if (mkdir(subPath.c_str(), 0755) != 0 && errno != EEXIST)
|
||||
return false;
|
||||
} else if (!S_ISDIR(st.st_mode)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == std::string::npos)
|
||||
break;
|
||||
i += 1;
|
||||
}
|
||||
|
||||
if (stat(path.c_str(), &st) == 0 && S_ISDIR(st.st_mode))
|
||||
return true;
|
||||
return mkdir(path.c_str(), 0755) == 0 || errno == EEXIST;
|
||||
|
||||
Reference in New Issue
Block a user