Added playlist skeleton

src/ui/ArtistView.cpp

@@ -29,6 +29,7 @@
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
+#include "Filters.hpp"
 #include "ArtistView.hpp"
 
 namespace UserInterface {
@@ -77,11 +78,21 @@ Artist::refresh()
 	{
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText);
 		t->bindWidget("play-btn", playBtn);
+
+		playBtn->clicked().connect(std::bind([=]
+		{
+			artistPlay.emit(artistId);
+		}));
 	}
 
 	{
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText);
 		t->bindWidget("add-btn", addBtn);
+
+		addBtn->clicked().connect(std::bind([=]
+		{
+			artistAdd.emit(artistId);
+		}));
 	}
 
 	auto releasesContainer = new Wt::WContainerWidget();
@@ -90,11 +101,13 @@ Artist::refresh()
 	auto releases = artist->getReleases(_filters->getClusterIds());
 	for (auto release : releases)
 	{
+		auto releaseId = release.id();
+
 		Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-artist-entry"), releasesContainer);
 		entry->addFunction("tr", Wt::WTemplate::Functions::tr);
 
 		{
-			Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
+			Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId)));
 			Wt::WImage* cover = new Wt::WImage(coverAnchor);
 			cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128));
 			// Some images may not be square
@@ -103,7 +116,7 @@ Artist::refresh()
 		}
 
 		{
-			Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
+			Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId)));
 			Wt::WText* releaseName = new Wt::WText(releaseAnchor);
 			releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));
 			entry->bindWidget("name", releaseAnchor);
@@ -128,9 +141,17 @@ Artist::refresh()
 
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-artist-play-btn"), Wt::XHTMLText);
 		entry->bindWidget("play-btn", playBtn);
+		playBtn->clicked().connect(std::bind([=]
+		{
+			releasePlay.emit(releaseId);
+		}));
 
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-artist-add-btn"), Wt::XHTMLText);
 		entry->bindWidget("add-btn", addBtn);
+		addBtn->clicked().connect(std::bind([=]
+		{
+			releaseAdd.emit(releaseId);
+		}));
 	}
 }
 

src/ui/ArtistView.hpp

@@ -20,16 +20,23 @@
 #pragma once
 
 #include <Wt/WContainerWidget>
-
-#include "Filters.hpp"
+#include <Wt/WSignal>
 
 namespace UserInterface {
 
+class Filters;
+
 class Artist : public Wt::WContainerWidget
 {
 	public:
 		Artist(Filters* filters, Wt::WContainerWidget* parent = 0);
 
+		Wt::Signal<Database::id_type> artistAdd;
+		Wt::Signal<Database::id_type> artistPlay;
+
+		Wt::Signal<Database::id_type> releaseAdd;
+		Wt::Signal<Database::id_type> releasePlay;
+
 	private:
 		void refresh();
 

src/ui/ArtistsView.cpp

@@ -28,6 +28,7 @@
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
+#include "Filters.hpp"
 #include "ArtistsView.hpp"
 
 namespace UserInterface {

src/ui/ArtistsView.hpp

@@ -20,16 +20,20 @@
 #pragma once
 
 #include <Wt/WContainerWidget>
-
-#include "Filters.hpp"
+#include <Wt/WSignal>
 
 namespace UserInterface {
 
+class Filters;
+
 class Artists : public Wt::WContainerWidget
 {
 	public:
 		Artists(Filters* filters, Wt::WContainerWidget* parent = 0);
 
+		Wt::Signal<Database::id_type> artistAdd;
+		Wt::Signal<Database::id_type> artistPlay;
+
 	private:
 		void refresh(std::vector<std::string> searchKeywords = std::vector<std::string>());
 

src/ui/Explore.cpp

@@ -25,6 +25,7 @@
 
 #include "LmsApplication.hpp"
 
+#include "Filters.hpp"
 #include "ArtistsView.hpp"
 #include "ArtistView.hpp"
 #include "ReleasesView.hpp"
@@ -74,18 +75,47 @@ Explore::Explore(Wt::WContainerWidget* parent)
 {
 	auto container = new Wt::WTemplate(Wt::WString::tr("template-explore"), this);
 
-	auto filters = new Filters();
-	container->bindWidget("filters", filters);
+	_filters = new Filters();
+	container->bindWidget("filters", _filters);
 
 	// Contents
 	Wt::WStackedWidget* stack = new Wt::WStackedWidget();
 	container->bindWidget("contents", stack);
 
-	stack->addWidget(new Artists(filters));
-	stack->addWidget(new Artist(filters));
-	stack->addWidget(new Releases(filters));
-	stack->addWidget(new Release(filters));
-	stack->addWidget(new Tracks(filters));
+	auto artists = new Artists(_filters);
+	stack->addWidget(artists);
+
+	artists->artistAdd.connect(this, &Explore::handleArtistAdd);
+	artists->artistPlay.connect(this, &Explore::handleArtistPlay);
+
+	auto artist = new Artist(_filters);
+	stack->addWidget(artist);
+
+	artist->artistAdd.connect(this, &Explore::handleArtistAdd);
+	artist->artistPlay.connect(this, &Explore::handleArtistPlay);
+	artist->releaseAdd.connect(this, &Explore::handleReleaseAdd);
+	artist->releasePlay.connect(this, &Explore::handleReleasePlay);
+
+	auto releases = new Releases(_filters);
+	stack->addWidget(releases);
+
+	releases->releaseAdd.connect(this, &Explore::handleReleaseAdd);
+	releases->releasePlay.connect(this, &Explore::handleReleasePlay);
+
+	auto release = new Release(_filters);
+	stack->addWidget(release);
+
+	release->releaseAdd.connect(this, &Explore::handleReleaseAdd);
+	release->releasePlay.connect(this, &Explore::handleReleasePlay);
+	release->trackAdd.connect(this, &Explore::handleTrackAdd);
+	release->trackPlay.connect(this, &Explore::handleTrackPlay);
+
+	auto tracks = new Tracks(_filters);
+	stack->addWidget(tracks);
+
+	tracks->trackAdd.connect(this, &Explore::handleTrackAdd);
+	tracks->trackPlay.connect(this, &Explore::handleTrackPlay);
+
 
 	wApp->internalPathChanged().connect(std::bind([=]
 	{
@@ -94,5 +124,86 @@ Explore::Explore(Wt::WContainerWidget* parent)
 
 	handlePathChange(stack);
 }
+
+// TODO SQL this?
+static std::vector<Database::id_type> getArtistTracks(Wt::Dbo::Session& session, Database::id_type artistId, std::set<Database::id_type> clusters)
+{
+	std::vector<Database::id_type> res;
+
+	Wt::Dbo::Transaction transaction(session);
+
+	auto artist = Database::Artist::getById(session, artistId);
+	if (!artist)
+		return res;
+
+	auto releases = artist->getReleases(clusters);
+	for (auto release : releases)
+	{
+		auto tracks = release->getTracks(clusters);
+
+		for (auto track : tracks)
+		{
+			res.push_back(track.id());
+		}
+	}
+
+	return res;
+}
+
+static std::vector<Database::id_type> getReleaseTracks(Wt::Dbo::Session& session, Database::id_type releaseId, std::set<Database::id_type> clusters)
+{
+	std::vector<Database::id_type> res;
+
+	Wt::Dbo::Transaction transaction(session);
+
+	auto release = Database::Release::getById(session, releaseId);
+	if (!release)
+		return res;
+
+	auto tracks = release->getTracks(clusters);
+	for (auto track : tracks)
+	{
+		res.push_back(track.id());
+	}
+
+	return res;
+}
+
+void
+Explore::handleArtistAdd(Database::id_type id)
+{
+	tracksAdd.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds()));
+}
+
+void
+Explore::handleArtistPlay(Database::id_type id)
+{
+	tracksPlay.emit(getArtistTracks(DboSession(), id, _filters->getClusterIds()));
+}
+
+void
+Explore::handleReleaseAdd(Database::id_type id)
+{
+	tracksAdd.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds()));
+}
+
+void
+Explore::handleReleasePlay(Database::id_type id)
+{
+	tracksPlay.emit(getReleaseTracks(DboSession(), id, _filters->getClusterIds()));
+}
+
+void
+Explore::handleTrackAdd(Database::id_type id)
+{
+	tracksAdd.emit(std::vector<Database::id_type>(1, id));
+}
+
+void
+Explore::handleTrackPlay(Database::id_type id)
+{
+	tracksPlay.emit(std::vector<Database::id_type>(1, id));
+}
+
 } // namespace UserInterface
 

src/ui/Explore.hpp

@@ -21,12 +21,30 @@
 
 #include <Wt/WContainerWidget>
 
+#include "database/Types.hpp"
+
 namespace UserInterface {
 
+class Filters;
+
 class Explore : public Wt::WContainerWidget
 {
 	public:
 		Explore(Wt::WContainerWidget *parent = 0);
+
+		Wt::Signal<std::vector<Database::id_type>> tracksAdd;
+		Wt::Signal<std::vector<Database::id_type>> tracksPlay;
+
+	private:
+
+		void handleArtistAdd(Database::id_type id);
+		void handleArtistPlay(Database::id_type id);
+		void handleReleaseAdd(Database::id_type id);
+		void handleReleasePlay(Database::id_type id);
+		void handleTrackAdd(Database::id_type id);
+		void handleTrackPlay(Database::id_type id);
+
+		Filters* _filters;
 };
 
 } // namespace UserInterface

src/ui/LmsApplication.cpp

@@ -32,6 +32,7 @@
 #include "Explore.hpp"
 #include "HomeView.hpp"
 #include "MediaPlayer.hpp"
+#include "PlaylistView.hpp"
 
 #include "LmsApplication.hpp"
 
@@ -80,12 +81,13 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, Wt::Dbo::SqlConnecti
 	// Add a resource bundle
 	messageResourceBundle().use(appRoot() + "artist");
 	messageResourceBundle().use(appRoot() + "artists");
-	messageResourceBundle().use(appRoot() + "messages");
 	messageResourceBundle().use(appRoot() + "mediaplayer");
-	messageResourceBundle().use(appRoot() + "templates");
+	messageResourceBundle().use(appRoot() + "messages");
+	messageResourceBundle().use(appRoot() + "playlist");
 	messageResourceBundle().use(appRoot() + "release");
 	messageResourceBundle().use(appRoot() + "releases");
 	messageResourceBundle().use(appRoot() + "tracks");
+	messageResourceBundle().use(appRoot() + "templates");
 
 	setTitle("LMS");
 
@@ -266,10 +268,24 @@ LmsApplication::handleAuthEvent(void)
 	main->bindWidget("contents", mainStack);
 
 	mainStack->addWidget(new Home());
-	mainStack->addWidget(new Explore());
-	mainStack->addWidget(new Wt::WText("PLAYLIST"));
+
+	auto explore = new Explore();
+	mainStack->addWidget(explore);
+
+	auto playlist = new Playlist();
+	mainStack->addWidget(playlist);
 	mainStack->addWidget(new Wt::WText("SETTINGS"));
 
+	explore->tracksAdd.connect(std::bind([=] (std::vector<Database::id_type> tracks)
+	{
+		playlist->addTracks(tracks);
+	}, std::placeholders::_1));
+
+	explore->tracksPlay.connect(std::bind([=] (std::vector<Database::id_type> tracks)
+	{
+		playlist->playTracks(tracks);
+	}, std::placeholders::_1));
+
 	// MediaPlayer
 	auto player = new MediaPlayer();
 	main->bindWidget("player", player);

src/ui/PlaylistView.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2018 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/WTemplate>
+#include <Wt/WText>
+
+#include "PlaylistView.hpp"
+
+namespace UserInterface {
+
+Playlist::Playlist(Wt::WContainerWidget* parent)
+: Wt::WContainerWidget(parent)
+{
+	auto t = new Wt::WTemplate(Wt::WString::tr("template-playlist"), this);
+	t->addFunction("tr", &Wt::WTemplate::Functions::tr);
+
+	auto saveBtn = new Wt::WText(Wt::WString::tr("btn-playlist-save-btn"), Wt::XHTMLText);
+	t->bindWidget("save-btn", saveBtn);
+
+	auto loadBtn = new Wt::WText(Wt::WString::tr("btn-playlist-load-btn"), Wt::XHTMLText);
+	t->bindWidget("load-btn", loadBtn);
+
+	auto clearBtn = new Wt::WText(Wt::WString::tr("btn-playlist-clear-btn"), Wt::XHTMLText);
+	t->bindWidget("clear-btn", clearBtn);
+
+	_entriesContainer = new Wt::WContainerWidget();
+	t->bindWidget("entries", _entriesContainer);
+}
+
+void
+Playlist::addTracks(const std::vector<Database::id_type>& trackIds)
+{
+	for (auto trackId : trackIds)
+		std::cerr << "Adding track " << trackId << std::endl;
+}
+
+void
+Playlist::playTracks(const std::vector<Database::id_type>& trackIds)
+{
+	for (auto trackId : trackIds)
+		std::cerr << "Playing track " << trackId << std::endl;
+}
+
+void
+Playlist::refresh()
+{
+
+}
+
+} // namespace UserInterface
+

src/ui/PlaylistView.hpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 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/>.
+ */
+
+#pragma once
+
+#include <Wt/WContainerWidget>
+
+#include "database/Types.hpp"
+
+namespace UserInterface {
+
+class Playlist : public Wt::WContainerWidget
+{
+	public:
+		Playlist(Wt::WContainerWidget* parent = 0);
+
+		void addTracks(const std::vector<Database::id_type>& trackIds);
+		void playTracks(const std::vector<Database::id_type>& trackIds);
+
+	private:
+		void refresh();
+
+		Wt::WContainerWidget* _entriesContainer;
+};
+
+} // namespace UserInterface
+

src/ui/ReleaseView.cpp

@@ -29,6 +29,7 @@
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
+#include "Filters.hpp"
 #include "ReleaseView.hpp"
 
 namespace UserInterface {
@@ -112,11 +113,19 @@ Release::refresh()
 	{
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText);
 		t->bindWidget("play-btn", playBtn);
+		playBtn->clicked().connect(std::bind([=]
+		{
+			releasePlay.emit(releaseId);
+		}));
 	}
 
 	{
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText);
 		t->bindWidget("add-btn", addBtn);
+		addBtn->clicked().connect(std::bind([=]
+		{
+			releaseAdd.emit(releaseId);
+		}));
 	}
 
 	auto tracksContainer = new Wt::WContainerWidget();
@@ -129,6 +138,8 @@ Release::refresh()
 
 	for (auto track : tracks)
 	{
+		auto trackId = track.id();
+
 		Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-release-entry"), tracksContainer);
 
 		entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
@@ -159,9 +170,17 @@ Release::refresh()
 
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-release-play-btn"), Wt::XHTMLText);
 		entry->bindWidget("play-btn", playBtn);
+		playBtn->clicked().connect(std::bind([=]
+		{
+			trackPlay.emit(trackId);
+		}));
 
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-release-add-btn"), Wt::XHTMLText);
 		entry->bindWidget("add-btn", addBtn);
+		addBtn->clicked().connect(std::bind([=]
+		{
+			trackAdd.emit(trackId);
+		}));
 	}
 }
 

src/ui/ReleaseView.hpp

@@ -21,15 +21,20 @@
 
 #include <Wt/WContainerWidget>
 
-#include "Filters.hpp"
-
 namespace UserInterface {
 
+class Filters;
 class Release : public Wt::WContainerWidget
 {
 	public:
 		Release(Filters* filters, Wt::WContainerWidget* parent = 0);
 
+		Wt::Signal<Database::id_type> releaseAdd;
+		Wt::Signal<Database::id_type> releasePlay;
+
+		Wt::Signal<Database::id_type> trackAdd;
+		Wt::Signal<Database::id_type> trackPlay;
+
 	private:
 		void refresh();
 

src/ui/ReleasesView.cpp

@@ -30,6 +30,7 @@
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
+#include "Filters.hpp"
 #include "ReleasesView.hpp"
 
 namespace UserInterface {
@@ -77,18 +78,20 @@ Releases::refresh(std::vector<std::string> searchKeywords)
 
 	for (auto release : releases)
 	{
+		auto releaseId = release.id();
+
 		Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-releases-entry"), _releasesContainer);
 		entry->addFunction("tr", Wt::WTemplate::Functions::tr);
 
-		Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
+		Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId)));
 		Wt::WImage* cover = new Wt::WImage(coverAnchor);
-		cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128));
+		cover->setImageLink(SessionImageResource()->getReleaseUrl(releaseId, 128));
 		// Some images may not be square
 		cover->setWidth(128);
 		entry->bindWidget("cover", coverAnchor);
 
 		{
-			Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
+			Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(releaseId)));
 			Wt::WText* releaseName = new Wt::WText(releaseAnchor);
 			releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));
 			entry->bindWidget("release-name", releaseAnchor);
@@ -110,9 +113,17 @@ Releases::refresh(std::vector<std::string> searchKeywords)
 
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-releases-play-btn"), Wt::XHTMLText);
 		entry->bindWidget("play-btn", playBtn);
+		playBtn->clicked().connect(std::bind([=]
+		{
+			releasePlay.emit(releaseId);
+		}));
 
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-releases-add-btn"), Wt::XHTMLText);
 		entry->bindWidget("add-btn", addBtn);
+		addBtn->clicked().connect(std::bind([=]
+		{
+			releaseAdd.emit(releaseId);
+		}));
 	}
 }
 

src/ui/ReleasesView.hpp

@@ -21,15 +21,18 @@
 
 #include <Wt/WContainerWidget>
 
-#include "Filters.hpp"
-
 namespace UserInterface {
 
+class Filters;
+
 class Releases : public Wt::WContainerWidget
 {
 	public:
 		Releases(Filters* filters, Wt::WContainerWidget* parent = 0);
 
+		Wt::Signal<Database::id_type> releaseAdd;
+		Wt::Signal<Database::id_type> releasePlay;
+
 	private:
 		void refresh(std::vector<std::string> searchKeywords = std::vector<std::string>());
 

src/ui/TracksView.cpp

@@ -29,6 +29,7 @@
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
+#include "Filters.hpp"
 #include "TracksView.hpp"
 
 namespace UserInterface {
@@ -76,6 +77,7 @@ Tracks::refresh(std::vector<std::string> searchKeywords)
 
 	for (auto track : tracks)
 	{
+		auto trackId = track.id();
 		Wt::WTemplate* entry = new Wt::WTemplate(Wt::WString::tr("template-tracks-entry"), _tracksContainer);
 
 		entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::PlainText);
@@ -109,9 +111,17 @@ Tracks::refresh(std::vector<std::string> searchKeywords)
 
 		auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText);
 		entry->bindWidget("play-btn", playBtn);
+		playBtn->clicked().connect(std::bind([=]
+		{
+			trackPlay.emit(trackId);
+		}));
 
 		auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText);
 		entry->bindWidget("add-btn", addBtn);
+		addBtn->clicked().connect(std::bind([=]
+		{
+			trackAdd.emit(trackId);
+		}));
 	}
 
 }

src/ui/TracksView.hpp

@@ -21,15 +21,17 @@
 
 #include <Wt/WContainerWidget>
 
-#include "Filters.hpp"
-
 namespace UserInterface {
 
+class Filters;
 class Tracks : public Wt::WContainerWidget
 {
 	public:
 		Tracks(Filters* filters, Wt::WContainerWidget* parent = 0);
 
+		Wt::Signal<Database::id_type> trackAdd;
+		Wt::Signal<Database::id_type> trackPlay;
+
 	private:
 		void refresh(std::vector<std::string> searchKeywords = std::vector<std::string>());