[DB] Corrected searching by genre and added searching by multi keywords

TODO

@@ -39,7 +39,6 @@
 
 	[Audio]
 	- Style eveything nicely...
-	- Search patterns in the genre list
 	- ReleaseView/ArtistView/GenreView: <All> -> Track count for this special category. Easier: add a special entry '<All>' that contains everything?
 	- MediaPlayer: move slider using js (http://redmine.webtoolkit.eu/boards/2/topics/7924?r=8478)
 	- TrackView : handle duration > 1 hour

src/Makefile.am

@@ -12,7 +12,6 @@ lms_SOURCES = \
 	$(srcdir)/cover/CoverArt.cpp				\
 	$(srcdir)/cover/CoverArtGrabber.cpp			\
 	$(srcdir)/database/DatabaseHandler.cpp			\
-	$(srcdir)/database/Genre.cpp				\
 	$(srcdir)/database/MediaDirectory.cpp			\
 	$(srcdir)/database/SqlQuery.cpp				\
 	$(srcdir)/database/Track.cpp				\
@@ -46,7 +45,6 @@ lms_SOURCES = \
 	$(srcdir)/ui/audio/KeywordSearchFilter.cpp		\
 	$(srcdir)/ui/audio/PlayQueue.cpp			\
 	$(srcdir)/ui/audio/TableFilter.cpp			\
-	$(srcdir)/ui/audio/TableFilterGenre.cpp			\
 	$(srcdir)/ui/audio/TrackView.cpp			\
 	$(srcdir)/ui/common/DirectoryValidator.cpp		\
 	$(srcdir)/ui/common/SessionData.cpp			\

src/cover/CoverArtGrabber.cpp

@@ -79,7 +79,7 @@ Grabber::getFromTrack(Database::Track::pointer track)
 {
 	std::vector<CoverArt> res;
 
-	if (!track)
+	if (!track || !track->hasCover())
 		return std::vector<CoverArt>();
 
 	try

src/database/AudioTypes.hpp

@@ -32,6 +32,25 @@
 
 namespace Database {
 
+// Find utilities
+struct SearchFilter
+{
+	enum class Field {
+		Artist,		// artist name
+		Release,	// release name
+		Genre,		// genre name
+		Track,		// track name
+	};
+
+	typedef std::map<Field, std::vector<std::string> > FieldValues;
+
+	// Formulas :
+	// ((like1-1 LIKE ? OR like1-2 LIKE = ? ...) AND (like2-1 LIKE ? OR like2-2 LIKE ? ...)) AND exact1 = ? AND exact2 = ? ...
+
+	std::vector<FieldValues> likeMatches;
+	FieldValues exactMatch;
+};
+
 class Track;
 
 class Genre
@@ -47,7 +66,9 @@ class Genre
 		// Find utility
 		static pointer getByName(Wt::Dbo::Session& session, const std::string& name);
 		static pointer getNone(Wt::Dbo::Session& session);
-		static Wt::Dbo::collection<pointer> getAll(Wt::Dbo::Session& session, std::size_t offset = -1, std::size_t size = -1);
+		static Wt::Dbo::collection<pointer> getAll(Wt::Dbo::Session& session, int offset = -1, int size = -1);
+		static Wt::Dbo::Query<boost::tuple<std::string, int> > getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter);
+		static void updateGenreQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames = std::vector<Wt::WString>());
 
 		// Create utility
 		static pointer create(Wt::Dbo::Session& session, const std::string& name);
@@ -81,25 +102,21 @@ class Track
 		Track() {}
 		Track(const boost::filesystem::path& p);
 
-		// Find utilities
+
+		// Find utility functions
 		static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p);
 		static pointer getById(Wt::Dbo::Session& session, id_type id);
 		static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session);
-		static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session,
-				const std::vector<std::string>& artists,	// OR filter if many
-				const std::vector<std::string>& releases,	// OR filter if many
-				const std::vector<std::string>& genres,		// OR filter if many
-				int offset = -1, int size = -1);
-
-		static std::vector<std::string> getReleases(Wt::Dbo::Session& session,
-				const std::vector<std::string>& artists,	// OR filter if many
-				const std::vector<std::string>& genres,		// OR filter if many
-				int offset = -1, int size = -1);
-
-		static std::vector<std::string> getArtists(Wt::Dbo::Session& session,
-				const std::vector<std::string>& genres,		// OR filter
-				int offset = -1, int size = -1);
+		// Used for remote
+		static Wt::Dbo::collection< pointer > getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
+		static std::vector<std::string> getReleases(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
+		static std::vector<std::string> getArtists(Wt::Dbo::Session& session, SearchFilter filter, int offset = -1, int size = -1);
 
+		// Utility fonctions
+		// MVC models for the user interface
+		static void updateTracksQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< pointer >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames = std::vector<Wt::WString>());
+		static void updateReleaseQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames = std::vector<Wt::WString>());
+		static void updateArtistQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames = std::vector<Wt::WString>());
 
 		// Create utility
 		static pointer	create(Wt::Dbo::Session& session, const boost::filesystem::path& p);
@@ -156,6 +173,10 @@ class Track
 
 	private:
 
+		static Wt::Dbo::Query< pointer > getAllQuery(Wt::Dbo::Session& session, SearchFilter filter);
+		static Wt::Dbo::Query<boost::tuple<std::string, int> > getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter);
+		static Wt::Dbo::Query<boost::tuple<std::string, int> > getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter);
+
 		static const std::size_t _maxNameLength = 128;
 
 		int					_trackNumber;
@@ -175,6 +196,7 @@ class Track
 		Wt::Dbo::collection< Genre::pointer > _genres;	// Tracks that belong to this genre
 };
 
+
 } // namespace database
 
 #endif

src/database/DatabaseHandler.cpp

@@ -98,6 +98,7 @@ _dbBackend( db.string() )
 	        _session.createTables();
 		_dbBackend.executeSql("CREATE INDEX artist_name_idx ON track(artist_name)");
 		_dbBackend.executeSql("CREATE INDEX release_name_idx ON track(release_name)");
+		_dbBackend.executeSql("CREATE INDEX genre_name_idx ON genre(name)");
 	}
 	catch(std::exception& e) {
 		LMS_LOG(MOD_DB, SEV_ERROR) << "Cannot create tables: " << e.what();

src/database/Genre.cpp

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Emeric Poupon
- *
- * This file is part of LMS.
- *
- * LMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "AudioTypes.hpp"
-
-namespace Database {
-
-Genre::Genre()
-{
-}
-
-Genre::Genre(const std::string& name)
-: _name( std::string(name, 0, _maxNameLength) )
-{
-}
-
-
-Genre::pointer
-Genre::getByName(Wt::Dbo::Session& session, const std::string& name)
-{
-	// TODO use like search
-	return session.find<Genre>().where("name = ?").bind( std::string(name, 0, _maxNameLength) );
-}
-
-Genre::pointer
-Genre::getNone(Wt::Dbo::Session& session)
-{
-	pointer res = getByName(session, "<None>");
-	if (!res)
-		res = create(session, "<None>");
-	return res;
-}
-
-bool
-Genre::isNone(void) const
-{
-	return (_name == "<None>");
-}
-
-Genre::pointer
-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, std::size_t offset, std::size_t size)
-{
-	return session.find<Genre>().offset(offset).limit(size);
-}
-
-} // namespace Database

src/database/SqlQuery.cpp

@@ -89,7 +89,7 @@ InnerJoinClause::And(const InnerJoinClause& clause)
 	if (!_clause.empty())
 		_clause += " ";
 
-	_clause += clause._clause;
+	_clause += "INNER JOIN " + clause._clause;
 
 	return *this;
 }

src/database/Track.cpp

@@ -19,12 +19,114 @@
 
 #include <boost/foreach.hpp>
 
+#include <Wt/Dbo/QueryModel>
+
+#include "logger/Logger.hpp"
+
 #include "SqlQuery.hpp"
 
 #include "AudioTypes.hpp"
 
 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),
@@ -34,6 +136,11 @@ _hasCover(false)
 {
 }
 
+Wt::Dbo::collection< Track::pointer >
+Track::getAll(Wt::Dbo::Session& session)
+{
+	return session.find<Track>();
+}
 
 void
 Track::setGenres(std::vector<Genre::pointer> genres)
@@ -65,12 +172,6 @@ Track::create(Wt::Dbo::Session& session, const boost::filesystem::path& p)
 	return session.add(new Track(p) );
 }
 
-Wt::Dbo::collection< Track::pointer >
-Track::getAll(Wt::Dbo::Session& session)
-{
-	return session.find<Track>();
-}
-
 std::vector< Genre::pointer >
 Track::getGenres(void) const
 {
@@ -79,89 +180,116 @@ Track::getGenres(void) const
 	return genres;
 }
 
-Wt::Dbo::collection< Track::pointer >
-Track::getAll(Wt::Dbo::Session& session,
-			const std::vector<std::string>& artists,
-			const std::vector<std::string>& releases,
-			const std::vector<std::string>& genres,
-			int offset, int size)
+Wt::Dbo::Query< Track::pointer >
+Track::getAllQuery(Wt::Dbo::Session& session, SearchFilter filter)
 {
-	std::string sqlQuery = "SELECT t FROM track t";
+	SqlQuery sqlQuery = generatePartialQuery(filter);
 
-	if (!genres.empty())
-	{
-		sqlQuery += " INNER JOIN genre g ON g.id = t_g.genre_id";
-		sqlQuery += " INNER JOIN track_genre t_g ON t_g.track_id = t.id AND t_g.genre_id = g.id";
-	}
+	Wt::Dbo::Query<pointer> query
+		= session.query<Track::pointer>( "SELECT t FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("t.id");
 
-	WhereClause where;
-
-	{
-		WhereClause artistWhere;
-
-		for (std::size_t i = 0; i < artists.size(); ++i)
-			artistWhere.Or( WhereClause("t.artist_name = ?") );
-
-		where.And(artistWhere);
-	}
-
-	{
-		WhereClause releaseWhere;
-
-		for (std::size_t i = 0; i < releases.size(); ++i)
-			releaseWhere.Or( WhereClause("t.release_name = ?") );
-
-		where.And(releaseWhere);
-	}
-
-	{
-		WhereClause genreWhere;
-
-		for (std::size_t i = 0; i < genres.size(); ++i)
-			genreWhere.Or( WhereClause("g.name = ?") );
-
-		where.And(genreWhere);
-	}
-
-
-	Wt::Dbo::Query<Track::pointer> query = session.query<Track::pointer>( sqlQuery + " " + where.get() ).offset(offset).limit(size);
-
-	BOOST_FOREACH(const std::string& artist, artists)
-		query.bind(artist);
-
-	BOOST_FOREACH(const std::string& release, releases)
-		query.bind(release);
-
-	BOOST_FOREACH(const std::string& genre, genres)
-		query.bind(genre);
-
-	query.groupBy("t");
+	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
+		query.bind(bindArg);
 
 	return query;
 }
 
-std::vector<std::string>
-Track::getArtists(Wt::Dbo::Session& session,
-		const std::vector<std::string>& genres,
-		int offset, int size)
+Wt::Dbo::collection< Track::pointer >
+Track::getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
 {
-	std::string sqlQuery = "SELECT t.artist_name FROM track t";
+	return getAllQuery(session, filter).limit(size).offset(offset);
+}
 
-	if (!genres.empty())
+Wt::Dbo::Query< boost::tuple<std::string, int> >
+Track::getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter)
+{
+	SqlQuery sqlQuery = generatePartialQuery(filter);
+
+	Wt::Dbo::Query<boost::tuple<std::string, int> > query
+		= session.query<boost::tuple<std::string, int> >("SELECT t.release_name, 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;
+}
+
+Wt::Dbo::Query< boost::tuple<std::string, int> >
+Track::getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter)
+{
+	SqlQuery sqlQuery = generatePartialQuery(filter);
+
+	Wt::Dbo::Query<boost::tuple<std::string, int> > query
+		= session.query<boost::tuple<std::string, int> >( "SELECT t.artist_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::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).orderBy("t.artist_name,t.date,t.release_name,t.disc_number,t.track_number");
+	model.setQuery(query, columnNames.empty() ? true : false);
+
+	// TODO do something better
+	if (columnNames.size() == 9)
 	{
-		sqlQuery += " INNER JOIN genre g ON g.id = t_g.genre_id";
-		sqlQuery += " INNER JOIN track_genre t_g ON t_g.track_id = t.id AND t_g.genre_id = g.id";
+		model.addColumn( "t.artist_name", columnNames[0] );
+		model.addColumn( "t.release_name", columnNames[1] );
+		model.addColumn( "t.disc_number", columnNames[2] );
+		model.addColumn( "t.track_number", columnNames[3] );
+		model.addColumn( "t.name", columnNames[4] );
+		model.addColumn( "t.duration", columnNames[5] );
+		model.addColumn( "t.date", columnNames[6] );
+		model.addColumn( "t.original_date", columnNames[7] );
+		model.addColumn( "t.genre_list", columnNames[8] );
 	}
 
-	WhereClause whereClause;
+}
 
-	for (std::size_t i = 0; i < genres.size(); ++i)
-		whereClause.Or( WhereClause("g.name = ?") );
+void
+Track::updateReleaseQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
+{
+	Wt::Dbo::Query<  boost::tuple<std::string, int> > query = getReleasesQuery(session, filter);
 
-	Wt::Dbo::Query<std::string> query = session.query<std::string>( sqlQuery + " " + whereClause.get() ).offset(offset).limit(size).groupBy("t.artist_name");
+	model.setQuery(query, columnNames.empty() ? true : false);
 
-	BOOST_FOREACH(const std::string& genre, genres)
-		query.bind(genre);
+	// TODO do something better
+	if (columnNames.size() == 2)
+	{
+		model.addColumn( "t.release_name", columnNames[0]);
+		model.addColumn( "COUNT(DISTINCT t.id)" );
+	}
+}
+
+void
+Track::updateArtistQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
+{
+	Wt::Dbo::Query<  boost::tuple<std::string, int> > query = getArtistsQuery(session, filter);
+
+	model.setQuery(query, columnNames.empty() ? true : false);
+
+	// TODO do something better
+	if (columnNames.size() == 2)
+	{
+		model.addColumn( "t.artist_name", columnNames[0]);
+		model.addColumn( "COUNT(DISTINCT t.id)" );
+	}
+}
+
+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);
@@ -171,46 +299,17 @@ Track::getArtists(Wt::Dbo::Session& session,
 		res.push_back((*it));
 
 	return res;
-
 }
 
 std::vector<std::string>
-Track::getReleases(Wt::Dbo::Session& session,
-		const std::vector<std::string>& artists,
-		const std::vector<std::string>& genres,
-		int offset, int size)
+Track::getReleases(Wt::Dbo::Session& session, SearchFilter filter, int offset, int size)
 {
+	SqlQuery sqlQuery = generatePartialQuery(filter);
 
-	std::string sqlQuery = "SELECT t.release_name FROM track t";
+	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");
 
-	if (!genres.empty())
-	{
-		sqlQuery += " INNER JOIN genre g ON g.id = t_g.genre_id";
-		sqlQuery += " INNER JOIN track_genre t_g ON t_g.track_id = t.id AND t_g.genre_id = g.id";
-	}
-
-	WhereClause whereClause;
-
-	{
-		WhereClause clause;
-
-		BOOST_FOREACH(const std::string& artist, artists)
-			clause.Or( WhereClause("t.artist_name = ?") ).bind(artist);
-
-		whereClause.And(clause);
-	}
-	{
-		WhereClause clause;
-
-		BOOST_FOREACH(const std::string& genre, genres)
-			clause.Or( WhereClause("g.name = ?") ).bind(genre);
-
-		whereClause.And(clause);
-	}
-
-	Wt::Dbo::Query<std::string> query = session.query<std::string>( sqlQuery + " " + whereClause.get() ).offset(offset).limit(size).groupBy("t.release_name");
-
-	BOOST_FOREACH(const std::string& bindArg, whereClause.getBindArgs())
+	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
 		query.bind(bindArg);
 
 	typedef Wt::Dbo::collection< std::string > ReleaseNames;
@@ -223,8 +322,77 @@ Track::getReleases(Wt::Dbo::Session& session,
 	return res;
 }
 
+Genre::Genre()
+{
+}
+
+Genre::Genre(const std::string& name)
+: _name( std::string(name, 0, _maxNameLength) )
+{
+}
+
+
+Genre::pointer
+Genre::getByName(Wt::Dbo::Session& session, const std::string& name)
+{
+	// TODO use like search
+	return session.find<Genre>().where("name = ?").bind( std::string(name, 0, _maxNameLength) );
+}
+
+Genre::pointer
+Genre::getNone(Wt::Dbo::Session& session)
+{
+	pointer res = getByName(session, "<None>");
+	if (!res)
+		res = create(session, "<None>");
+	return res;
+}
+
+bool
+Genre::isNone(void) const
+{
+	return (_name == "<None>");
+}
+
+Genre::pointer
+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)
+{
+	return session.find<Genre>().offset(offset).limit(size).orderBy("name");
+}
+
+Wt::Dbo::Query<boost::tuple<std::string, int> >
+Genre::getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter)
+{
+	SqlQuery sqlQuery = generatePartialQuery(filter, true);
+
+	Wt::Dbo::Query<boost::tuple<std::string, int> > query
+		= session.query<boost::tuple<std::string, int> >( "SELECT g.name, COUNT(DISTINCT t.id) FROM track t " + sqlQuery.innerJoin().get() + " " + sqlQuery.where().get()).groupBy("g.name").orderBy("g.name");
+
+	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
+		query.bind(bindArg);
+
+	return query;
+}
+
+void
+Genre::updateGenreQueryModel(Wt::Dbo::Session& session,  Wt::Dbo::QueryModel< boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
+{
+	Wt::Dbo::Query<  boost::tuple<std::string, int> > query = getAllQuery(session, filter);
+	model.setQuery(query, columnNames.empty() ? true : false);
+
+	// TODO do something better
+	if (columnNames.size() == 2)
+	{
+		model.addColumn( "g.name", columnNames[0] );
+		model.addColumn( "COUNT(DISTINCT t.id)", columnNames[1] );
+	}
+}
 
 } // namespace Database
 
-
-

src/remote/server/AudioCollectionRequestHandler.cpp

@@ -34,6 +34,8 @@
 namespace Remote {
 namespace Server {
 
+using namespace Database;
+
 AudioCollectionRequestHandler::AudioCollectionRequestHandler(Database::Handler& db)
 : _db(db)
 {}
@@ -163,24 +165,23 @@ AudioCollectionRequestHandler::processGetArtists(const AudioCollectionRequest::G
 		size = _maxListArtists;
 	size = std::min(size, _maxListArtists);
 
+	SearchFilter filter;
+
 	// Get filters
 	std::vector<std::string> genres;
 	for (int id = 0; id < request.genre_size(); ++id)
-		genres.push_back( request.genre(id) );
+		filter.exactMatch[SearchFilter::Field::Genre].push_back( request.genre(id) );
 
 	// Now fetch requested data...
 
 	Wt::Dbo::Transaction transaction( _db.getSession() );
 
 	std::vector<std::string> artists
-		= Database::Track::getArtists(_db.getSession(),
-						genres,
+		= Database::Track::getArtists(_db.getSession(), filter,
 						request.batch_parameter().offset(), static_cast<int>(size) );
 
 	BOOST_FOREACH(const std::string& artist, artists)
-	{
 		response.add_artists()->set_name( std::string( boost::locale::conv::to_utf<char>(artist, "UTF-8") ) );
-	}
 
 	return true;
 }
@@ -200,20 +201,20 @@ AudioCollectionRequestHandler::processGetReleases(const AudioCollectionRequest::
 		size = _maxListReleases;
 	size = std::min(size, _maxListReleases);
 
+	SearchFilter filter;
+
 	std::vector<std::string> artists;
 	for (int id = 0; id < request.artist_size(); ++id)
-		artists.push_back( request.artist(id) );
+		filter.exactMatch[SearchFilter::Field::Artist].push_back( request.artist(id) );
 
 	std::vector<std::string> genres;
 	for (int id = 0; id < request.genre_size(); ++id)
-		genres.push_back( request.genre(id) );
+		filter.exactMatch[SearchFilter::Field::Genre].push_back( request.genre(id) );
 
 	Wt::Dbo::Transaction transaction( _db.getSession() );
 
 	std::vector<std::string> releases
-		= Database::Track::getReleases( _db.getSession(),
-						artists,
-						genres,
+		= Database::Track::getReleases( _db.getSession(), filter,
 						request.batch_parameter().offset(), static_cast<int>(size));
 
 	BOOST_FOREACH(const std::string& release, releases)
@@ -240,25 +241,24 @@ AudioCollectionRequestHandler::processGetTracks(const AudioCollectionRequest::Ge
 	size = std::min(size, _maxListTracks);
 
 	// Get filters
+	SearchFilter filter;
+
 	std::vector<std::string> artists;
 	for (int id = 0; id < request.artist_size(); ++id)
-		artists.push_back( request.artist(id) );
+		filter.exactMatch[SearchFilter::Field::Artist].push_back( request.artist(id) );
 
 	std::vector<std::string> releases;
 	for (int id = 0; id < request.release_size(); ++id)
-		releases.push_back( request.release(id) );
+		filter.exactMatch[SearchFilter::Field::Release].push_back( request.release(id) );
 
 	std::vector<std::string> genres;
 	for (int id = 0; id < request.genre_size(); ++id)
-		genres.push_back( request.genre(id) );
+		filter.exactMatch[SearchFilter::Field::Genre].push_back( request.genre(id) );
 
 	Wt::Dbo::Transaction transaction( _db.getSession() );
 
 	Wt::Dbo::collection<Database::Track::pointer> tracks
-		= Database::Track::getAll( _db.getSession(),
-				artists,
-				releases,
-				genres,
+		= Database::Track::getAll( _db.getSession(), filter,
 				request.batch_parameter().offset(), static_cast<int>(size));
 
 	typedef Wt::Dbo::collection< Database::Track::pointer > Tracks;
@@ -305,11 +305,11 @@ AudioCollectionRequestHandler::processGetCoverArt(const AudioCollectionRequest::
 		case AudioCollectionRequest::GetCoverArt::TypeGetCoverArtRelease:
 			if (request.has_release())
 			{
-				Wt::Dbo::collection<Database::Track::pointer> tracks = Database::Track::getAll(_db.getSession(),
-						std::vector<std::string>(), // artist
-						std::vector<std::string>(1, request.release()), // release
-						std::vector<std::string>(), // genre
-							-1, 1);
+				SearchFilter filter;
+				filter.exactMatch[SearchFilter::Field::Release].push_back(request.release());
+
+				Wt::Dbo::collection<Database::Track::pointer> tracks
+					= Database::Track::getAll(_db.getSession(), filter, -1, 1 /* limit reuslt size */);
 
 				Wt::Dbo::collection<Database::Track::pointer>::iterator it = tracks.begin();
 

src/ui/audio/Audio.cpp

@@ -29,7 +29,6 @@
 #include "logger/Logger.hpp"
 
 #include "TableFilter.hpp"
-#include "TableFilterGenre.hpp"
 #include "KeywordSearchFilter.hpp"
 
 #include "Audio.hpp"
@@ -49,15 +48,15 @@ _playQueue(nullptr)
 	// Filters
 	Wt::WHBoxLayout *filterLayout = new Wt::WHBoxLayout();
 
-	TableFilterGenre *filterGenre = new TableFilterGenre(_db);
+	TableFilter *filterGenre = new TableFilter(_db, Database::SearchFilter::Field::Genre, { "Genre", "Tracks"} );
 	filterLayout->addWidget(filterGenre);
 	_filterChain.addFilter(filterGenre);
 
-	TableFilter *filterArtist = new TableFilter(_db, "track", "artist_name", "Artist");
+	TableFilter *filterArtist = new TableFilter(_db, Database::SearchFilter::Field::Artist, {"Artist", "Tracks"} );
 	filterLayout->addWidget(filterArtist);
 	_filterChain.addFilter(filterArtist);
 
-	TableFilter *filterRelease = new TableFilter(_db, "track", "release_name", "Release");
+	TableFilter *filterRelease = new TableFilter(_db, Database::SearchFilter::Field::Release, {"Release", "Tracks"});
 	filterLayout->addWidget(filterRelease);
 	_filterChain.addFilter(filterRelease);
 
@@ -95,6 +94,7 @@ _playQueue(nullptr)
 		Database::User::pointer user = _db.getCurrentUser();
 
 		Wt::WVBoxLayout* playQueueLayout = new Wt::WVBoxLayout();
+		playQueueLayout->setContentsMargins(5,5,5,5);
 
 		_mediaPlayer = new AudioMediaPlayer();
 		playQueueLayout->addWidget(_mediaPlayer);

src/ui/audio/Filter.hpp

@@ -22,7 +22,7 @@
 
 #include <Wt/WSignal>
 
-#include "database/SqlQuery.hpp"
+#include "database/AudioTypes.hpp"
 
 namespace UserInterface {
 
@@ -31,17 +31,20 @@ class Filter
 	public:
 
 		struct Constraint {
-			WhereClause	where;		// WHERE SQL clause
+			std::vector<std::string>	search;
+
+			typedef std::map<std::string,    std::vector<std::string> > ColumnValues;
+			ColumnValues	columnValues;
 		};
 
 		Filter() {}
 		virtual ~Filter() {}
 
 		// Refresh filter using constraints created by parent filters
-		virtual void refresh(const Constraint& constraint) = 0;
+		virtual void refresh(Database::SearchFilter& filter) = 0;
 
 		// Update constraints for next filters
-		virtual void getConstraint(Constraint& constraint) = 0;
+		virtual void getConstraint(Database::SearchFilter& filter) = 0;
 
 		// Emitted when a constraint has changed
 		Wt::Signal<void>& update() { return _update; };

src/ui/audio/FilterChain.cpp

@@ -50,7 +50,7 @@ FilterChain::updateFilters(std::size_t startIdx)
 
 	_refreshingFilters = true;
 
-	Filter::Constraint currentConstraint;
+	Database::SearchFilter searchFilter;
 
 	for (std::size_t idFilter = 0; idFilter < _filters.size(); ++idFilter)
 	{
@@ -58,12 +58,12 @@ FilterChain::updateFilters(std::size_t startIdx)
 
 		// Apply contraints created by previous filters
 		if (idFilter > startIdx) {
-			filter->refresh(currentConstraint);
+			filter->refresh(searchFilter);
 		}
 
 		// Get constraints generated by this filter
 		// (Note: adding accross successive calls)
-		filter->getConstraint(currentConstraint);
+		filter->getConstraint(searchFilter);
 	}
 
 	_refreshingFilters = false;

src/ui/audio/KeywordSearchFilter.cpp

@@ -17,6 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+
 #include "KeywordSearchFilter.hpp"
 
 namespace UserInterface {
@@ -34,15 +38,26 @@ KeywordSearchFilter::setText(const std::string& text)
 
 // Get constraints created by this filter
 void
-KeywordSearchFilter::getConstraint(Constraint& constraint)
+KeywordSearchFilter::getConstraint(Database::SearchFilter& filter)
 {
 	// No active search means no constaint!
 	if (!_lastEmittedText.empty()) {
-		const std::string bindText ("%%" + _lastEmittedText + "%%");
-		constraint.where.And( WhereClause("(track.name like ? or track.release_name like ? or track.artist_name like ? or track.genre_list like ?)").bind(bindText).bind(bindText).bind(bindText).bind(bindText));
-	}
+		std::vector<std::string> values;
+		boost::algorithm::split(values, _lastEmittedText, boost::is_any_of(" "), boost::token_compress_on);
 
-	// else no constraint!
+		// For each part, do a global search on all searchable fields
+		BOOST_FOREACH(std::string value, values)
+		{
+			Database::SearchFilter::FieldValues likeMatch;
+
+			likeMatch[Database::SearchFilter::Field::Artist].push_back(value);
+			likeMatch[Database::SearchFilter::Field::Release].push_back(value);
+			likeMatch[Database::SearchFilter::Field::Genre].push_back(value);
+			likeMatch[Database::SearchFilter::Field::Track].push_back(value);
+
+			filter.likeMatches.push_back(likeMatch);
+		}
+	}
 }
 
 } // namespace UserInterface

src/ui/audio/KeywordSearchFilter.hpp

@@ -34,10 +34,10 @@ class KeywordSearchFilter : public Filter
 		void setText(const std::string& text);
 
 		// Set constraint on this filter
-		void refresh(const Constraint& constraint) {}
+		void refresh(Database::SearchFilter& filter) {}
 
 		// Get constraints created by this filter
-		void getConstraint(Constraint& constraint);
+		void getConstraint(Database::SearchFilter& filter);
 
 	private:
 

src/ui/audio/TableFilter.cpp

@@ -19,25 +19,41 @@
 
 #include <boost/foreach.hpp>
 
+#include "database/AudioTypes.hpp"
+
 #include "logger/Logger.hpp"
 
 #include "TableFilter.hpp"
 
 namespace UserInterface {
 
-TableFilter::TableFilter(Database::Handler& db, std::string table, std::string field, const Wt::WString& displayName, Wt::WContainerWidget* parent)
+using namespace Database;
+
+TableFilter::TableFilter(Database::Handler& db, Database::SearchFilter::Field field, std::vector<Wt::WString> columnNames, Wt::WContainerWidget* parent)
 : Wt::WTableView( parent ),
 Filter(),
 _db(db),
-_table(table),
 _field(field)
 {
-	_queryModel.setQuery( _db.getSession().query< ResultType >("select track." + _field + ", COUNT(DISTINCT track.id) from track GROUP BY track." + _field).orderBy("track." + _field));
-	_queryModel.addColumn( "track." + _field, displayName);
-	_queryModel.addColumn( "COUNT(DISTINCT track.id)", "Tracks");
+	SearchFilter filter;
+
+	switch (field)
+	{
+		case Database::SearchFilter::Field::Artist:
+			Track::updateArtistQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+			break;
+		case Database::SearchFilter::Field::Release:
+			Track::updateReleaseQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+			break;
+		case Database::SearchFilter::Field::Genre:
+			Genre::updateGenreQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+			break;
+		default:
+			break;
+	}
 
 	this->setSelectionMode(Wt::ExtendedSelection);
-	this->setSortingEnabled(false);
+	this->setSortingEnabled(true);
 	this->setAlternatingRowColors(true);
 	this->setModel(&_queryModel);
 
@@ -68,53 +84,37 @@ _field(field)
 void
 TableFilter::layoutSizeChanged (int width, int height)
 {
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "LAYOUT CHANGED, new width = " << width;
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "Before: sizes = " << this->columnWidth(0).toPixels() << ", " << this->columnWidth(1).toPixels();
-
 	std::size_t trackColumnSize = this->columnWidth(1).toPixels();
 	// Set the remaining size for the name column
 	this->setColumnWidth(0, width - trackColumnSize - (7 * 2) - 2);
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "After: sizes = " << this->columnWidth(0).toPixels() << ", " << this->columnWidth(1).toPixels();
 }
 
 // Set constraints on this filter
 void
-TableFilter::refresh(const Constraint& constraint)
+TableFilter::refresh(SearchFilter& filter)
 {
-	SqlQuery sqlQuery;
-
-	sqlQuery.select("track." + _field + ", COUNT(DISTINCT track.id)");
-	sqlQuery.from().And( FromClause("track")) ;
-	sqlQuery.where().And(constraint.where);	// Add constraint made by other filters
-	sqlQuery.groupBy().And( "track." + _field);	// Add constraint made by other filters
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << _table << ", generated query = '" << sqlQuery.get() << "'";
-
-	Wt::Dbo::Query<ResultType> query = _db.getSession().query<ResultType>( sqlQuery.get() );
-
-	query.orderBy(_table + "." + _field);
-
-	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs()) {
-		LMS_LOG(MOD_UI, SEV_DEBUG) << "Binding value '" << bindArg << "'";
-		query.bind(bindArg);
+	switch (_field)
+	{
+		case Database::SearchFilter::Field::Artist:
+			Track::updateArtistQueryModel(_db.getSession(), _queryModel, filter);
+			break;
+		case Database::SearchFilter::Field::Release:
+			Track::updateReleaseQueryModel(_db.getSession(), _queryModel, filter);
+			break;
+		case Database::SearchFilter::Field::Genre:
+			Genre::updateGenreQueryModel(_db.getSession(), _queryModel, filter);
+			break;
+		default:
+			break;
 	}
-
-	_queryModel.setQuery( query, true );
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "Finish !";
 }
 
 // Get constraint created by this filter
 void
-TableFilter::getConstraint(Constraint& constraint)
+TableFilter::getConstraint(SearchFilter& filter)
 {
 	Wt::WModelIndexSet indexSet = this->selectedIndexes();
 
-	// WHERE statement
-	WhereClause clause;
-
 	BOOST_FOREACH(Wt::WModelIndex index, indexSet) {
 
 		if (!index.isValid())
@@ -122,14 +122,10 @@ TableFilter::getConstraint(Constraint& constraint)
 
 		const ResultType& result = _queryModel.resultRow( index.row() );
 
-		// Get the track part
-		std::string	name(result.get<0>());
+		std::string     name = result.get<0>();
 
-		clause.Or(_table + "." + _field + " = ?").bind(name);
+		filter.exactMatch[_field].push_back(name);
 	}
-
-	// Adding our WHERE clause
-	constraint.where.And( clause );
 }
 
 } // namespace UserInterface

src/ui/audio/TableFilter.hpp

@@ -33,13 +33,13 @@ class TableFilter : public Wt::WTableView, public Filter
 {
 
 	public:
-		TableFilter(Database::Handler& db, std::string table, std::string field, const Wt::WString& displayName, Wt::WContainerWidget* parent = 0);
+		TableFilter(Database::Handler& db, Database::SearchFilter::Field field, std::vector<Wt::WString> displayName, Wt::WContainerWidget* parent = 0);
 
 		// Set constraints on this filter
-		void refresh(const Constraint& constraint);
+		void refresh(Database::SearchFilter& filter);
 
 		// Get constraints created by this filter
-		void getConstraint(Constraint& constraint);
+		void getConstraint(Database::SearchFilter& filter);
 
 		void layoutSizeChanged (int width, int height);
 
@@ -52,10 +52,9 @@ class TableFilter : public Wt::WTableView, public Filter
 		SigDoubleClicked			_sigDoubleClicked;
 
 		Database::Handler&			_db;
-		const std::string			_table;
-		const std::string			_field;
+		Database::SearchFilter::Field		_field;
 
-		// Name, track count, special value that means 'all' if set to 1
+		// Name, track count
 		typedef boost::tuple<std::string, int>  ResultType;
 		Wt::Dbo::QueryModel< ResultType >	_queryModel;
 

src/ui/audio/TableFilterGenre.cpp

@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2013 Emeric Poupon
- *
- * This file is part of LMS.
- *
- * LMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <boost/foreach.hpp>
-
-#include "logger/Logger.hpp"
-
-#include "TableFilterGenre.hpp"
-
-namespace UserInterface {
-
-TableFilterGenre::TableFilterGenre(Database::Handler& db, Wt::WContainerWidget* parent)
-: Wt::WTableView( parent ),
-Filter(),
-_db(db)
-{
-	_queryModel.setQuery( _db.getSession().query< ResultType >("select genre.name, COUNT(DISTINCT track.id) from genre INNER JOIN track_genre ON track_genre.genre_id = genre.id INNER JOIN track ON track.id = track_genre.track_id").orderBy("genre.name").groupBy("genre.name").orderBy("genre.name"));
-	_queryModel.addColumn("genre.name", "Genre");
-	_queryModel.addColumn("COUNT(DISTINCT track.id)", "tracks");
-
-	this->setSelectionMode(Wt::ExtendedSelection);
-	this->setSortingEnabled(false);
-	this->setAlternatingRowColors(true);
-	this->setModel(&_queryModel);
-
-	this->selectionChanged().connect(this, &TableFilterGenre::emitUpdate);
-
-	setLayoutSizeAware(true);
-
-	_queryModel.setBatchSize(100);
-
-	// If an item is double clicked, select and emit signal
-	this->doubleClicked().connect( std::bind([=] (Wt::WModelIndex idx, Wt::WMouseEvent evt)
-	{
-		if (!idx.isValid())
-			return;
-
-		Wt::WModelIndexSet indexSet;
-		indexSet.insert(idx);
-
-		this->setSelectedIndexes( indexSet );
-		_sigDoubleClicked.emit( );
-	}, std::placeholders::_1, std::placeholders::_2));
-
-}
-
-void
-TableFilterGenre::layoutSizeChanged (int width, int height)
-{
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "LAYOUT CHANGED!";
-
-	/* TODO
-	std::size_t trackColumnSize = this->columnWidth(1).toPixels() + 30 ;
-	// Set the remaining size for the name column
-	this->setColumnWidth(0, width - 7 - trackColumnSize);
-	*/
-
-}
-
-// Set constraints on this filter
-void
-TableFilterGenre::refresh(const Constraint& constraint)
-{
-	SqlQuery sqlQuery;
-
-	sqlQuery.select("genre.name, COUNT(DISTINCT track.id)");
-	sqlQuery.from().And( std::string("genre INNER JOIN track_genre ON track_genre.genre_id = genre.id INNER JOIN track ON track.id = track_genre.track_id") );
-	sqlQuery.where().And(constraint.where);	// Add constraint made by other filters
-	sqlQuery.groupBy().And( std::string("genre.name") );
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "genre, generated query = '" << sqlQuery.get() << "'";
-
-	Wt::Dbo::Query<ResultType> query = _db.getSession().query<ResultType>( sqlQuery.get() );
-
-	query.orderBy("genre.name");
-
-	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs()) {
-		LMS_LOG(MOD_UI, SEV_DEBUG) << "Binding value '" << bindArg << "'";
-		query.bind(bindArg);
-	}
-
-	_queryModel.setQuery( query, true );
-
-}
-
-// Get constraint created by this filter
-void
-TableFilterGenre::getConstraint(Constraint& constraint)
-{
-	Wt::WModelIndexSet indexSet = this->selectedIndexes();
-
-	// WHERE statement
-	WhereClause clause;
-
-	BOOST_FOREACH(Wt::WModelIndex index, indexSet) {
-
-		if (!index.isValid())
-			continue;
-
-		const ResultType& result = _queryModel.resultRow( index.row() );
-
-		// Get the track part
-		std::string	name(result.get<0>());
-
-		if (name == "<None>")
-			clause.Or( std::string("track.genre_list = ?") ).bind("");
-		else
-			clause.Or( std::string("track.genre_list LIKE ?") ).bind("%%" + name + "%%");
-	}
-
-	// Adding our WHERE clause
-	constraint.where.And( clause );
-
-}
-
-} // namespace UserInterface
-

src/ui/audio/TableFilterGenre.hpp

@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2013 Emeric Poupon
- *
- * This file is part of LMS.
- *
- * LMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * LMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TABLE_FILTER_GENRE_HPP
-#define TABLE_FILTER_GENRE_HPP
-
-
-#include <Wt/Dbo/QueryModel>
-#include <Wt/WTableView>
-
-#include "Filter.hpp"
-#include "database/DatabaseHandler.hpp"
-
-namespace UserInterface {
-
-class TableFilterGenre : public Wt::WTableView, public Filter
-{
-
-	public:
-		TableFilterGenre(Database::Handler& db, Wt::WContainerWidget* parent = 0);
-
-		// Set constraints on this filter
-		void refresh(const Constraint& constraint);
-
-		// Get constraints created by this filter
-		void getConstraint(Constraint& constraint);
-
-		void layoutSizeChanged (int width, int height);
-
-		typedef Wt::Signal<void> SigDoubleClicked;
-
-		SigDoubleClicked&	sigDoubleClicked() { return _sigDoubleClicked; }
-
-	protected:
-
-		SigDoubleClicked			_sigDoubleClicked;
-
-		Database::Handler&			_db;
-
-		// genre_name, count
-		typedef boost::tuple<std::string, int>  ResultType;
-		Wt::Dbo::QueryModel< ResultType >	_queryModel;
-
-};
-
-} // namespace UserInterface
-
-#endif
-

src/ui/audio/TrackView.cpp

@@ -33,18 +33,25 @@ TrackView::TrackView( Database::Handler& db, Wt::WContainerWidget* parent)
 : Wt::WTableView( parent ),
 _db(db)
 {
-	_queryModel.setQuery(_db.getSession().query<ResultType>("select track from track").orderBy("track.artist_name,track.date,track.release_name,track.disc_number,track.track_number"));
-	_queryModel.addColumn( "track.artist_name", "Artist" );
-	_queryModel.addColumn( "track.release_name", "Album" );
-	_queryModel.addColumn( "track.disc_number", "Disc #" );
-	_queryModel.addColumn( "track.track_number", "Track #" );
-	_queryModel.addColumn( "track.name", "Track" );
-	_queryModel.addColumn( "track.duration", "Duration" );
-	_queryModel.addColumn( "track.date", "Date" );
-	_queryModel.addColumn( "track.original_date", "Original Date" );
-	_queryModel.addColumn( "track.genre_list", "Genres" );
 
-	_queryModel.setBatchSize(500);
+	static const std::vector<Wt::WString> columnNames =
+	{
+		"Artist",
+		"Album",
+		"Disc #",
+		"Track #",
+		"Track",
+		"Duration",
+		"Date",
+		"Original Date",
+		"Genres",
+	};
+
+	Database::SearchFilter filter;
+
+	Database::Track::updateTracksQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+
+	_queryModel.setBatchSize(300);
 
 	this->setSortingEnabled(true);
 	this->setSelectionMode(Wt::ExtendedSelection);
@@ -60,7 +67,6 @@ _db(db)
 	this->setColumnWidth(6, 70);	// Date
 	this->setColumnWidth(7, 70);	// Original Date
 	this->setColumnWidth(8, 180);	// Genres
-
 //	this->setOverflow(Wt::WContainerWidget::OverflowScroll, Wt::Vertical);
 
 	// Duration display
@@ -102,28 +108,9 @@ _db(db)
 
 // Set constraints created by parent filters
 void
-TrackView::refresh(const Constraint& constraint)
+TrackView::refresh(Database::SearchFilter& filter)
 {
-
-	SqlQuery sqlQuery;
-
-	sqlQuery.select( "track" );
-	sqlQuery.from().And( FromClause("track"));
-	sqlQuery.where().And(constraint.where);
-
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "TRACK REQ = '" << sqlQuery.get() << "'";
-
-	Wt::Dbo::Query<ResultType> query = _db.getSession().query<ResultType>( sqlQuery.get() );
-
-	query.groupBy("track").orderBy("track.artist_name,track.date,track.release_name,track.disc_number,track.track_number");
-
-	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs()) {
-		LMS_LOG(MOD_UI, SEV_DEBUG) << "Binding value '" << bindArg << "'";
-		query.bind(bindArg);
-	}
-
-	_queryModel.setQuery( query, true );
-
+	Database::Track::updateTracksQueryModel(_db.getSession(), _queryModel, filter);
 }
 
 void
@@ -138,10 +125,7 @@ TrackView::getSelectedTracks(std::vector<Database::Track::id_type>& track_ids)
 		if (!index.isValid())
 			continue;
 
-		const ResultType& result = _queryModel.resultRow( index.row() );
-
-		// Get the track part
-		Wt::Dbo::ptr<Database::Track> track ( result.get<0>() );
+		Database::Track::pointer track = _queryModel.resultRow( index.row() );
 
 		track_ids.push_back(track.id());
 	}
@@ -177,10 +161,7 @@ TrackView::getTracks(std::vector<Database::Track::id_type>& trackIds)
 
 	for (int i = 0; i < _queryModel.rowCount(); ++i)
 	{
-		const ResultType& result = _queryModel.resultRow( i );
-
-		// Get the track part
-		Wt::Dbo::ptr<Database::Track> track ( result.get<0>() );
+		Database::Track::pointer track = _queryModel.resultRow(i);
 
 		trackIds.push_back(track.id());
 	}

src/ui/audio/TrackView.hpp

@@ -38,10 +38,10 @@ class TrackView : public Wt::WTableView, public Filter
 
 		// Filter interface
 		// Set constraints created by parent filters
-		void refresh(const Constraint& constraint);
+		void refresh(Database::SearchFilter& filter);
 
 		// Create constraints for child filters (N/A)
-		void getConstraint(Constraint& constraint) {}
+		void getConstraint(Database::SearchFilter& filter) {}
 
 		// Get all the tracks that are currently selected
 		void getSelectedTracks(std::vector<Database::Track::id_type>& trackIds);
@@ -64,7 +64,7 @@ class TrackView : public Wt::WTableView, public Filter
 
 		Database::Handler&			_db;
 
-		typedef boost::tuple<Database::Track::pointer>  ResultType;
+		typedef Database::Track::pointer  ResultType;
 		Wt::Dbo::QueryModel< ResultType >	_queryModel;
 		Wt::WTableView*				_tableView;