Merge branch 'develop'

TODO

@@ -19,6 +19,7 @@
 - count scan import errors
 
 [Metadata]
+- OGG metadata -> properly handle metadata nested in the audio stream
 
 [Transcode]
 - some early end of playback spotted on flac files
@@ -41,20 +42,16 @@
 	- Style eveything nicely...
 	- MediaPlayer: move slider using js (http://redmine.webtoolkit.eu/boards/2/topics/7924?r=8478)
 	- TrackView : handle duration > 1 hour
-	- Filter by Genre: use id and not a "like" string search (selecting "Pop" currently shows "JPop" songs)
+	- TrackView : Reselect the current selected item when displaying the updated search results
-	- OGG metadata -> properly handle metadata nested in the audio stream
+	- Add Year column in the release filter. Add covers too?
-	- Filters: use directly the id as constraint, instead of the name?
+	- Save/Load playlists
-	- Implement a playlist:
-		- Drag and drop all objets from the views (genre, artist, release, track) in the playlist?
-		- Add 'play/add last' button on mouse hover?
-		- Save/Load playlists?
 
 	[Video]
-	- View the Videos in a WtTableView ?
+	- implement a decent mediaplayer
-	- Use Groups/SubGroups to organize videos (WTreeView?)
+	- remove codec choice from parameters
 
 	[Layout]
-	- Make it mobile browser compatible
+	- Make a dedicated audio layout in mobile environment (keep the same layout for videos)
 	- Style eveything nicely...
 	- Handle internal path
 

src/Makefile.am

@@ -47,6 +47,7 @@ lms_SOURCES = \
 	$(srcdir)/ui/audio/TableFilter.cpp			\
 	$(srcdir)/ui/audio/TrackView.cpp			\
 	$(srcdir)/ui/common/DirectoryValidator.cpp		\
+	$(srcdir)/ui/common/LineEdit.cpp			\
 	$(srcdir)/ui/common/SessionData.cpp			\
 	$(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp	\
 	$(srcdir)/ui/resource/CoverResource.cpp			\

src/database-updater/DatabaseUpdater.cpp

@@ -296,9 +296,9 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 			return;
 		}
 		if (items.find(MetaData::Type::Duration) == items.end()
-		|| boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]).total_seconds() == 0)
+		|| boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]).total_seconds() <= 0)
 		{
-			LMS_LOG(MOD_DBUPDATER, SEV_DEBUG) << "Skipped '" << file << "' (no duration or duration 0)";
+			LMS_LOG(MOD_DBUPDATER, SEV_DEBUG) << "Skipped '" << file << "' (no duration or duration <= 0)";
 
 			// If Track exists here, delete it!
 			if (track) {
@@ -361,6 +361,7 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 
 		track.modify()->setLastWriteTime(lastWriteTime);
 		track.modify()->setName(title);
+		track.modify()->setDuration( boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]) );
 
 		{
 			std::string trackGenreList;
@@ -387,9 +388,6 @@ Updater::processAudioFile( const boost::filesystem::path& file, Stats& stats)
 		if (items.find(MetaData::Type::DiscNumber) != items.end())
 			track.modify()->setDiscNumber( boost::any_cast<std::size_t>(items[MetaData::Type::DiscNumber]) );
 
-		if (items.find(MetaData::Type::Duration) != items.end())
-			track.modify()->setDuration( boost::any_cast<boost::posix_time::time_duration>(items[MetaData::Type::Duration]) );
-
 		if (items.find(MetaData::Type::Date) != items.end())
 			track.modify()->setDate( boost::any_cast<boost::posix_time::ptime>(items[MetaData::Type::Date]) );
 

src/database/AudioTypes.hpp

@@ -67,8 +67,9 @@ class Genre
 		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, int offset = -1, int size = -1);
-		static Wt::Dbo::Query<boost::tuple<std::string, int> > getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter);
+		typedef boost::tuple<std::string, int> GenreResult;
-		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>());
+		static Wt::Dbo::Query<GenreResult> getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter);
+		static void updateGenreQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<GenreResult>& 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);
@@ -115,8 +116,12 @@ class Track
 		// 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>());
+		// Release name, year, track counts
-		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>());
+		typedef boost::tuple<std::string, boost::posix_time::ptime, int> ReleaseResult;
+		static void updateReleaseQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<ReleaseResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames = std::vector<Wt::WString>());
+		// Artist name, albums, tracks
+		typedef boost::tuple<std::string, int, int> ArtistResult;
+		static void updateArtistQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<ArtistResult>& 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);
@@ -174,8 +179,8 @@ 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<ReleaseResult> getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter);
-		static Wt::Dbo::Query<boost::tuple<std::string, int> > getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter);
+		static Wt::Dbo::Query<ArtistResult> getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter);
 
 		static const std::size_t _maxNameLength = 128;
 

src/database/Track.cpp

@@ -200,13 +200,13 @@ Track::getAll(Wt::Dbo::Session& session, SearchFilter filter, int offset, int si
 	return getAllQuery(session, filter).limit(size).offset(offset);
 }
 
-Wt::Dbo::Query< boost::tuple<std::string, int> >
+Wt::Dbo::Query<Track::ReleaseResult>
 Track::getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter)
 {
 	SqlQuery sqlQuery = generatePartialQuery(filter);
 
-	Wt::Dbo::Query<boost::tuple<std::string, int> > query
+	Wt::Dbo::Query<ReleaseResult> 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");
+		= 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);
@@ -214,13 +214,29 @@ Track::getReleasesQuery(Wt::Dbo::Session& session, SearchFilter filter)
 	return query;
 }
 
-Wt::Dbo::Query< boost::tuple<std::string, int> >
+void
+Track::updateReleaseQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel<ReleaseResult>& 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<boost::tuple<std::string, int> > query
+	Wt::Dbo::Query<ArtistResult> 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");
+		= 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);
@@ -228,6 +244,23 @@ Track::getArtistsQuery(Wt::Dbo::Session& session, SearchFilter filter)
 	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)
 {
@@ -250,36 +283,6 @@ Track::updateTracksQueryModel(Wt::Dbo::Session& session, Wt::Dbo::QueryModel< po
 
 }
 
-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);
-
-	model.setQuery(query, columnNames.empty() ? true : false);
-
-	// 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)
 {
@@ -366,13 +369,13 @@ 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> >
+Wt::Dbo::Query<Genre::GenreResult>
 Genre::getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter)
 {
 	SqlQuery sqlQuery = generatePartialQuery(filter, true);
 
-	Wt::Dbo::Query<boost::tuple<std::string, int> > query
+	Wt::Dbo::Query<Genre::GenreResult> 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");
+		= 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");
 
 	BOOST_FOREACH(const std::string& bindArg, sqlQuery.where().getBindArgs())
 		query.bind(bindArg);
@@ -381,9 +384,9 @@ Genre::getAllQuery(Wt::Dbo::Session& session, SearchFilter& filter)
 }
 
 void
-Genre::updateGenreQueryModel(Wt::Dbo::Session& session,  Wt::Dbo::QueryModel< boost::tuple<std::string, int> >& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
+Genre::updateGenreQueryModel(Wt::Dbo::Session& session,  Wt::Dbo::QueryModel<Genre::GenreResult>& model, SearchFilter filter, const std::vector<Wt::WString>& columnNames)
 {
-	Wt::Dbo::Query<  boost::tuple<std::string, int> > query = getAllQuery(session, filter);
+	Wt::Dbo::Query<Genre::GenreResult> query = getAllQuery(session, filter);
 	model.setQuery(query, columnNames.empty() ? true : false);
 
 	// TODO do something better

src/ui/LmsApplication.cpp

@@ -30,16 +30,15 @@
 #include <Wt/WLineEdit>
 #include <Wt/Auth/Identity>
 
-#include "settings/Settings.hpp"
-
-#include "auth/LmsAuth.hpp"
-
 #include "logger/Logger.hpp"
 
+#include "settings/Settings.hpp"
 #include "settings/SettingsFirstConnectionFormView.hpp"
 
+#include "auth/LmsAuth.hpp"
 #include "audio/Audio.hpp"
 #include "video/VideoWidget.hpp"
+#include "common/LineEdit.hpp"
 
 #include "LmsApplication.hpp"
 
@@ -133,6 +132,8 @@ LmsApplication::handleAuthEvent(void)
 
 		LMS_LOG(MOD_UI, SEV_NOTICE) << "User '" << user.identity(Wt::Auth::Identity::LoginName) << "' logged in";
 
+		this->root()->setOverflow(Wt::WContainerWidget::OverflowHidden);
+
 		// Create a Vertical layout: top is the nav bar, bottom is the contents
 		Wt::WVBoxLayout *layout = new Wt::WVBoxLayout(this->root());
 		// Create a navigation bar with a link to a web page.
@@ -143,6 +144,8 @@ LmsApplication::handleAuthEvent(void)
 
 		Wt::WStackedWidget *contentsStack = new Wt::WStackedWidget();
 
+		contentsStack->setOverflow(Wt::WContainerWidget::OverflowAuto);
+
 		// Setup a Left-aligned menu.
 		Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack);
 		navigation->addMenu(leftMenu);
@@ -173,10 +176,10 @@ LmsApplication::handleAuthEvent(void)
 		}, std::placeholders::_1));
 
 		// Add a Search control.
-		Wt::WLineEdit *searchEdit = new Wt::WLineEdit();
+		LineEdit *searchEdit = new LineEdit(500);
 		searchEdit->setEmptyText("Search...");
 
-		searchEdit->enterPressed().connect(std::bind([=] ()
+		searchEdit->timedChanged().connect(std::bind([=] ()
 		{
 			// TODO: check which view is activated and search into it
 			audio->search(searchEdit->text().toUTF8());

src/ui/audio/Audio.cpp

@@ -44,19 +44,20 @@ _playQueue(nullptr)
 {
 	Wt::WGridLayout *mainLayout = new Wt::WGridLayout();
 	this->setLayout(mainLayout);
+	mainLayout->setContentsMargins(9,4,9,9);
 
 	// Filters
 	Wt::WHBoxLayout *filterLayout = new Wt::WHBoxLayout();
 
-	TableFilter *filterGenre = new TableFilter(_db, Database::SearchFilter::Field::Genre, { "Genre", "Tracks"} );
+	TableFilterGenre *filterGenre = new TableFilterGenre(_db);
 	filterLayout->addWidget(filterGenre);
 	_filterChain.addFilter(filterGenre);
 
-	TableFilter *filterArtist = new TableFilter(_db, Database::SearchFilter::Field::Artist, {"Artist", "Tracks"} );
+	TableFilterArtist *filterArtist = new TableFilterArtist(_db);
 	filterLayout->addWidget(filterArtist);
 	_filterChain.addFilter(filterArtist);
 
-	TableFilter *filterRelease = new TableFilter(_db, Database::SearchFilter::Field::Release, {"Release", "Tracks"});
+	TableFilterRelease *filterRelease = new TableFilterRelease(_db);
 	filterLayout->addWidget(filterRelease);
 	_filterChain.addFilter(filterRelease);
 
@@ -122,14 +123,16 @@ _playQueue(nullptr)
 		downBtn->setStyleClass("btn-sm");
 		playlistControls->addWidget(downBtn);
 		Wt::WPushButton *delBtn = new Wt::WPushButton("DEL");
-		delBtn->setStyleClass("btn-sm");
+		delBtn->setStyleClass("btn-sm btn-warning");
 		playlistControls->addWidget(delBtn);
+		Wt::WPushButton *clearBtn = new Wt::WPushButton("CLR");
+		clearBtn->setStyleClass("btn-sm btn-danger");
+		playlistControls->addWidget(clearBtn);
 
 		delBtn->clicked().connect(_playQueue, &PlayQueue::delSelected);
 		upBtn->clicked().connect(_playQueue, &PlayQueue::moveSelectedUp);
 		downBtn->clicked().connect(_playQueue, &PlayQueue::moveSelectedDown);
-
+		clearBtn->clicked().connect(_playQueue, &PlayQueue::delAll);
-		playlistControls->addWidget(new Wt::WText("Duration:"), 1);
 
 		// Load menu
 		{
@@ -159,7 +162,7 @@ _playQueue(nullptr)
 	}
 
 	mainLayout->setRowStretch(1, 1);
-	mainLayout->setRowResizable(0, true, Wt::WLength(200, Wt::WLength::Pixel));
+	mainLayout->setRowResizable(0, true, Wt::WLength(250, Wt::WLength::Pixel));
 	mainLayout->setColumnResizable(0, true, Wt::WLength(400, Wt::WLength::Pixel));
 
 	// Double click on track

src/ui/audio/PlayQueue.cpp

@@ -502,7 +502,13 @@ PlayQueue::delSelected(void)
 	_trackSelector->setSize(_model->rowCount());
 
 	renumber(minId, _model->rowCount() - 1);
+}
 
+void
+PlayQueue::delAll(void)
+{
+	_model->removeRows(0, _model->rowCount());
+	_trackSelector->setSize(0);
 }
 
 void

src/ui/audio/PlayQueue.hpp

@@ -53,6 +53,7 @@ class PlayQueue : public Wt::WTableView
 
 		// List manipulations
 		void delSelected(void);
+		void delAll(void);
 		void moveSelectedUp(void);
 		void moveSelectedDown(void);
 

src/ui/audio/TableFilter.cpp

@@ -19,6 +19,8 @@
 
 #include <boost/foreach.hpp>
 
+#include <Wt/WItemDelegate>
+
 #include "database/AudioTypes.hpp"
 
 #include "logger/Logger.hpp"
@@ -29,37 +31,24 @@ namespace UserInterface {
 
 using namespace Database;
 
-TableFilter::TableFilter(Database::Handler& db, Database::SearchFilter::Field field, std::vector<Wt::WString> columnNames, Wt::WContainerWidget* parent)
+TableFilterGenre::TableFilterGenre(Database::Handler& db, Wt::WContainerWidget* parent)
-: Wt::WTableView( parent ),
+: Wt::WTableView( parent ), Filter(),
-Filter(),
+_db(db)
-_db(db),
-_field(field)
 {
+	const std::vector<Wt::WString> columnNames = {"Genre", "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(true);
 	this->setAlternatingRowColors(true);
 	this->setModel(&_queryModel);
 
-	this->setColumnWidth(1, 50);
+	this->setColumnWidth(1, 80);
 
-	this->selectionChanged().connect(this, &TableFilter::emitUpdate);
+	this->selectionChanged().connect(this, &TableFilterGenre::emitUpdate);
 
 	setLayoutSizeAware(true);
 
@@ -82,7 +71,7 @@ _field(field)
 }
 
 void
-TableFilter::layoutSizeChanged (int width, int height)
+TableFilterGenre::layoutSizeChanged (int width, int height)
 {
 	std::size_t trackColumnSize = this->columnWidth(1).toPixels();
 	// Set the remaining size for the name column
@@ -91,27 +80,14 @@ TableFilter::layoutSizeChanged (int width, int height)
 
 // Set constraints on this filter
 void
-TableFilter::refresh(SearchFilter& filter)
+TableFilterGenre::refresh(SearchFilter& filter)
 {
-	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;
-	}
 }
 
 // Get constraint created by this filter
 void
-TableFilter::getConstraint(SearchFilter& filter)
+TableFilterGenre::getConstraint(SearchFilter& filter)
 {
 	Wt::WModelIndexSet indexSet = this->selectedIndexes();
 
@@ -120,11 +96,160 @@ TableFilter::getConstraint(SearchFilter& filter)
 		if (!index.isValid())
 			continue;
 
-		const ResultType& result = _queryModel.resultRow( index.row() );
+		std::string name = _queryModel.resultRow( index.row() ).get<0>();
 
-		std::string     name = result.get<0>();
+		filter.exactMatch[Database::SearchFilter::Field::Genre].push_back(name);
+	}
+}
 
-		filter.exactMatch[_field].push_back(name);
+TableFilterArtist::TableFilterArtist(Database::Handler& db, Wt::WContainerWidget* parent)
+: Wt::WTableView( parent ), Filter(),
+_db(db)
+{
+	const std::vector<Wt::WString> columnNames = {"Artist", "Releases", "Tracks"};
+
+	SearchFilter filter;
+
+	Track::updateArtistQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+
+	this->setSelectionMode(Wt::ExtendedSelection);
+	this->setSortingEnabled(true);
+	this->setAlternatingRowColors(true);
+	this->setModel(&_queryModel);
+
+	this->setColumnWidth(1, 80);
+	this->setColumnWidth(2, 80);
+
+	this->selectionChanged().connect(this, &TableFilterArtist::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
+TableFilterArtist::layoutSizeChanged (int width, int height)
+{
+	std::size_t otherColumnsSize = this->columnWidth(1).toPixels() + this->columnWidth(2).toPixels();
+	// Set the remaining size for the name column
+	this->setColumnWidth(0, width - otherColumnsSize - (7 * 3) - 2);
+}
+
+// Set constraints on this filter
+void
+TableFilterArtist::refresh(SearchFilter& filter)
+{
+	Track::updateArtistQueryModel(_db.getSession(), _queryModel, filter);
+}
+
+// Get constraint created by this filter
+void
+TableFilterArtist::getConstraint(SearchFilter& filter)
+{
+	Wt::WModelIndexSet indexSet = this->selectedIndexes();
+
+	BOOST_FOREACH(Wt::WModelIndex index, indexSet) {
+
+		if (!index.isValid())
+			continue;
+
+		std::string name = _queryModel.resultRow( index.row() ).get<0>();
+
+		filter.exactMatch[Database::SearchFilter::Field::Artist].push_back(name);
+	}
+}
+
+TableFilterRelease::TableFilterRelease(Database::Handler& db, Wt::WContainerWidget* parent)
+: Wt::WTableView( parent ), Filter(),
+_db(db)
+{
+	const std::vector<Wt::WString> columnNames = {"Release", "Date", "Tracks"};
+
+	SearchFilter filter;
+
+	Track::updateReleaseQueryModel(_db.getSession(), _queryModel, filter, columnNames);
+
+	this->setSelectionMode(Wt::ExtendedSelection);
+	this->setSortingEnabled(true);
+	this->setAlternatingRowColors(true);
+	this->setModel(&_queryModel);
+
+	this->setColumnWidth(1, 60);
+	this->setColumnWidth(2, 80);
+
+	// Date display, just the year
+	{
+		Wt::WItemDelegate *delegate = new Wt::WItemDelegate(this);
+		delegate->setTextFormat("yyyy");
+		this->setItemDelegateForColumn(1, delegate);
+	}
+
+	this->selectionChanged().connect(this, &TableFilterRelease::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
+TableFilterRelease::layoutSizeChanged (int width, int height)
+{
+	std::size_t otherColumnSizes = this->columnWidth(1).toPixels() + this->columnWidth(2).toPixels();
+	// Set the remaining size for the name column
+	this->setColumnWidth(0, width - otherColumnSizes - (7 * 3) - 2);
+}
+
+// Set constraints on this filter
+void
+TableFilterRelease::refresh(SearchFilter& filter)
+{
+	Track::updateReleaseQueryModel(_db.getSession(), _queryModel, filter);
+}
+
+// Get constraint created by this filter
+void
+TableFilterRelease::getConstraint(SearchFilter& filter)
+{
+	Wt::WModelIndexSet indexSet = this->selectedIndexes();
+
+	BOOST_FOREACH(Wt::WModelIndex index, indexSet) {
+
+		if (!index.isValid())
+			continue;
+
+		std::string name = _queryModel.resultRow( index.row() ).get<0>();
+
+		filter.exactMatch[Database::SearchFilter::Field::Release].push_back(name);
 	}
 }
 

src/ui/audio/TableFilter.hpp

@@ -29,11 +29,10 @@
 
 namespace UserInterface {
 
-class TableFilter : public Wt::WTableView, public Filter
+class TableFilterGenre : public Wt::WTableView, public Filter
 {
-
 	public:
-		TableFilter(Database::Handler& db, Database::SearchFilter::Field field, std::vector<Wt::WString> displayName, Wt::WContainerWidget* parent = 0);
+		TableFilterGenre(Database::Handler& db, Wt::WContainerWidget* parent = 0);
 
 		// Set constraints on this filter
 		void refresh(Database::SearchFilter& filter);
@@ -52,14 +51,66 @@ class TableFilter : public Wt::WTableView, public Filter
 		SigDoubleClicked			_sigDoubleClicked;
 
 		Database::Handler&			_db;
-		Database::SearchFilter::Field		_field;
 
 		// Name, track count
-		typedef boost::tuple<std::string, int>  ResultType;
+		Wt::Dbo::QueryModel<Database::Genre::GenreResult>	_queryModel;
-		Wt::Dbo::QueryModel< ResultType >	_queryModel;
-
 };
 
+class TableFilterArtist : public Wt::WTableView, public Filter
+{
+	public:
+		TableFilterArtist(Database::Handler& db, Wt::WContainerWidget* parent = 0);
+
+		// Set constraints on this filter
+		void refresh(Database::SearchFilter& filter);
+
+		// Get constraints created by this filter
+		void getConstraint(Database::SearchFilter& filter);
+
+		void layoutSizeChanged (int width, int height);
+
+		typedef Wt::Signal<void> SigDoubleClicked;
+
+		SigDoubleClicked&	sigDoubleClicked() { return _sigDoubleClicked; }
+
+	protected:
+
+		SigDoubleClicked			_sigDoubleClicked;
+
+		Database::Handler&			_db;
+
+		// Name, track count
+		Wt::Dbo::QueryModel<Database::Track::ArtistResult>	_queryModel;
+};
+
+class TableFilterRelease : public Wt::WTableView, public Filter
+{
+	public:
+		TableFilterRelease(Database::Handler& db, Wt::WContainerWidget* parent = 0);
+
+		// Set constraints on this filter
+		void refresh(Database::SearchFilter& filter);
+
+		// Get constraints created by this filter
+		void getConstraint(Database::SearchFilter& filter);
+
+		void layoutSizeChanged (int width, int height);
+
+		typedef Wt::Signal<void> SigDoubleClicked;
+
+		SigDoubleClicked&	sigDoubleClicked() { return _sigDoubleClicked; }
+
+	protected:
+
+		SigDoubleClicked			_sigDoubleClicked;
+
+		Database::Handler&			_db;
+
+		// Name, track count
+		Wt::Dbo::QueryModel<Database::Track::ReleaseResult>	_queryModel;
+};
+
+
 } // namespace UserInterface
 
 #endif

src/ui/common/LineEdit.cpp

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 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 <Wt/WTimer>
+
+#include "LineEdit.hpp"
+
+namespace UserInterface {
+
+
+LineEdit::LineEdit(std::size_t ms, Wt::WContainerWidget* parent)
+: Wt::WLineEdit(parent)
+{
+
+	Wt::WTimer *timer = new Wt::WTimer(this);
+	timer->setSingleShot(true);
+	timer->setInterval(ms);
+
+	this->keyWentUp().connect(std::bind([=] (Wt::WKeyEvent keyEvent)
+	{
+		if (timer->isActive())
+			timer->stop();
+
+		if (keyEvent.key() == Wt::Key_Enter)
+			_sigTimedChanged.emit(this->text());
+		else
+			timer->start();
+	}, std::placeholders::_1));
+
+	timer->timeout().connect(std::bind([=] ()
+	{
+		_sigTimedChanged.emit(this->text());
+	}));
+}
+
+
+} // namespace UserInterface
+
+

src/ui/common/LineEdit.hpp

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2015 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 UI_LINE_EDIT_HPP
+#define UI_LINE_EDIT_HPP
+
+#include <Wt/WLineEdit>
+#include <Wt/WContainerWidget>
+#include <Wt/WSignal>
+
+namespace UserInterface {
+
+class LineEdit : public Wt::WLineEdit
+{
+	public:
+		LineEdit(std::size_t ms, Wt::WContainerWidget* parent = 0);
+
+		Wt::Signal<Wt::WString>&	timedChanged() { return _sigTimedChanged; }
+
+	private:
+
+		Wt::Signal<Wt::WString>		_sigTimedChanged;
+};
+
+} // namespace UserInterface
+
+#endif
+

src/ui/docroot/css/lms.css

@@ -20,15 +20,19 @@ div.contents {
 }
 
 .playqueue-playing {
-	background-color: rgba(202, 167, 66, 1);
+	background-color: #4A42CA;
 }
 
 .Wt-tableview .playqueue-playing {
 	color: #FFF;
 }
 
+.Wt-tableview div.playqueue-playing {
+	background-color: #4A42CA;
+}
+
 .Wt-tableview .Wt-tv-contents.Wt-striped div.playqueue-playing:nth-child(odd) {
-	background-color: rgba(202, 167, 66, 1);
+	background-color: #4A42CA;
 }
 
 .playqueue-track {