mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-02-06 12:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed track upsert logic to be more reliable.

Browse Source
This commit is contained in:
casey langen 2017-04-22 12:33:10 -07:00
parent 91a6c07233
commit 26bee45a45
1 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/core/library/track/IndexerTrack.cpp
View File

@ -250,6 +250,7 @@ static uint64_t writeToTracksTable(
IndexerTrack& track) IndexerTrack& track)
{ {
std::string externalId = track.GetValue("external_id"); std::string externalId = track.GetValue("external_id");
uint64_t id = track.GetId();
if (externalId.size() == 0) { if (externalId.size() == 0) {
return 0; return 0;
@ -260,42 +261,70 @@ static uint64_t writeToTracksTable(
/* if there's no ID specified, but we have an external ID, let's /* if there's no ID specified, but we have an external ID, let's
see if we can find the corresponding ID. this can happen when see if we can find the corresponding ID. this can happen when
IInputSource plugins are reading/writing track data. */ IInputSource plugins are reading/writing track data. */
if (track.GetId() == 0 && sourceId != 0) { if (id == 0) {
db::Statement stmt("SELECT id FROM tracks WHERE source_id=? AND external_id=?", dbConnection); if (sourceId == 0) {
stmt.BindInt32(0, sourceId); db::Statement stmt("SELECT id FROM tracks WHERE source_id=? AND external_id=?", dbConnection);
stmt.BindText(1, externalId); stmt.BindInt32(0, sourceId);
if (stmt.Step() == db::Row) { stmt.BindText(1, externalId);
track.SetId(stmt.ColumnUint64(0)); if (stmt.Step() == db::Row) {
track.SetId(stmt.ColumnUint64(0));
}
}
else {
std::string fn = track.GetValue("filename");
if (fn.size()) {
db::Statement stmt("SELECT id, external_id FROM tracks WHERE filename=?", dbConnection);
stmt.BindText(0, track.GetValue("filename"));
if (stmt.Step() == db::Row) {
id = stmt.ColumnUint64(0);
track.SetId(id);
track.SetValue("external_id", stmt.ColumnText(1));
}
}
} }
} }
db::Statement stmt("INSERT OR REPLACE INTO tracks " \ std::string query;
"(id, track, disc, bpm, duration, filesize, year, title, filename, filetime, path_id, external_id) " \
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", dbConnection);
stmt.BindText(1, track.GetValue("track")); if (id != 0) {
stmt.BindText(2, track.GetValue("disc")); query =
stmt.BindText(3, track.GetValue("bpm")); "UPDATE tracks "
stmt.BindInt32(4, track.GetInt32("duration")); "SET track=?, disc=?, bpm=?, duration=?, filesize=?, year=?, "
stmt.BindInt32(5, track.GetInt32("filesize")); " title=?, filename=?, filetime=?, path_id=?, external_id=? "
stmt.BindText(6, track.GetValue("year")); "WHERE id=?";
stmt.BindText(7, track.GetValue("title")); }
stmt.BindText(8, track.GetValue("filename")); else {
stmt.BindInt32(9, track.GetInt32("filetime")); query =
stmt.BindUint64(10, track.GetInt64("path_id")); "INSERT INTO tracks "
stmt.BindText(11, track.GetValue("external_id")); "(track, disc, bpm, duration, filesize, year, title, filename, filetime, path_id, external_id) "
"VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
}
if (track.GetId() != 0) { db::Statement stmt(query.c_str(), dbConnection);
stmt.BindUint64(0, (uint64_t) track.GetId());
stmt.BindText(0, track.GetValue("track"));
stmt.BindText(1, track.GetValue("disc"));
stmt.BindText(2, track.GetValue("bpm"));
stmt.BindInt32(3, track.GetInt32("duration"));
stmt.BindInt32(4, track.GetInt32("filesize"));
stmt.BindText(5, track.GetValue("year"));
stmt.BindText(6, track.GetValue("title"));
stmt.BindText(7, track.GetValue("filename"));
stmt.BindInt32(8, track.GetInt32("filetime"));
stmt.BindUint64(9, track.GetInt64("path_id"));
stmt.BindText(10, track.GetValue("external_id"));
if (id != 0) {
stmt.BindUint64(11, id);
} }
if (stmt.Step() == db::Done) { if (stmt.Step() == db::Done) {
if (track.GetId() == 0) { if (id == 0) {
return dbConnection.LastInsertedId(); return dbConnection.LastInsertedId();
} }
} }
return track.GetId(); return id;
} }
static void removeRelation( static void removeRelation(