mirror of
https://github.com/luanti-org/luanti.git
synced 2025-07-02 16:38:41 +00:00
Rename "mod metadata" to "mod storage" everywhere
This commit is contained in:
Jude Melton-Houghton
parent
8817af07fb
commit
7c21347a40
22 changed files with 480 additions and 474 deletions
|
|
@ -83,8 +83,8 @@ void Database_Dummy::listPlayers(std::vector<std::string> &res)
|
|||
|
||||
bool Database_Dummy::getModEntries(const std::string &modname, StringMap *storage)
|
||||
{
|
||||
const auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair != m_mod_meta_database.cend()) {
|
||||
const auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair != m_mod_storage_database.cend()) {
|
||||
for (const auto &pair : mod_pair->second) {
|
||||
(*storage)[pair.first] = pair.second;
|
||||
}
|
||||
|
|
@ -94,8 +94,8 @@ bool Database_Dummy::getModEntries(const std::string &modname, StringMap *storag
|
|||
|
||||
bool Database_Dummy::getModKeys(const std::string &modname, std::vector<std::string> *storage)
|
||||
{
|
||||
const auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair != m_mod_meta_database.cend()) {
|
||||
const auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair != m_mod_storage_database.cend()) {
|
||||
storage->reserve(storage->size() + mod_pair->second.size());
|
||||
for (const auto &pair : mod_pair->second)
|
||||
storage->push_back(pair.first);
|
||||
|
|
@ -106,8 +106,8 @@ bool Database_Dummy::getModKeys(const std::string &modname, std::vector<std::str
|
|||
bool Database_Dummy::getModEntry(const std::string &modname,
|
||||
const std::string &key, std::string *value)
|
||||
{
|
||||
auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair == m_mod_meta_database.end())
|
||||
auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair == m_mod_storage_database.end())
|
||||
return false;
|
||||
const StringMap &meta = mod_pair->second;
|
||||
|
||||
|
|
@ -121,8 +121,8 @@ bool Database_Dummy::getModEntry(const std::string &modname,
|
|||
|
||||
bool Database_Dummy::hasModEntry(const std::string &modname, const std::string &key)
|
||||
{
|
||||
auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair == m_mod_meta_database.end())
|
||||
auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair == m_mod_storage_database.end())
|
||||
return false;
|
||||
const StringMap &meta = mod_pair->second;
|
||||
|
||||
|
|
@ -132,9 +132,9 @@ bool Database_Dummy::hasModEntry(const std::string &modname, const std::string &
|
|||
bool Database_Dummy::setModEntry(const std::string &modname,
|
||||
const std::string &key, const std::string &value)
|
||||
{
|
||||
auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair == m_mod_meta_database.end()) {
|
||||
m_mod_meta_database[modname] = StringMap({{key, value}});
|
||||
auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair == m_mod_storage_database.end()) {
|
||||
m_mod_storage_database[modname] = StringMap({{key, value}});
|
||||
} else {
|
||||
mod_pair->second[key] = value;
|
||||
}
|
||||
|
|
@ -143,16 +143,16 @@ bool Database_Dummy::setModEntry(const std::string &modname,
|
|||
|
||||
bool Database_Dummy::removeModEntry(const std::string &modname, const std::string &key)
|
||||
{
|
||||
auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair != m_mod_meta_database.end())
|
||||
auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair != m_mod_storage_database.end())
|
||||
return mod_pair->second.erase(key) > 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool Database_Dummy::removeModEntries(const std::string &modname)
|
||||
{
|
||||
auto mod_pair = m_mod_meta_database.find(modname);
|
||||
if (mod_pair != m_mod_meta_database.end() && !mod_pair->second.empty()) {
|
||||
auto mod_pair = m_mod_storage_database.find(modname);
|
||||
if (mod_pair != m_mod_storage_database.end() && !mod_pair->second.empty()) {
|
||||
mod_pair->second.clear();
|
||||
return true;
|
||||
}
|
||||
|
|
@ -161,7 +161,7 @@ bool Database_Dummy::removeModEntries(const std::string &modname)
|
|||
|
||||
void Database_Dummy::listMods(std::vector<std::string> *res)
|
||||
{
|
||||
for (const auto &pair : m_mod_meta_database) {
|
||||
for (const auto &pair : m_mod_storage_database) {
|
||||
res->push_back(pair.first);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include "database.h"
|
||||
#include "irrlichttypes.h"
|
||||
|
||||
class Database_Dummy : public MapDatabase, public PlayerDatabase, public ModMetadataDatabase
|
||||
class Database_Dummy : public MapDatabase, public PlayerDatabase, public ModStorageDatabase
|
||||
{
|
||||
public:
|
||||
bool saveBlock(const v3s16 &pos, const std::string &data);
|
||||
|
|
@ -54,5 +54,5 @@ public:
|
|||
private:
|
||||
std::map<s64, std::string> m_database;
|
||||
std::set<std::string> m_player_database;
|
||||
std::unordered_map<std::string, StringMap> m_mod_meta_database;
|
||||
std::unordered_map<std::string, StringMap> m_mod_storage_database;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -376,12 +376,12 @@ bool AuthDatabaseFiles::writeAuthFile()
|
|||
return true;
|
||||
}
|
||||
|
||||
ModMetadataDatabaseFiles::ModMetadataDatabaseFiles(const std::string &savedir):
|
||||
ModStorageDatabaseFiles::ModStorageDatabaseFiles(const std::string &savedir):
|
||||
m_storage_dir(savedir + DIR_DELIM + "mod_storage")
|
||||
{
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::getModEntries(const std::string &modname, StringMap *storage)
|
||||
bool ModStorageDatabaseFiles::getModEntries(const std::string &modname, StringMap *storage)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
if (!meta)
|
||||
|
|
@ -396,7 +396,7 @@ bool ModMetadataDatabaseFiles::getModEntries(const std::string &modname, StringM
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::getModKeys(const std::string &modname,
|
||||
bool ModStorageDatabaseFiles::getModKeys(const std::string &modname,
|
||||
std::vector<std::string> *storage)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
|
|
@ -411,7 +411,7 @@ bool ModMetadataDatabaseFiles::getModKeys(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::getModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseFiles::getModEntry(const std::string &modname,
|
||||
const std::string &key, std::string *value)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
|
|
@ -425,13 +425,13 @@ bool ModMetadataDatabaseFiles::getModEntry(const std::string &modname,
|
|||
return false;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::hasModEntry(const std::string &modname, const std::string &key)
|
||||
bool ModStorageDatabaseFiles::hasModEntry(const std::string &modname, const std::string &key)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
return meta && meta->isMember(key);
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::setModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseFiles::setModEntry(const std::string &modname,
|
||||
const std::string &key, const std::string &value)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
|
|
@ -444,7 +444,7 @@ bool ModMetadataDatabaseFiles::setModEntry(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::removeModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseFiles::removeModEntry(const std::string &modname,
|
||||
const std::string &key)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
|
|
@ -459,7 +459,7 @@ bool ModMetadataDatabaseFiles::removeModEntry(const std::string &modname,
|
|||
return false;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseFiles::removeModEntries(const std::string &modname)
|
||||
bool ModStorageDatabaseFiles::removeModEntries(const std::string &modname)
|
||||
{
|
||||
Json::Value *meta = getOrCreateJson(modname);
|
||||
if (!meta || meta->empty())
|
||||
|
|
@ -470,22 +470,22 @@ bool ModMetadataDatabaseFiles::removeModEntries(const std::string &modname)
|
|||
return true;
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseFiles::beginSave()
|
||||
void ModStorageDatabaseFiles::beginSave()
|
||||
{
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseFiles::endSave()
|
||||
void ModStorageDatabaseFiles::endSave()
|
||||
{
|
||||
if (m_modified.empty())
|
||||
return;
|
||||
|
||||
if (!fs::CreateAllDirs(m_storage_dir)) {
|
||||
errorstream << "ModMetadataDatabaseFiles: Unable to save. '"
|
||||
errorstream << "ModStorageDatabaseFiles: Unable to save. '"
|
||||
<< m_storage_dir << "' cannot be created." << std::endl;
|
||||
return;
|
||||
}
|
||||
if (!fs::IsDir(m_storage_dir)) {
|
||||
errorstream << "ModMetadataDatabaseFiles: Unable to save. '"
|
||||
errorstream << "ModStorageDatabaseFiles: Unable to save. '"
|
||||
<< m_storage_dir << "' is not a directory." << std::endl;
|
||||
return;
|
||||
}
|
||||
|
|
@ -493,10 +493,10 @@ void ModMetadataDatabaseFiles::endSave()
|
|||
for (auto it = m_modified.begin(); it != m_modified.end();) {
|
||||
const std::string &modname = *it;
|
||||
|
||||
const Json::Value &json = m_mod_meta[modname];
|
||||
const Json::Value &json = m_mod_storage[modname];
|
||||
|
||||
if (!fs::safeWriteToFile(m_storage_dir + DIR_DELIM + modname, fastWriteJson(json))) {
|
||||
errorstream << "ModMetadataDatabaseFiles[" << modname
|
||||
errorstream << "ModStorageDatabaseFiles[" << modname
|
||||
<< "]: failed to write file." << std::endl;
|
||||
++it;
|
||||
continue;
|
||||
|
|
@ -506,24 +506,24 @@ void ModMetadataDatabaseFiles::endSave()
|
|||
}
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseFiles::listMods(std::vector<std::string> *res)
|
||||
void ModStorageDatabaseFiles::listMods(std::vector<std::string> *res)
|
||||
{
|
||||
// List in-memory metadata first.
|
||||
for (const auto &pair : m_mod_meta) {
|
||||
for (const auto &pair : m_mod_storage) {
|
||||
res->push_back(pair.first);
|
||||
}
|
||||
|
||||
// List other metadata present in the filesystem.
|
||||
for (const auto &entry : fs::GetDirListing(m_storage_dir)) {
|
||||
if (!entry.dir && m_mod_meta.count(entry.name) == 0)
|
||||
if (!entry.dir && m_mod_storage.count(entry.name) == 0)
|
||||
res->push_back(entry.name);
|
||||
}
|
||||
}
|
||||
|
||||
Json::Value *ModMetadataDatabaseFiles::getOrCreateJson(const std::string &modname)
|
||||
Json::Value *ModStorageDatabaseFiles::getOrCreateJson(const std::string &modname)
|
||||
{
|
||||
auto found = m_mod_meta.find(modname);
|
||||
if (found != m_mod_meta.end())
|
||||
auto found = m_mod_storage.find(modname);
|
||||
if (found != m_mod_storage.end())
|
||||
return &found->second;
|
||||
|
||||
Json::Value meta(Json::objectValue);
|
||||
|
|
@ -537,11 +537,11 @@ Json::Value *ModMetadataDatabaseFiles::getOrCreateJson(const std::string &modnam
|
|||
std::string errs;
|
||||
|
||||
if (!Json::parseFromStream(builder, is, &meta, &errs)) {
|
||||
errorstream << "ModMetadataDatabaseFiles[" << modname
|
||||
errorstream << "ModStorageDatabaseFiles[" << modname
|
||||
<< "]: failed to decode data: " << errs << std::endl;
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
return &(m_mod_meta[modname] = std::move(meta));
|
||||
return &(m_mod_storage[modname] = std::move(meta));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,11 +72,11 @@ private:
|
|||
bool writeAuthFile();
|
||||
};
|
||||
|
||||
class ModMetadataDatabaseFiles : public ModMetadataDatabase
|
||||
class ModStorageDatabaseFiles : public ModStorageDatabase
|
||||
{
|
||||
public:
|
||||
ModMetadataDatabaseFiles(const std::string &savedir);
|
||||
virtual ~ModMetadataDatabaseFiles() = default;
|
||||
ModStorageDatabaseFiles(const std::string &savedir);
|
||||
virtual ~ModStorageDatabaseFiles() = default;
|
||||
|
||||
virtual bool getModEntries(const std::string &modname, StringMap *storage);
|
||||
virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
|
||||
|
|
@ -97,6 +97,6 @@ private:
|
|||
bool writeJson(const std::string &modname, const Json::Value &json);
|
||||
|
||||
std::string m_storage_dir;
|
||||
std::unordered_map<std::string, Json::Value> m_mod_meta;
|
||||
std::unordered_map<std::string, Json::Value> m_mod_storage;
|
||||
std::unordered_set<std::string> m_modified;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -813,14 +813,14 @@ void AuthDatabasePostgreSQL::writePrivileges(const AuthEntry &authEntry)
|
|||
}
|
||||
}
|
||||
|
||||
ModMetadataDatabasePostgreSQL::ModMetadataDatabasePostgreSQL(const std::string &connect_string):
|
||||
ModStorageDatabasePostgreSQL::ModStorageDatabasePostgreSQL(const std::string &connect_string):
|
||||
Database_PostgreSQL(connect_string, "_mod_storage"),
|
||||
ModMetadataDatabase()
|
||||
ModStorageDatabase()
|
||||
{
|
||||
connectToDatabase();
|
||||
}
|
||||
|
||||
void ModMetadataDatabasePostgreSQL::createDatabase()
|
||||
void ModStorageDatabasePostgreSQL::createDatabase()
|
||||
{
|
||||
createTableIfNotExists("mod_storage",
|
||||
"CREATE TABLE mod_storage ("
|
||||
|
|
@ -833,7 +833,7 @@ void ModMetadataDatabasePostgreSQL::createDatabase()
|
|||
infostream << "PostgreSQL: Mod Storage Database was initialized." << std::endl;
|
||||
}
|
||||
|
||||
void ModMetadataDatabasePostgreSQL::initStatements()
|
||||
void ModStorageDatabasePostgreSQL::initStatements()
|
||||
{
|
||||
prepareStatement("get_all",
|
||||
"SELECT key, value FROM mod_storage WHERE modname = $1");
|
||||
|
|
@ -866,7 +866,7 @@ void ModMetadataDatabasePostgreSQL::initStatements()
|
|||
"SELECT DISTINCT modname FROM mod_storage");
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::getModEntries(const std::string &modname, StringMap *storage)
|
||||
bool ModStorageDatabasePostgreSQL::getModEntries(const std::string &modname, StringMap *storage)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
@ -886,7 +886,7 @@ bool ModMetadataDatabasePostgreSQL::getModEntries(const std::string &modname, St
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::getModKeys(const std::string &modname,
|
||||
bool ModStorageDatabasePostgreSQL::getModKeys(const std::string &modname,
|
||||
std::vector<std::string> *storage)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -908,7 +908,7 @@ bool ModMetadataDatabasePostgreSQL::getModKeys(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::getModEntry(const std::string &modname,
|
||||
bool ModStorageDatabasePostgreSQL::getModEntry(const std::string &modname,
|
||||
const std::string &key, std::string *value)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -929,7 +929,7 @@ bool ModMetadataDatabasePostgreSQL::getModEntry(const std::string &modname,
|
|||
return found;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::hasModEntry(const std::string &modname,
|
||||
bool ModStorageDatabasePostgreSQL::hasModEntry(const std::string &modname,
|
||||
const std::string &key)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -947,7 +947,7 @@ bool ModMetadataDatabasePostgreSQL::hasModEntry(const std::string &modname,
|
|||
return found;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::setModEntry(const std::string &modname,
|
||||
bool ModStorageDatabasePostgreSQL::setModEntry(const std::string &modname,
|
||||
const std::string &key, const std::string &value)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -969,7 +969,7 @@ bool ModMetadataDatabasePostgreSQL::setModEntry(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::removeModEntry(const std::string &modname,
|
||||
bool ModStorageDatabasePostgreSQL::removeModEntry(const std::string &modname,
|
||||
const std::string &key)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -986,7 +986,7 @@ bool ModMetadataDatabasePostgreSQL::removeModEntry(const std::string &modname,
|
|||
return affected > 0;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabasePostgreSQL::removeModEntries(const std::string &modname)
|
||||
bool ModStorageDatabasePostgreSQL::removeModEntries(const std::string &modname)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
@ -1002,7 +1002,7 @@ bool ModMetadataDatabasePostgreSQL::removeModEntries(const std::string &modname)
|
|||
return affected > 0;
|
||||
}
|
||||
|
||||
void ModMetadataDatabasePostgreSQL::listMods(std::vector<std::string> *res)
|
||||
void ModStorageDatabasePostgreSQL::listMods(std::vector<std::string> *res)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
|
|||
|
|
@ -175,11 +175,11 @@ private:
|
|||
virtual void writePrivileges(const AuthEntry &authEntry);
|
||||
};
|
||||
|
||||
class ModMetadataDatabasePostgreSQL : private Database_PostgreSQL, public ModMetadataDatabase
|
||||
class ModStorageDatabasePostgreSQL : private Database_PostgreSQL, public ModStorageDatabase
|
||||
{
|
||||
public:
|
||||
ModMetadataDatabasePostgreSQL(const std::string &connect_string);
|
||||
~ModMetadataDatabasePostgreSQL() = default;
|
||||
ModStorageDatabasePostgreSQL(const std::string &connect_string);
|
||||
~ModStorageDatabasePostgreSQL() = default;
|
||||
|
||||
bool getModEntries(const std::string &modname, StringMap *storage);
|
||||
bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
|
||||
|
|
|
|||
|
|
@ -763,12 +763,12 @@ void AuthDatabaseSQLite3::writePrivileges(const AuthEntry &authEntry)
|
|||
}
|
||||
}
|
||||
|
||||
ModMetadataDatabaseSQLite3::ModMetadataDatabaseSQLite3(const std::string &savedir):
|
||||
Database_SQLite3(savedir, "mod_storage"), ModMetadataDatabase()
|
||||
ModStorageDatabaseSQLite3::ModStorageDatabaseSQLite3(const std::string &savedir):
|
||||
Database_SQLite3(savedir, "mod_storage"), ModStorageDatabase()
|
||||
{
|
||||
}
|
||||
|
||||
ModMetadataDatabaseSQLite3::~ModMetadataDatabaseSQLite3()
|
||||
ModStorageDatabaseSQLite3::~ModStorageDatabaseSQLite3()
|
||||
{
|
||||
FINALIZE_STATEMENT(m_stmt_remove_all)
|
||||
FINALIZE_STATEMENT(m_stmt_remove)
|
||||
|
|
@ -779,7 +779,7 @@ ModMetadataDatabaseSQLite3::~ModMetadataDatabaseSQLite3()
|
|||
FINALIZE_STATEMENT(m_stmt_get_all)
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseSQLite3::createDatabase()
|
||||
void ModStorageDatabaseSQLite3::createDatabase()
|
||||
{
|
||||
assert(m_database); // Pre-condition
|
||||
|
||||
|
|
@ -794,7 +794,7 @@ void ModMetadataDatabaseSQLite3::createDatabase()
|
|||
"Failed to create database table");
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseSQLite3::initStatements()
|
||||
void ModStorageDatabaseSQLite3::initStatements()
|
||||
{
|
||||
PREPARE_STATEMENT(get_all, "SELECT `key`, `value` FROM `entries` WHERE `modname` = ?");
|
||||
PREPARE_STATEMENT(get_keys, "SELECT `key` FROM `entries` WHERE `modname` = ?");
|
||||
|
|
@ -808,7 +808,7 @@ void ModMetadataDatabaseSQLite3::initStatements()
|
|||
PREPARE_STATEMENT(remove_all, "DELETE FROM `entries` WHERE `modname` = ?");
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::getModEntries(const std::string &modname, StringMap *storage)
|
||||
bool ModStorageDatabaseSQLite3::getModEntries(const std::string &modname, StringMap *storage)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
@ -827,7 +827,7 @@ bool ModMetadataDatabaseSQLite3::getModEntries(const std::string &modname, Strin
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::getModKeys(const std::string &modname,
|
||||
bool ModStorageDatabaseSQLite3::getModKeys(const std::string &modname,
|
||||
std::vector<std::string> *storage)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -845,7 +845,7 @@ bool ModMetadataDatabaseSQLite3::getModKeys(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::getModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseSQLite3::getModEntry(const std::string &modname,
|
||||
const std::string &key, std::string *value)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -866,7 +866,7 @@ bool ModMetadataDatabaseSQLite3::getModEntry(const std::string &modname,
|
|||
return found;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::hasModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseSQLite3::hasModEntry(const std::string &modname,
|
||||
const std::string &key)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -883,7 +883,7 @@ bool ModMetadataDatabaseSQLite3::hasModEntry(const std::string &modname,
|
|||
return found;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::setModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseSQLite3::setModEntry(const std::string &modname,
|
||||
const std::string &key, const std::string &value)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -900,7 +900,7 @@ bool ModMetadataDatabaseSQLite3::setModEntry(const std::string &modname,
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::removeModEntry(const std::string &modname,
|
||||
bool ModStorageDatabaseSQLite3::removeModEntry(const std::string &modname,
|
||||
const std::string &key)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
|
@ -916,7 +916,7 @@ bool ModMetadataDatabaseSQLite3::removeModEntry(const std::string &modname,
|
|||
return changes > 0;
|
||||
}
|
||||
|
||||
bool ModMetadataDatabaseSQLite3::removeModEntries(const std::string &modname)
|
||||
bool ModStorageDatabaseSQLite3::removeModEntries(const std::string &modname)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
@ -929,7 +929,7 @@ bool ModMetadataDatabaseSQLite3::removeModEntries(const std::string &modname)
|
|||
return changes > 0;
|
||||
}
|
||||
|
||||
void ModMetadataDatabaseSQLite3::listMods(std::vector<std::string> *res)
|
||||
void ModStorageDatabaseSQLite3::listMods(std::vector<std::string> *res)
|
||||
{
|
||||
verifyDatabase();
|
||||
|
||||
|
|
|
|||
|
|
@ -233,11 +233,11 @@ private:
|
|||
sqlite3_stmt *m_stmt_last_insert_rowid = nullptr;
|
||||
};
|
||||
|
||||
class ModMetadataDatabaseSQLite3 : private Database_SQLite3, public ModMetadataDatabase
|
||||
class ModStorageDatabaseSQLite3 : private Database_SQLite3, public ModStorageDatabase
|
||||
{
|
||||
public:
|
||||
ModMetadataDatabaseSQLite3(const std::string &savedir);
|
||||
virtual ~ModMetadataDatabaseSQLite3();
|
||||
ModStorageDatabaseSQLite3(const std::string &savedir);
|
||||
virtual ~ModStorageDatabaseSQLite3();
|
||||
|
||||
virtual bool getModEntries(const std::string &modname, StringMap *storage);
|
||||
virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage);
|
||||
|
|
|
|||
|
|
@ -86,10 +86,10 @@ public:
|
|||
virtual void reload() = 0;
|
||||
};
|
||||
|
||||
class ModMetadataDatabase : public Database
|
||||
class ModStorageDatabase : public Database
|
||||
{
|
||||
public:
|
||||
virtual ~ModMetadataDatabase() = default;
|
||||
virtual ~ModStorageDatabase() = default;
|
||||
|
||||
virtual bool getModEntries(const std::string &modname, StringMap *storage) = 0;
|
||||
virtual bool getModKeys(const std::string &modname, std::vector<std::string> *storage) = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue