[Database] restored id on Artist, Genre and Release tables. Added basic MusicBrainz ID support. Improved search filters a bit
This commit is contained in:
emeric
+64
-231
@@ -17,8 +17,6 @@
|
||||
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
||||
#include <Wt/Dbo/QueryModel>
|
||||
|
||||
#include "logger/Logger.hpp"
|
||||
@@ -29,104 +27,6 @@
|
||||
|
||||
namespace Database {
|
||||
|
||||
static SqlQuery generatePartialQuery(SearchFilter& filter, bool forceGenreInnerJoin = false)
|
||||
{
|
||||
bool genreJoin = forceGenreInnerJoin;
|
||||
SqlQuery sqlQuery;
|
||||
|
||||
|
||||
// Process like searches
|
||||
BOOST_FOREACH(SearchFilter::FieldValues& likeMatch, filter.likeMatches)
|
||||
{
|
||||
WhereClause likeWhereClause;
|
||||
|
||||
// Artist
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, likeMatch[SearchFilter::Field::Artist])
|
||||
whereClause.Or( WhereClause("t.artist_name LIKE ?") ).bind("%%" + name + "%%");
|
||||
|
||||
likeWhereClause.Or( whereClause );
|
||||
}
|
||||
// Release
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, likeMatch[SearchFilter::Field::Release])
|
||||
whereClause.Or( WhereClause("t.release_name LIKE ?") ).bind("%%" + name + "%%");
|
||||
|
||||
likeWhereClause.Or( whereClause );
|
||||
}
|
||||
// Genre
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, likeMatch[SearchFilter::Field::Genre])
|
||||
{
|
||||
whereClause.Or( WhereClause("g.name LIKE ?") ).bind("%%" + name + "%%");
|
||||
genreJoin = true;
|
||||
}
|
||||
|
||||
likeWhereClause.Or( whereClause );
|
||||
}
|
||||
// Track
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, likeMatch[SearchFilter::Field::Track])
|
||||
whereClause.Or( WhereClause("t.name LIKE ?") ).bind("%%" + name + "%%");
|
||||
|
||||
likeWhereClause.Or( whereClause );
|
||||
}
|
||||
|
||||
sqlQuery.where().And( likeWhereClause );
|
||||
}
|
||||
|
||||
// Add exact search constraints
|
||||
// Artist
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, filter.exactMatch[SearchFilter::Field::Artist])
|
||||
whereClause.Or( WhereClause("t.artist_name = ?") ).bind(name);
|
||||
|
||||
sqlQuery.where().And( whereClause );
|
||||
}
|
||||
|
||||
// Release
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, filter.exactMatch[SearchFilter::Field::Release])
|
||||
whereClause.Or( WhereClause("t.release_name = ?") ).bind(name);
|
||||
|
||||
sqlQuery.where().And( whereClause );
|
||||
}
|
||||
|
||||
// Genre
|
||||
{
|
||||
WhereClause whereClause;
|
||||
|
||||
BOOST_FOREACH(const std::string& name, filter.exactMatch[SearchFilter::Field::Genre])
|
||||
{
|
||||
whereClause.Or( WhereClause("g.name = ?") ).bind(name);
|
||||
genreJoin = true;
|
||||
}
|
||||
|
||||
sqlQuery.where().And( whereClause );
|
||||
}
|
||||
|
||||
if (genreJoin)
|
||||
{
|
||||
sqlQuery.innerJoin().And( InnerJoinClause("genre g ON g.id = t_g.genre_id"));
|
||||
sqlQuery.innerJoin().And( InnerJoinClause("track_genre t_g ON t_g.track_id = t.id"));
|
||||
}
|
||||
|
||||
return sqlQuery;
|
||||
}
|
||||
|
||||
|
||||
Track::Track(const boost::filesystem::path& p)
|
||||
:
|
||||
_trackNumber(0),
|
||||
@@ -148,7 +48,7 @@ Track::setGenres(std::vector<Genre::pointer> genres)
|
||||
if (_genres.size())
|
||||
_genres.clear();
|
||||
|
||||
BOOST_FOREACH(Genre::pointer genre, genres) {
|
||||
for (Genre::pointer genre : genres) {
|
||||
_genres.insert( genre );
|
||||
}
|
||||
}
|
||||
@@ -156,7 +56,7 @@ Track::setGenres(std::vector<Genre::pointer> genres)
|
||||
Track::pointer
|
||||
Track::getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p)
|
||||
{
|
||||
return session.find<Track>().where("path = ?").bind(p.string());
|
||||
return session.find<Track>().where("file_path = ?").bind(p.string());
|
||||
}
|
||||
|
||||
Track::pointer
|
||||
@@ -165,6 +65,11 @@ Track::getById(Wt::Dbo::Session& session, id_type id)
|
||||
return session.find<Track>().where("id = ?").bind(id);
|
||||
}
|
||||
|
||||
Track::pointer
|
||||
Track::getByMBID(Wt::Dbo::Session& session, const std::string& mbid)
|
||||
{
|
||||
return session.find<Track>().where("mbid = ?").bind(mbid);
|
||||
}
|
||||
|
||||
Track::pointer
|
||||
Track::create(Wt::Dbo::Session& session, const boost::filesystem::path& p)
|
||||
@@ -181,104 +86,52 @@ Track::getGenres(void) const
|
||||
}
|
||||
|
||||
Wt::Dbo::Query< Track::pointer >
|
||||
Track::getAllQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
Track::getQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<pointer> query
|
||||
= session.query<Track::pointer>( "SELECT t FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("t.id").orderBy("t.artist_name,t.date,t.release_name,t.disc_number,t.track_number");
|
||||
= session.query<pointer>( "SELECT t FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN genre g ON g.id = t_g.genre_id INNER JOIN track_genre t_g ON t_g.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get()).groupBy("t.id").orderBy("a.name,t.date,r.name,t.disc_number,t.track_number");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
for (const std::string& bindArg : sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
Wt::Dbo::Query< Track::UIQueryResult >
|
||||
Track::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<UIQueryResult> query
|
||||
= session.query<UIQueryResult>( "SELECT t.id, a.name, r.name, t.disc_number, t.track_number, t.name, t.duration, t.date, t.original_date, t.genre_list FROM track t INNER JOIN artist a ON t.artist_id = a.id INNER JOIN genre g ON g.id = t_g.genre_id INNER JOIN track_genre t_g ON t_g.track_id = t.id INNER JOIN release r ON r.id = t.release_id " + sqlQuery.where().get()).groupBy("t.id").orderBy("a.name,t.date,r.name,t.disc_number,t.track_number");
|
||||
|
||||
for (const std::string& bindArg : sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
std::vector<Track::pointer>
|
||||
Track::getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
Track::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
{
|
||||
Wt::Dbo::collection<Track::pointer> res = getAllQuery(session, filter).limit(size).offset(offset);
|
||||
return std::vector<Track::pointer>(res.begin(), res.end());
|
||||
}
|
||||
Wt::Dbo::collection<pointer> res = getQuery(session, filter).limit(size).offset(offset);
|
||||
|
||||
std::vector<Track::pointer>
|
||||
Track::getTracks(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
{
|
||||
return getAll(session, filter, offset, size);
|
||||
}
|
||||
|
||||
Wt::Dbo::Query<Track::ReleaseResult>
|
||||
Track::getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<ReleaseResult> query
|
||||
= session.query<ReleaseResult>("SELECT t.release_name, t.date, COUNT(DISTINCT t.id) FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("t.release_name").orderBy("t.release_name");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
return std::vector<pointer>(res.begin(), res.end());
|
||||
}
|
||||
|
||||
void
|
||||
Track::updateReleaseQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<ReleaseResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
Track::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< UIQueryResult >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
{
|
||||
Wt::Dbo::Query<ReleaseResult> query = getReleasesQuery(session, filter);
|
||||
|
||||
model.setQuery(query, columnNames.empty() ? true : false);
|
||||
|
||||
// TODO do something better
|
||||
if (columnNames.size() == 3)
|
||||
{
|
||||
model.addColumn( "t.release_name", columnNames[0]);
|
||||
model.addColumn( "t.date", columnNames[1]);
|
||||
model.addColumn( "COUNT(DISTINCT t.id)", columnNames[2] );
|
||||
}
|
||||
}
|
||||
|
||||
Wt::Dbo::Query<Track::ArtistResult>
|
||||
Track::getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<ArtistResult> query
|
||||
= session.query<ArtistResult>( "SELECT t.artist_name, COUNT(DISTINCT t.release_name), COUNT(DISTINCT t.id) FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("t.artist_name").orderBy("t.artist_name");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
void
|
||||
Track::updateArtistQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<ArtistResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
{
|
||||
Wt::Dbo::Query<ArtistResult> query = getArtistsQuery(session, filter);
|
||||
|
||||
model.setQuery(query, columnNames.empty() ? true : false);
|
||||
|
||||
// TODO do something better
|
||||
if (columnNames.size() == 3)
|
||||
{
|
||||
model.addColumn( "t.artist_name", columnNames.at(0));
|
||||
model.addColumn( "COUNT(DISTINCT t.release_name)", columnNames.at(1) );
|
||||
model.addColumn( "COUNT(DISTINCT t.id)", columnNames.at(2) );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
Track::updateTracksQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< pointer >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
{
|
||||
Wt::Dbo::Query< pointer > query = getAllQuery(session, filter);
|
||||
Wt::Dbo::Query< UIQueryResult > query = getUIQuery(session, filter);
|
||||
model.setQuery(query, columnNames.empty() ? true : false);
|
||||
|
||||
// TODO do something better
|
||||
if (columnNames.size() == 9)
|
||||
{
|
||||
model.addColumn( "t.artist_name", columnNames[0] );
|
||||
model.addColumn( "t.release_name", columnNames[1] );
|
||||
model.addColumn( "a.name", columnNames[0] );
|
||||
model.addColumn( "r.name", columnNames[1] );
|
||||
model.addColumn( "t.disc_number", columnNames[2] );
|
||||
model.addColumn( "t.track_number", columnNames[3] );
|
||||
model.addColumn( "t.name", columnNames[4] );
|
||||
@@ -290,48 +143,6 @@ Track::updateTracksQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< po
|
||||
|
||||
}
|
||||
|
||||
std::vector<std::string>
|
||||
Track::getArtists(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<std::string> query
|
||||
= session.query<std::string>( "SELECT DISTINCT t.artist_name FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).offset(offset).limit(size).orderBy("t.artist_name");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
typedef Wt::Dbo::collection< std::string > ArtistNames;
|
||||
ArtistNames artistNames(query);
|
||||
|
||||
std::vector<std::string> res;
|
||||
for (ArtistNames::const_iterator it = artistNames.begin(); it != artistNames.end(); ++it)
|
||||
res.push_back((*it));
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
std::vector<std::string>
|
||||
Track::getReleases(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<std::string> query
|
||||
= session.query<std::string>( "SELECT DISTINCT t.release_name FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).offset(offset).limit(size).orderBy("t.release_name");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
typedef Wt::Dbo::collection< std::string > ReleaseNames;
|
||||
ReleaseNames releaseNames(query);
|
||||
|
||||
std::vector<std::string> res;
|
||||
for (ReleaseNames::const_iterator it = releaseNames.begin(); it != releaseNames.end(); ++it)
|
||||
res.push_back((*it));
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
Genre::Genre()
|
||||
{
|
||||
}
|
||||
@@ -341,6 +152,12 @@ Genre::Genre(const std::string& name)
|
||||
{
|
||||
}
|
||||
|
||||
std::vector<Genre::pointer>
|
||||
Genre::getAll(Wt::Dbo::Session& session, int offset, int size)
|
||||
{
|
||||
Wt::Dbo::collection<pointer> res = session.find<Genre>().offset(offset).limit(size);
|
||||
return std::vector<Genre::pointer>(res.begin(), res.end());
|
||||
}
|
||||
|
||||
Genre::pointer
|
||||
Genre::getByName(Wt::Dbo::Session& session, const std::string& name)
|
||||
@@ -370,30 +187,38 @@ Genre::create(Wt::Dbo::Session& session, const std::string& name)
|
||||
return session.add(new Genre(name));
|
||||
}
|
||||
|
||||
Wt::Dbo::collection<Genre::pointer>
|
||||
Genre::getAll(Wt::Dbo::Session& session, int offset, int size)
|
||||
Wt::Dbo::Query<Genre::pointer>
|
||||
Genre::getQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
return session.find<Genre>().offset(offset).limit(size).orderBy("name");
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<pointer> query
|
||||
= session.query<pointer>( "SELECT g FROM genre g INNER JOIN track_genre t_g ON t_g.genre_id = g.id INNER JOIN artist a ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN track t ON t.id = t_g.track_id " + sqlQuery.where().get()).groupBy("g.name").orderBy("g.name");
|
||||
|
||||
for (const std::string& bindArg : sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
Wt::Dbo::Query<Genre::GenreResult>
|
||||
Genre::getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter)
|
||||
Wt::Dbo::Query<Genre::UIQueryResult>
|
||||
Genre::getUIQuery(Wt::Dbo::Session& session, SearchFilter filter)
|
||||
{
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter, true);
|
||||
SqlQuery sqlQuery = generatePartialQuery(filter);
|
||||
|
||||
Wt::Dbo::Query<Genre::GenreResult> query
|
||||
= session.query<Genre::GenreResult>( "SELECT g.name, COUNT(DISTINCT t.id) FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("g.name").orderBy("g.name");
|
||||
Wt::Dbo::Query<UIQueryResult> query
|
||||
= session.query<UIQueryResult>( "SELECT g.id, g.name, COUNT(DISTINCT t.id) FROM genre g INNER JOIN track_genre t_g ON t_g.genre_id = g.id INNER JOIN artist a ON t.artist_id = a.id INNER JOIN release r ON r.id = t.release_id INNER JOIN track t ON t.id = t_g.track_id " + sqlQuery.where().get()).groupBy("g.name").orderBy("g.name");
|
||||
|
||||
BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
|
||||
for (const std::string& bindArg : sqlQuery.where().getBindArgs())
|
||||
query.bind(bindArg);
|
||||
|
||||
return query;
|
||||
}
|
||||
|
||||
void
|
||||
Genre::updateGenreQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<Genre::GenreResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
Genre::updateUIQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<UIQueryResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
|
||||
{
|
||||
Wt::Dbo::Query<Genre::GenreResult> query = getAllQuery(session, filter);
|
||||
Wt::Dbo::Query<UIQueryResult> query = getUIQuery(session, filter);
|
||||
model.setQuery(query, columnNames.empty() ? true : false);
|
||||
|
||||
// TODO do something better
|
||||
@@ -404,5 +229,13 @@ Genre::updateGenreQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<Gen
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<Genre::pointer>
|
||||
Genre::getByFilter(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
|
||||
{
|
||||
Wt::Dbo::collection<pointer> res = getQuery(session, filter).limit(size).offset(offset);
|
||||
|
||||
return std::vector<pointer>(res.begin(), res.end());
|
||||
}
|
||||
|
||||
} // namespace Database
|
||||
|
||||
|
||||
Reference in New Issue
Block a user