libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 15:21:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Issue warning instead of error dialogs for bad configuration file, return a bool value indicating success or failure of loading.

Browse Source
This commit is contained in:
Attaullah Ansari 2023-02-22 02:47:46 +05:30 committed by Eugene Sandulenko
parent 302e46bfd3
commit 83cda889c1
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
common/config-manager.cpp
View File

@ -78,15 +78,16 @@ void ConfigManager::copyFrom(ConfigManager &source) {
} }
void ConfigManager::loadDefaultConfigFile(const String &fallbackFilename) { bool ConfigManager::loadDefaultConfigFile(const String &fallbackFilename) {
// Open the default config file // Open the default config file
assert(g_system); assert(g_system);
SeekableReadStream *stream = g_system->createConfigReadStream(); SeekableReadStream *stream = g_system->createConfigReadStream();
_filename.clear(); // clear the filename to indicate that we are using the default config file _filename.clear(); // clear the filename to indicate that we are using the default config file
bool loadResult = false;
// ... load it, if available ... // ... load it, if available ...
if (stream) { if (stream) {
loadFromStream(*stream); loadResult = loadFromStream(*stream);
// ... and close it again. // ... and close it again.
delete stream; delete stream;
@ -97,10 +98,12 @@ void ConfigManager::loadDefaultConfigFile(const String &fallbackFilename) {
debug("Default configuration file missing, creating a new one"); debug("Default configuration file missing, creating a new one");
flushToDisk(); flushToDisk();
loadResult = true;
} }
return loadResult;
} }
void ConfigManager::loadConfigFile(const String &filename, const String &fallbackFilename) { bool ConfigManager::loadConfigFile(const String &filename, const String &fallbackFilename) {
_filename = filename; _filename = filename;
FSNode node(filename); FSNode node(filename);
@ -110,8 +113,9 @@ void ConfigManager::loadConfigFile(const String &filename, const String &fallbac
debug("Creating configuration file: %s", filename.c_str()); debug("Creating configuration file: %s", filename.c_str());
} else { } else {
debug("Using configuration file: %s", _filename.c_str()); debug("Using configuration file: %s", _filename.c_str());
loadFromStream(cfg_file); return loadFromStream(cfg_file);
} }
return true;
} }
bool ConfigManager::loadFallbackConfigFile(const String &filename) { bool ConfigManager::loadFallbackConfigFile(const String &filename) {
@ -166,7 +170,7 @@ void ConfigManager::addDomain(const String &domainName, const ConfigManager::Dom
} }
void ConfigManager::loadFromStream(SeekableReadStream &stream) { bool ConfigManager::loadFromStream(SeekableReadStream &stream) {
String domainName; String domainName;
String comment; String comment;
Domain domain; Domain domain;
@ -213,10 +217,13 @@ void ConfigManager::loadFromStream(SeekableReadStream &stream) {
while (*p && (isAlnum(*p) || *p == '-' || *p == '_')) while (*p && (isAlnum(*p) || *p == '-' || *p == '_'))
p++; p++;
if (*p == '\0') if (*p == '\0') {
error("Config file buggy: missing ] in line %d", lineno); warning("Config file buggy: missing ] in line %d", lineno);
else if (*p != ']') return false;
error("Config file buggy: Invalid character '%c' occurred in section name in line %d", *p, lineno); } else if (*p != ']') {
warning("Config file buggy: Invalid character '%c' occurred in section name in line %d", *p, lineno);
return false;
}
domainName = String(line.c_str() + 1, p); domainName = String(line.c_str() + 1, p);
@ -237,13 +244,16 @@ void ConfigManager::loadFromStream(SeekableReadStream &stream) {
// If no domain has been set, this config file is invalid! // If no domain has been set, this config file is invalid!
if (domainName.empty()) { if (domainName.empty()) {
error("Config file buggy: Key/value pair found outside a domain in line %d", lineno); warning("Config file buggy: Key/value pair found outside a domain in line %d", lineno);
return false;
} }
// Split string at '=' into 'key' and 'value'. First, find the "=" delimeter. // Split string at '=' into 'key' and 'value'. First, find the "=" delimeter.
const char *p = strchr(t, '='); const char *p = strchr(t, '=');
if (!p) if (!p) {
error("Config file buggy: Junk found in line %d: '%s'", lineno, t); warning("Config file buggy: Junk found in line %d: '%s'", lineno, t);
return false;
}
// Extract the key/value pair // Extract the key/value pair
String key(t, p); String key(t, p);
@ -263,6 +273,8 @@ void ConfigManager::loadFromStream(SeekableReadStream &stream) {
} }
addDomain(domainName, domain); // Add the last domain found addDomain(domainName, domain); // Add the last domain found
return true;
} }
void ConfigManager::flushToDisk() { void ConfigManager::flushToDisk() {

6
common/config-manager.h
View File

@ -125,8 +125,8 @@ public:
static char const *const kCloudDomain; static char const *const kCloudDomain;
#endif #endif
void loadDefaultConfigFile(const String &fallbackFilename); /*!< Load the default configuration file. */ bool loadDefaultConfigFile(const String &fallbackFilename); /*!< Load the default configuration file. */
void loadConfigFile(const String &filename, const String &fallbackFilename); /*!< Load a specific configuration file. */ bool loadConfigFile(const String &filename, const String &fallbackFilename); /*!< Load a specific configuration file. */
/** /**
* Retrieve the config domain with the given name. * Retrieve the config domain with the given name.
@ -223,7 +223,7 @@ private:
ConfigManager(); ConfigManager();
bool loadFallbackConfigFile(const String &filename); bool loadFallbackConfigFile(const String &filename);
void loadFromStream(SeekableReadStream &stream); bool loadFromStream(SeekableReadStream &stream);
void addDomain(const String &domainName, const Domain &domain); void addDomain(const String &domainName, const Domain &domain);
void writeDomain(WriteStream &stream, const String &name, const Domain &domain); void writeDomain(WriteStream &stream, const String &name, const Domain &domain);
void renameDomain(const String &oldName, const String &newName, DomainMap &map); void renameDomain(const String &oldName, const String &newName, DomainMap &map);