mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a ChannelOptions table in the DB

Browse Source 
And a way to retrieve its values, defaulting on the ServerOptions for unset
values.
This commit is contained in:
Florent Le Coz
2016-01-04 13:47:26 +01:00
parent 9ac0d3a576
commit 421c960df5
4 changed files with 130 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/database.cpp
+33
View File
@@ -49,6 +49,39 @@ db::IrcServerOptions Database::get_irc_server_options(const std::string& owner,
}
}
db::IrcChannelOptions Database::get_irc_channel_options(const std::string& owner,
const std::string& server,
const std::string& channel)
{
try {
auto options = litesql::select<db::IrcChannelOptions>(Database::get_db(),
db::IrcChannelOptions::Owner == owner &&
db::IrcChannelOptions::Server == server &&
db::IrcChannelOptions::Channel == channel).one();
return options;
} catch (const litesql::NotFound& e) {
db::IrcChannelOptions options(Database::get_db());
options.owner = owner;
options.server = server;
options.channel = channel;
return options;
}
}
db::IrcChannelOptions Database::get_irc_channel_options_with_server_default(const std::string& owner,
const std::string& server,
const std::string& channel)
{
auto coptions = Database::get_irc_channel_options(owner, server, channel);
auto soptions = Database::get_irc_server_options(owner, server);
if (coptions.encodingIn.value().empty())
coptions.encodingIn = soptions.encodingIn;
if (coptions.encodingOut.value().empty())
coptions.encodingOut = soptions.encodingOut;
return coptions;
}
void Database::close()
{
Database::db.reset(nullptr);
src/database/database.hpp
+6
View File
@@ -29,6 +29,12 @@ public:
*/
static db::IrcServerOptions get_irc_server_options(const std::string& owner,
const std::string& server);
static db::IrcChannelOptions get_irc_channel_options(const std::string& owner,
const std::string& server,
const std::string& channel);
static db::IrcChannelOptions get_irc_channel_options_with_server_default(const std::string& owner,
const std::string& server,
const std::string& channel);
static void close();