Rewrote database interface.

It is a class now and has a saner return type, a struct.
develop
tastytea 2019-01-12 18:18:49 +01:00
parent 165e9039a7
commit 54919796d7
No known key found for this signature in database
GPG Key ID: CFC39497F1B26E07
2 changed files with 62 additions and 77 deletions

View File

@ -28,20 +28,27 @@
using std::cerr;
namespace fs = std::experimental::filesystem;
const string get_filepath()
Database::Database() {};
Database::data::operator bool() const
{
string filepath;
return !user.empty();
}
const string Database::get_filepath() const
{
fs::path filepath;
xdgHandle xdg;
xdgInitHandle(&xdg);
filepath = xdgDataHome(&xdg);
xdgWipeHandle(&xdg);
filepath += "/whyblocked";
filepath /= "whyblocked";
if (!fs::exists(filepath))
{
fs::create_directories(filepath);
}
filepath += "/database.sqlite";
filepath /= "database.sqlite";
if (!fs::exists(filepath))
{
sqlite::connection con(filepath);
@ -53,7 +60,7 @@ const string get_filepath()
return filepath;
}
bool database::add_block(const string &user, const int blocked,
bool Database::add_user(const string &user, const int blocked,
const string &reason)
{
try
@ -72,7 +79,7 @@ bool database::add_block(const string &user, const int blocked,
return true;
}
bool database::add_receipt(const string &user, const string &receipt)
bool Database::add_receipt(const string &user, const string &receipt)
{
try
{
@ -90,7 +97,7 @@ bool database::add_receipt(const string &user, const string &receipt)
return true;
}
bool database::remove(const string &user)
bool Database::remove(const string &user)
{
try
{
@ -111,78 +118,44 @@ bool database::remove(const string &user)
return true;
}
bool database::view(result_view &result, const string &sql_query)
{
try
{
string query;
if (sql_query.empty())
{
query = "SELECT * FROM blocks;";
}
else
{
query = sql_query;
}
sqlite::connection con(get_filepath());
sqlite::query q(con, query);
sqlite::result_type res = q.get_result();
while(res->next_row())
{
result.push_back(
{
res->get_string(0),
res->get_int(1),
res->get_string(2)
});
}
}
catch (const std::exception &e)
{
cerr << "An error occurred: " << e.what() << std::endl;
return false;
}
return true;
}
bool database::details(const string &user, result_details &result)
const vector<Database::data> Database::query(const string &sql_query) const
{
try
{
sqlite::connection con(get_filepath());
sqlite::query q_blocks(con,
"SELECT * FROM blocks WHERE user = \'" + user + "\';");
sqlite::query q_blocks(con, sql_query);
sqlite::result_type res_blocks = q_blocks.get_result();
std::vector<data> result;
while(res_blocks->next_row())
{
const string user = res_blocks->get_string(0);
const int blocked = res_blocks->get_int(1);
const string reason = res_blocks->get_string(2);
sqlite::query q_urls(con,
"SELECT * FROM urls WHERE user = \'" + user + "\';");
sqlite::result_type res_urls = q_urls.get_result();
if (!res_blocks->next_row())
vector<string> receipts;
while(res_urls->next_row())
{
cerr << user << " is not in the database.\n";
return false;
receipts.push_back(res_urls->get_string(1));
}
std::vector<string> urls;
while (res_urls->next_row())
result.push_back(
{
urls.push_back(res_urls->get_string(1));
user,
blocked,
reason,
receipts
});
}
result =
{
res_blocks->get_int(1),
res_blocks->get_string(2),
urls
};
return result;
}
catch (const std::exception &e)
{
cerr << "An error occurred: " << e.what() << std::endl;
return false;
return {};
}
return true;
}

View File

@ -22,18 +22,30 @@
#include <string>
using std::string;
using result_view = std::vector<std::tuple<string, int, string>>;
using result_details = std::tuple<int, string, std::vector<string>>;
using std::vector;
const string get_filepath();
namespace database
class Database
{
bool add_block(const string &user, const int blocked,
const string &reason);
public:
struct data
{
const string user;
const int blocked;
const string reason;
const vector<string> receipts;
explicit operator bool() const;
};
Database();
bool add_user(const string &user, const int blocked, const string &reason);
bool add_receipt(const string &user, const string &receipt);
bool remove(const string &user);
bool view(result_view &result, const string &sql_query = "");
bool details(const string &user, result_details &result);
}
const vector<data> query(const string &sql_query = "SELECT * FROM blocks;")
const;
private:
const string get_filepath() const;
};
#endif // WHYBLOCKED_HPP