phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Still in the process of switching to prepared statements. Left TODO for removing the make_shared_ptr for the raw song data. Added feature to retrieve a sing cover art record in json format

Browse Source
This commit is contained in:
kdeng00
2019-09-05 20:57:13 -04:00
parent 5b9f2a0505
commit ada50b3d5c
8 changed files with 303 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/AlbumRepository.cpp
+2 -1
View File
@@ -34,7 +34,7 @@ model::Album database::AlbumRepository::retrieveRecord(model::Album& album, type
auto titleLength = album.title.size();
switch (filter) {
case type::AlbumFilter::id:
qry << "alb.AlbumId = " << album.id;
qry << "alb.AlbumId = ?";
params[0].buffer_type = MYSQL_TYPE_LONG;
params[0].buffer = (char*)&album.id;
@@ -64,6 +64,7 @@ model::Album database::AlbumRepository::retrieveRecord(model::Album& album, type
mysql_stmt_close(stmt);
mysql_close(conn);
std::cout << "done" << std::endl;
return album;
src/database/ArtistRepository.cpp
+68 -9
View File
@@ -17,29 +17,46 @@ model::Artist database::ArtistRepository::retrieveRecord(model::Artist& artist,
std::cout << "retrieving artist record" << std::endl;
std::stringstream qry;
auto conn = setupMysqlConnection();
auto stmt = mysql_stmt_init(conn);
qry << "SELECT art.* FROM Artist art WHERE ";
std::unique_ptr<char*> param;
MYSQL_BIND params[1];
memset(params, 0, sizeof(params));
//std::unique_ptr<char*> param;
auto artistLength = artist.artist.size();
switch (filter) {
case type::ArtistFilter::id:
qry << "art.ArtistId = " << artist.id;
qry << "art.ArtistId = ?";
params[0].buffer_type = MYSQL_TYPE_LONG;
params[0].buffer = (char*)&artist.id;
params[0].length = 0;
params[0].is_null = 0;
break;
case type::ArtistFilter::artist:
param = std::make_unique<char*>(new char[artist.artist.size()]);
mysql_real_escape_string(conn, *param, artist.artist.c_str(), artist.artist.size());
qry << "art.Artist ='" << *param << "'";
qry << "art.Artist = ?";
//param = std::make_unique<char*>(new char[artist.artist.size()]);
//mysql_real_escape_string(conn, *param, artist.artist.c_str(), artist.artist.size());
params[0].buffer_type = MYSQL_TYPE_STRING;
params[0].buffer = (char*)artist.artist.c_str();
params[0].length = &artistLength;
params[0].is_null = 0;
break;
default:
break;
}
qry << " ORDER BY ArtistId DESC LIMIT 1";
qry << " LIMIT 1";
const auto query = qry.str();
auto results = performMysqlQuery(conn, query);
auto status = mysql_stmt_prepare(stmt, query.c_str(), query.size());
status = mysql_stmt_bind_param(stmt, params);
status = mysql_stmt_execute(stmt);
artist = parseRecord(results);
artist = parseRecord(stmt);
mysql_stmt_close(stmt);
mysql_close(conn);
std::cout << "retrieved record" << std::endl;
@@ -154,8 +171,50 @@ model::Artist database::ArtistRepository::parseRecord(MYSQL_RES* results)
model::Artist database::ArtistRepository::parseRecord(MYSQL_STMT *stmt)
{
// TODO: implement this
std::cout << "parsing artist record" << std::endl;
mysql_stmt_store_result(stmt);
model::Artist art;
auto status = 0;
auto time = 0;
auto valAmt = 2;
unsigned long len[valAmt];
my_bool nullRes[valAmt];
while (status == 0) {
if (mysql_stmt_field_count(stmt) > 0) {
auto res = mysql_stmt_result_metadata(stmt);
auto fields = mysql_fetch_fields(res);
auto strLen = 1024;
MYSQL_BIND val[valAmt];
memset(val, 0, sizeof(val));
char artist[strLen];
val[0].buffer_type = MYSQL_TYPE_LONG;
val[0].buffer = (char*)&art.id;
val[0].length = &len[0];
val[0].is_null = &nullRes[0];
val[1].buffer_type = MYSQL_TYPE_STRING;
val[1].buffer = (char*)&artist;
val[1].buffer_length = strLen;
val[1].length = &len[1];
val[1].is_null = &nullRes[1];
status = mysql_stmt_bind_result(stmt, val);
mysql_stmt_store_result(stmt);
status = mysql_stmt_fetch(stmt);
art.artist = artist;
}
status = mysql_stmt_next_result(stmt);
}
std::cout << "done parsing artist record" << std::endl;
return art;
}
src/database/CoverArtRepository.cpp
+85 -23
View File
@@ -15,33 +15,47 @@ model::Cover database::CoverArtRepository::retrieveRecord(model::Cover& cov, typ
{
std::stringstream qry;
auto conn = setupMysqlConnection();
auto stmt = mysql_stmt_init(conn);
qry << "SELECT * FROM CoverArt WHERE ";
std::unique_ptr<char*> param;
MYSQL_BIND params[1];
memset(params, 0, sizeof(params));
auto songTitleLength = cov.songTitle.size();
switch (filter) {
case type::CoverFilter::id:
qry << "CoverArtId = " << cov.id;
qry << "CoverArtId = ?";
params[0].buffer_type = MYSQL_TYPE_LONG;
params[0].buffer = (char*)&cov.id;
params[0].length = 0;
params[0].is_null = 0;
break;
case type::CoverFilter::songTitle:
param = std::make_unique<char*>(new char[cov.songTitle.size()]);
mysql_real_escape_string(conn, *param, cov.songTitle.c_str(), cov.songTitle.size());
qry << "SongTitle = '" << *param << "'";
qry << "SongTitle = ?";
params[0].buffer_type = MYSQL_TYPE_STRING;
params[0].buffer = (char*)cov.songTitle.c_str();
params[0].length = &songTitleLength;
params[0].is_null = 0;
break;
case type::CoverFilter::imagePath:
param = std::make_unique<char*>(new char[cov.imagePath.size()]);
mysql_real_escape_string(conn, *param, cov.imagePath.c_str(), cov.imagePath.size());
qry << "ImagePath = '" << *param << "'";
default:
break;
}
qry << " LIMIT 1";
const std::string query = qry.str();
auto results = performMysqlQuery(conn, query);
std::cout << "the query has been performed" << std::endl;
auto status = mysql_stmt_prepare(stmt, query.c_str(), query.size());
status = mysql_stmt_bind_param(stmt, params);
status = mysql_stmt_execute(stmt);
auto covDb = parseRecord(results);
auto covDb = parseRecord(stmt);
mysql_stmt_close(stmt);
mysql_close(conn);
std::cout << "done" << std::endl;
std::cout << "retrieved cover art record" << std::endl;
return covDb;
}
@@ -97,6 +111,7 @@ bool database::CoverArtRepository::doesCoverArtExist(const model::Cover& cover,
return (rowCount > 0) ? true : false;
}
// TODO: change to prepared statement
void database::CoverArtRepository::deleteRecord(const model::Cover& cov)
{
auto conn = setupMysqlConnection();
@@ -109,20 +124,17 @@ void database::CoverArtRepository::deleteRecord(const model::Cover& cov)
void database::CoverArtRepository::saveRecord(const model::Cover& cov)
{
std::cout << "saving cover art record";
auto conn = setupMysqlConnection();
auto stmt = mysql_stmt_init(conn);
MYSQL_STMT *stmt;
MYSQL_BIND params[2];
memset(params, 0, sizeof(params));
my_bool isNull;
int status;
stmt = mysql_stmt_init(conn);
const std::string query = "INSERT INTO CoverArt(SongTitle, ImagePath) VALUES(?, ?)";
status = mysql_stmt_prepare(stmt, query.c_str(), query.size());
memset(params, 0, sizeof(params));
auto status = mysql_stmt_prepare(stmt, query.c_str(), query.size());
params[0].buffer_type = MYSQL_TYPE_STRING;
params[0].buffer = (char*)cov.songTitle.c_str();
@@ -142,7 +154,7 @@ void database::CoverArtRepository::saveRecord(const model::Cover& cov)
mysql_stmt_close(stmt);
mysql_close(conn);
std::cout << "done" << std::endl;
std::cout << "saved cover art record" << std::endl;
}
model::Cover database::CoverArtRepository::parseRecord(MYSQL_RES *results)
@@ -173,9 +185,59 @@ model::Cover database::CoverArtRepository::parseRecord(MYSQL_RES *results)
model::Cover database::CoverArtRepository::parseRecord(MYSQL_STMT *stmt)
{
// TODO: implement this
std::cout << "parsing cover art record" << std::endl;
mysql_stmt_store_result(stmt);
model::Cover cover;
auto status = 0;
auto time = 0;
auto valAmt = 3;
unsigned long len[valAmt];
my_bool nullRes[valAmt];
while (status == 0) {
if (mysql_stmt_field_count(stmt) > 0) {
auto res = mysql_stmt_result_metadata(stmt);
auto fields = mysql_fetch_fields(res);
auto strLen = 1024;
MYSQL_BIND val[valAmt];
memset(val, 0, sizeof(val));
char songTitle[strLen];
char imagePath[strLen];
val[0].buffer_type = MYSQL_TYPE_LONG;
val[0].buffer = (char*)&cover.id;
val[0].length = &len[0];
val[0].is_null = &nullRes[0];
val[1].buffer_type = MYSQL_TYPE_STRING;
val[1].buffer = (char*)&songTitle;
val[1].buffer_length = strLen;
val[1].length = &len[1];
val[1].is_null = &nullRes[1];
val[2].buffer_type = MYSQL_TYPE_STRING;
val[2].buffer = (char*)&imagePath;
val[2].buffer_length = strLen;
val[2].length = &len[2];
val[2].is_null = &nullRes[2];
status = mysql_stmt_bind_result(stmt, val);
mysql_stmt_store_result(stmt);
status = mysql_stmt_fetch(stmt);
cover.songTitle = songTitle;
cover.imagePath = imagePath;
}
status = mysql_stmt_next_result(stmt);
}
std::cout << "done parsing cover art record" << std::endl;
return cover;
}