[UI/Mobile] Added a dedicated track result view

approot/templates.xml

@@ -478,6 +478,19 @@
    </div>
 </message>
 
+<message id="wa-track-wrapper">
+	${title}
+	<div class="menu-category list-group ">
+		${track-container}
+	</div>
+	${show-more}
+</message>
+
+<message id="wa-track">
+	<div class="menu-item list-group-item ">${track-name}<span class="badge">${btn}</span></div>
+</message>
+
+
 <!-- Track container
 
 	Track bar title

src/Makefile.am

@@ -35,6 +35,7 @@ lms_SOURCES = \
 	$(srcdir)/ui/audio/mobile/MobileAudio.cpp		\
 	$(srcdir)/ui/audio/mobile/MobileAudioMediaPlayer.cpp	\
 	$(srcdir)/ui/audio/mobile/ReleaseSearch.cpp		\
+	$(srcdir)/ui/audio/mobile/TrackReleaseView.cpp		\
 	$(srcdir)/ui/audio/mobile/TrackSearch.cpp		\
 	$(srcdir)/ui/common/DirectoryValidator.cpp		\
 	$(srcdir)/ui/common/LineEdit.cpp			\

src/ui/audio/mobile/MobileAudio.cpp

@@ -32,6 +32,8 @@
 #include "ArtistSearch.hpp"
 #include "ReleaseSearch.hpp"
 #include "TrackSearch.hpp"
+
+#include "TrackReleaseView.hpp"
 #include "MobileAudioMediaPlayer.hpp"
 
 #include "MobileAudio.hpp"
@@ -43,6 +45,38 @@ namespace Mobile {
 
 using namespace Database;
 
+static void playTrack(AudioMediaPlayer *mediaPlayer, Database::Track::id_type trackId)
+{
+	LMS_LOG(UI, DEBUG) << "Playing track id " << trackId;
+	// TODO reduce transaction scope here
+	Wt::Dbo::Transaction transaction(DboSession());
+
+	Track::pointer track = Track::getById(DboSession(), trackId);
+
+	if (track)
+	{
+		Av::TranscodeParameters parameters;
+
+		// Determine the output format using the encoding of the player
+		Av::Encoding encoding;
+		switch(mediaPlayer->getEncoding())
+		{
+			case Wt::WMediaPlayer::MP3: encoding = Av::Encoding::MP3; break;
+			case Wt::WMediaPlayer::FLA: encoding = Av::Encoding::FLA; break;
+			case Wt::WMediaPlayer::OGA: encoding = Av::Encoding::OGA; break;
+			case Wt::WMediaPlayer::WEBMA: encoding = Av::Encoding::WEBMA; break;
+			default:
+						      encoding = Av::Encoding::MP3;
+		}
+		parameters.setEncoding(encoding);
+
+		// TODO compute parameters using user's profile
+		parameters.setBitrate(Av::Stream::Type::Audio, 96000);
+
+		mediaPlayer->play(track.id(), parameters);
+	}
+}
+
 Audio::Audio(Wt::WContainerWidget *parent)
 : UserInterface::Audio(parent)
 {
@@ -63,6 +97,9 @@ Audio::Audio(Wt::WContainerWidget *parent)
 	ReleaseSearch* releaseSearch = new ReleaseSearch(this);
 	TrackSearch* trackSearch = new TrackSearch(this);
 
+	TrackReleaseView* trackReleaseView  = new TrackReleaseView(this);
+	trackReleaseView->hide();
+
 	Wt::WTemplate* footer = new Wt::WTemplate(this);
 	footer->setTemplateText(Wt::WString::tr("mobile-audio-footer"));
 
@@ -102,7 +139,7 @@ Audio::Audio(Wt::WContainerWidget *parent)
 		artistSearch->show();
 		releaseSearch->show();
 		trackSearch->show();
-
+		trackReleaseView->hide();
 	}));
 
 	artistSearch->moreArtistsSelected().connect(std::bind([=]
@@ -110,6 +147,7 @@ Audio::Audio(Wt::WContainerWidget *parent)
 		releaseSearch->hide();
 		trackSearch->hide();
 		artistSearch->show();
+		trackReleaseView->hide();
 	}));
 
 	artistSearch->artistSelected().connect(std::bind([=] (Artist::id_type artistId)
@@ -117,6 +155,7 @@ Audio::Audio(Wt::WContainerWidget *parent)
 		artistSearch->hide();
 		trackSearch->hide();
 		releaseSearch->show();
+		trackReleaseView->hide();
 
 		releaseSearch->search(SearchFilter::ById(SearchFilter::Field::Artist, artistId), 20);
 	}, std::placeholders::_1));
@@ -126,54 +165,36 @@ Audio::Audio(Wt::WContainerWidget *parent)
 		artistSearch->hide();
 		trackSearch->hide();
 		releaseSearch->show();
+		trackReleaseView->hide();
 	}));
 
 	releaseSearch->releaseSelected().connect(std::bind([=] (Release::id_type releaseId)
 	{
 		artistSearch->hide();
 		releaseSearch->hide();
-		trackSearch->show();
+		trackSearch->hide();
+		trackReleaseView->show();
 
-		trackSearch->search(SearchFilter::ById(SearchFilter::Field::Release, releaseId), 20);
+		trackReleaseView->search(SearchFilter::ById(SearchFilter::Field::Release, releaseId), 40);
 	}, std::placeholders::_1));
 
-	trackSearch->moreTracksSelected().connect(std::bind([=]
+	trackSearch->moreSelected().connect(std::bind([=]
 	{
 		artistSearch->hide();
 		releaseSearch->hide();
+		trackSearch->show();
+		trackReleaseView->hide();
 	}));
 
 	trackSearch->trackPlay().connect(std::bind([=] (Track::id_type id)
 	{
-		LMS_LOG(UI, DEBUG) << "Playing track id " << id;
+		playTrack(mediaPlayer, id);
-		// TODO reduce transaction scope here
+	}, std::placeholders::_1));
-		Wt::Dbo::Transaction transaction(DboSession());
 
-		Track::pointer track = Track::getById(DboSession(), id);
+	trackReleaseView->trackPlay().connect(std::bind([=] (Track::id_type id)
-
+	{
-		if (track)
+		playTrack(mediaPlayer, id);
-		{
+	}, std::placeholders::_1));
-			Av::TranscodeParameters parameters;
-
-			// Determine the output format using the encoding of the player
-			Av::Encoding encoding;
-			switch(mediaPlayer->getEncoding())
-			{
-			case Wt::WMediaPlayer::MP3: encoding = Av::Encoding::MP3; break;
-			case Wt::WMediaPlayer::FLA: encoding = Av::Encoding::FLA; break;
-			case Wt::WMediaPlayer::OGA: encoding = Av::Encoding::OGA; break;
-			case Wt::WMediaPlayer::WEBMA: encoding = Av::Encoding::WEBMA; break;
-				default:
-					encoding = Av::Encoding::MP3;
-			}
-			parameters.setEncoding(encoding);
-
-			// TODO compute parameters using user's profile
-			parameters.setBitrate(Av::Stream::Type::Audio, 96000);
-
-			mediaPlayer->play(track.id(), parameters);
-		}
-	} , std::placeholders::_1));
 
 	// Initially, populate the widgets using an empty search
 	{

src/ui/audio/mobile/ReleaseSearch.hpp

@@ -20,8 +20,6 @@
 #ifndef UI_MOBILE_RELEASE_SEARCH_HPP
 #define UI_MOBILE_RELEASE_SEARCH_HPP
 
-#include <boost/algorithm/string/split.hpp>
-
 #include <Wt/WContainerWidget>
 #include <Wt/WSignal>
 

src/ui/audio/mobile/TrackReleaseView.cpp

@@ -0,0 +1,198 @@
+/*
+ * 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/WText>
+#include <Wt/WImage>
+#include <Wt/WPushButton>
+#include <Wt/WTemplate>
+
+#include "logger/Logger.hpp"
+#include "utils/Utils.hpp"
+#include "LmsApplication.hpp"
+
+#include "TrackReleaseView.hpp"
+
+namespace UserInterface {
+namespace Mobile {
+
+using namespace Database;
+
+TrackReleaseView::TrackReleaseView(Wt::WContainerWidget *parent)
+: Wt::WContainerWidget(parent)
+{
+	Wt::WTemplate* wrapper = new Wt::WTemplate(this);
+	wrapper->setTemplateText(Wt::WString::tr("wa-trackview-wrapper"));
+
+	Wt::WTemplate* title = new Wt::WTemplate(this);
+	wrapper->bindWidget("title", title);
+
+	title->setTemplateText(Wt::WString::tr("mobile-search-title"));
+	title->bindString("text", "Releases", Wt::PlainText);
+
+	_releaseContainer = new Wt::WContainerWidget();
+	wrapper->bindWidget("release-container", _releaseContainer);
+
+	_showMore = new Wt::WTemplate();
+	wrapper->bindWidget("show-more", _showMore);
+
+	_showMore->setTemplateText(Wt::WString::tr("mobile-search-more"));
+	_showMore->bindString("text", "Tap to show more results...");
+	_showMore->hide();
+	_showMore->clicked().connect(std::bind([=] {
+		_sigMoreTracksSelected();
+		addResults(20);
+	}));
+}
+
+void
+TrackReleaseView::clear()
+{
+	// Flush the release container
+	_releaseContainer->clear();
+
+	// Flush the current context
+	_currentTrackContainer = nullptr;
+	_nbTracks = 0;
+	_showMore->hide();
+}
+
+void
+TrackReleaseView::search(SearchFilter filter, size_t nb)
+{
+	_filter = filter;
+
+	clear();
+	addResults(nb);
+}
+
+static
+std::vector<Track::pointer >
+getTracks(SearchFilter filter, size_t offset, size_t nb, bool &moreResults)
+{
+	std::vector<Track::pointer > tracks = Track::getByFilter(DboSession(), filter, offset, nb + 1);
+
+	if (tracks.size() == nb + 1)
+	{
+		moreResults = true;
+		tracks.pop_back();
+	}
+	else
+		moreResults = false;
+
+	return tracks;
+}
+
+static Wt::WString
+getArtistNameFromRelease(Release::pointer release)
+{
+	auto artists = Artist::getByFilter(DboSession(),
+			SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2);
+
+	if (artists.size() > 1)
+		return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
+	else
+		return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
+}
+
+void
+TrackReleaseView::addResults(size_t nb)
+{
+	Wt::Dbo::Transaction transaction(DboSession());
+
+	bool moreResults;
+	std::vector<Track::pointer > tracks = getTracks(_filter, _nbTracks, nb, moreResults);
+
+	for (Track::pointer track : tracks)
+	{
+		// First check if we need to create a new track container
+
+		// New container if it is the first one or if the release has changed
+		if (!_currentTrackContainer
+			|| _currentReleaseId != track->getRelease().id())
+		{
+			Release::pointer release = track->getRelease();
+
+			Wt::WTemplate *releaseContainer = new Wt::WTemplate(_releaseContainer);
+			releaseContainer->setTemplateText(Wt::WString::tr("wa-trackview-release-container"));
+			_currentReleaseId = release.id();
+
+			Wt::WImage *cover = new Wt::WImage();
+			cover->setStyleClass ("center-block img-responsive"); // TODO move to CSS?
+			cover->setImageLink(Wt::WLink (LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 512)));
+
+			releaseContainer->bindWidget("cover", cover);
+			releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText);
+			releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
+			int year = release->getReleaseYear();
+			if (year > 0)
+			{
+				releaseContainer->setCondition("if-has-year", true);
+				releaseContainer->bindInt("year", year);
+
+				int originalYear = release->getReleaseYear(true);
+				if (originalYear > 0 && originalYear != year)
+				{
+					releaseContainer->setCondition("if-has-orig-year", true);
+					releaseContainer->bindInt("orig-year", originalYear);
+				}
+			}
+
+			_currentTrackContainer = new Wt::WContainerWidget();
+			releaseContainer->bindWidget("track-container", _currentTrackContainer);
+		}
+
+		assert(_currentTrackContainer != nullptr);
+
+		Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer);
+		trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track"));
+
+		if (track->getTrackNumber() > 0 && !track->getRelease()->isNone())
+		{
+			trackRes->setCondition("if-has-track-num", true);
+	 		trackRes->bindInt("track-num", track->getTrackNumber());
+
+			if (track->getDiscNumber() > 0 && track->getTotalDiscNumber() > 1)
+			{	trackRes->setCondition("if-has-disc-num", true);
+				trackRes->bindInt("disc-num", track->getDiscNumber());
+			}
+		}
+ 		trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
+		// TODO, display artist name for compilation releases?
+
+		// TODO handle large duration (> 1 hour)
+		trackRes->bindString("time", durationToString(track->getDuration(), "%M:%S"), Wt::PlainText);
+
+		Wt::WText *playBtn = new Wt::WText("Play", Wt::PlainText);
+		playBtn->setStyleClass("center-block"); // TODO move to CSS?
+		playBtn->clicked().connect(std::bind([=] {
+			_sigTrackPlay.emit(track.id());
+		}));
+
+		trackRes->bindWidget("btn", playBtn);
+		_nbTracks++;
+	}
+
+	if (moreResults)
+		_showMore->show();
+	else
+		_showMore->hide();
+}
+
+} // namespace Mobile
+} // namespace UserInterface

src/ui/audio/mobile/TrackReleaseView.hpp

@@ -0,0 +1,67 @@
+/*
+ * 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_MOBILE_TRACK_SEARCH_HPP
+#define UI_MOBILE_TRACK_SEARCH_HPP
+
+#include <Wt/WContainerWidget>
+#include <Wt/WSignal>
+
+#include "resource/CoverResource.hpp"
+
+namespace UserInterface {
+namespace Mobile {
+
+class TrackReleaseView : public Wt::WContainerWidget
+{
+	public:
+
+		TrackReleaseView(Wt::WContainerWidget *parent = 0);
+
+		void search(Database::SearchFilter filter, size_t nb);
+
+		// Slots
+		Wt::Signal<Database::Track::id_type>&	trackPlay() { return _sigTrackPlay;}
+		Wt::Signal<void>&		moreTracksSelected() { return _sigMoreTracksSelected;}
+
+	private:
+
+		Wt::Signal<Database::Track::id_type> _sigTrackPlay;
+		Wt::Signal<void>	_sigMoreTracksSelected;
+
+		void clear(void);
+		void addResults(size_t nb);
+
+		Wt::WTemplate*	_showMore;
+
+		Database::SearchFilter _filter;
+		std::size_t	_nbTracks;
+
+		// Main container that holds the releases
+		Wt::WContainerWidget* _releaseContainer;
+
+		// Used to add more results on the fly
+		Database::Release::id_type	_currentReleaseId;
+		Wt::WContainerWidget*		_currentTrackContainer;
+};
+
+} // namespace Mobile
+} // namespace UserInterface
+
+#endif

src/ui/audio/mobile/TrackSearch.cpp

@@ -37,16 +37,16 @@ TrackSearch::TrackSearch(Wt::WContainerWidget *parent)
 : Wt::WContainerWidget(parent)
 {
 	Wt::WTemplate* wrapper = new Wt::WTemplate(this);
-	wrapper->setTemplateText(Wt::WString::tr("wa-trackview-wrapper"));
+	wrapper->setTemplateText(Wt::WString::tr("wa-track-wrapper"));
 
 	Wt::WTemplate* title = new Wt::WTemplate(this);
 	wrapper->bindWidget("title", title);
 
 	title->setTemplateText(Wt::WString::tr("mobile-search-title"));
-	title->bindString("text", "Releases", Wt::PlainText);
+	title->bindString("text", "Tracks", Wt::PlainText);
 
-	_releaseContainer = new Wt::WContainerWidget();
+	_container = new Wt::WContainerWidget();
-	wrapper->bindWidget("release-container", _releaseContainer);
+	wrapper->bindWidget("track-container", _container);
 
 	_showMore = new Wt::WTemplate();
 	wrapper->bindWidget("show-more", _showMore);
@@ -55,7 +55,7 @@ TrackSearch::TrackSearch(Wt::WContainerWidget *parent)
 	_showMore->bindString("text", "Tap to show more results...");
 	_showMore->hide();
 	_showMore->clicked().connect(std::bind([=] {
-		_sigMoreTracksSelected();
+		_sigMoreSelected();
 		addResults(20);
 	}));
 }
@@ -64,10 +64,8 @@ void
 TrackSearch::clear()
 {
 	// Flush the release container
-	_releaseContainer->clear();
+	_container->clear();
 
-	// Flush the current context
-	_currentTrackContainer = nullptr;
 	_nbTracks = 0;
 	_showMore->hide();
 }
@@ -98,18 +96,6 @@ getTracks(SearchFilter filter, size_t offset, size_t nb, bool &moreResults)
 	return tracks;
 }
 
-static Wt::WString
-getArtistNameFromRelease(Release::pointer release)
-{
-	auto artists = Artist::getByFilter(DboSession(),
-			SearchFilter::ById(SearchFilter::Field::Release, release.id()), -1, 2);
-
-	if (artists.size() > 1)
-		return Wt::WString::fromUTF8("Various artists", Wt::PlainText);
-	else
-		return Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText);
-}
-
 void
 TrackSearch::addResults(size_t nb)
 {
@@ -120,64 +106,12 @@ TrackSearch::addResults(size_t nb)
 
 	for (Track::pointer track : tracks)
 	{
-		// First check if we need to create a new track container
+		Wt::WTemplate* trackRes = new Wt::WTemplate(_container);
+		trackRes->setTemplateText(Wt::WString::tr("wa-track"));
 
-		// New container if it is the first one or if the released has changed
-		if (!_currentTrackContainer
-			|| _currentReleaseId != track->getRelease().id())
-		{
-			Release::pointer release = track->getRelease();
-
-			Wt::WTemplate *releaseContainer = new Wt::WTemplate(_releaseContainer);
-			releaseContainer->setTemplateText(Wt::WString::tr("wa-trackview-release-container"));
-			_currentReleaseId = release.id();
-
-			Wt::WImage *cover = new Wt::WImage();
-			cover->setStyleClass ("center-block img-responsive"); // TODO move to CSS?
-			cover->setImageLink(Wt::WLink (LmsApplication::instance()->getCoverResource()->getReleaseUrl(release.id(), 512)));
-
-			releaseContainer->bindWidget("cover", cover);
-			releaseContainer->bindString("artist-name", getArtistNameFromRelease(release), Wt::PlainText);
-			releaseContainer->bindString("release-name", release->getName(), Wt::PlainText);
-			int year = release->getReleaseYear();
-			if (year > 0)
-			{
-				releaseContainer->setCondition("if-has-year", true);
-				releaseContainer->bindInt("year", year);
-
-				int originalYear = release->getReleaseYear(true);
-				if (originalYear > 0 && originalYear != year)
-				{
-					releaseContainer->setCondition("if-has-orig-year", true);
-					releaseContainer->bindInt("orig-year", originalYear);
-				}
-			}
-
-			_currentTrackContainer = new Wt::WContainerWidget();
-			releaseContainer->bindWidget("track-container", _currentTrackContainer);
-		}
-
-		assert(_currentTrackContainer != nullptr);
-
-		Wt::WTemplate* trackRes = new Wt::WTemplate(_currentTrackContainer);
-		trackRes->setTemplateText(Wt::WString::tr("wa-trackview-track"));
-
-		if (track->getTrackNumber() > 0 && !track->getRelease()->isNone())
-		{
-			trackRes->setCondition("if-has-track-num", true);
-	 		trackRes->bindInt("track-num", track->getTrackNumber());
-
-			if (track->getDiscNumber() > 0 && track->getTotalDiscNumber() > 1)
-			{	trackRes->setCondition("if-has-disc-num", true);
-				trackRes->bindInt("disc-num", track->getDiscNumber());
-			}
-		}
  		trackRes->bindString("track-name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
 		// TODO, display artist name for compilation releases?
 
-		// TODO handle large duration (> 1 hour)
-		trackRes->bindString("time", durationToString(track->getDuration(), "%M:%S"), Wt::PlainText);
-
 		Wt::WText *playBtn = new Wt::WText("Play", Wt::PlainText);
 		playBtn->setStyleClass("center-block"); // TODO move to CSS?
 		playBtn->clicked().connect(std::bind([=] {

src/ui/audio/mobile/TrackSearch.hpp

@@ -17,16 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef UI_MOBILE_TRACK_SEARCH_HPP
+#pragma once
-#define UI_MOBILE_TRACK_SEARCH_HPP
-
-#include <boost/algorithm/string/split.hpp>
 
 #include <Wt/WContainerWidget>
 #include <Wt/WSignal>
 
-#include "resource/CoverResource.hpp"
-
 namespace UserInterface {
 namespace Mobile {
 
@@ -40,30 +35,23 @@ class TrackSearch : public Wt::WContainerWidget
 
 		// Slots
 		Wt::Signal<Database::Track::id_type>&	trackPlay() { return _sigTrackPlay;}
-		Wt::Signal<void>&		moreTracksSelected() { return _sigMoreTracksSelected;}
+		Wt::Signal<void>& moreSelected() { return _sigMoreSelected;}
 
 	private:
 
 		Wt::Signal<Database::Track::id_type> _sigTrackPlay;
-		Wt::Signal<void>	_sigMoreTracksSelected;
+		Wt::Signal<void> _sigMoreSelected;
 
 		void clear(void);
 		void addResults(size_t nb);
 
 		Wt::WTemplate*	_showMore;
 
-		Database::SearchFilter _filter;
+		Database::SearchFilter	_filter;
-		std::size_t	_nbTracks;
+		std::size_t		_nbTracks;
-
+		Wt::WContainerWidget*	_container;
-		// Main container that holds the releases
-		Wt::WContainerWidget* _releaseContainer;
-
-		// Used to add more results on the fly
-		Database::Release::id_type	_currentReleaseId;
-		Wt::WContainerWidget*		_currentTrackContainer;
 };
 
 } // namespace Mobile
 } // namespace UserInterface
 
-#endif