Added a play/add all on tracks view

src/ui/Explore.cpp

@@ -115,6 +115,8 @@ Explore::Explore(Wt::WContainerWidget* parent)
 
 	tracks->trackAdd.connect(this, &Explore::handleTrackAdd);
 	tracks->trackPlay.connect(this, &Explore::handleTrackPlay);
+	tracks->tracksAdd.connect(this, &Explore::handleTracksAdd);
+	tracks->tracksPlay.connect(this, &Explore::handleTracksPlay);
 
 
 	wApp->internalPathChanged().connect(std::bind([=]
@@ -218,5 +220,17 @@ Explore::handleTrackPlay(Database::id_type id)
 	tracksPlay.emit(getTrack(DboSession(), id));
 }
 
+void
+Explore::handleTracksAdd(std::vector<Database::Track::pointer> tracks)
+{
+	tracksAdd.emit(tracks);
+}
+
+void
+Explore::handleTracksPlay(std::vector<Database::Track::pointer> tracks)
+{
+	tracksPlay.emit(tracks);
+}
+
 } // namespace UserInterface
 

src/ui/Explore.hpp

@@ -43,6 +43,8 @@ class Explore : public Wt::WContainerWidget
 		void handleReleasePlay(Database::id_type id);
 		void handleTrackAdd(Database::id_type id);
 		void handleTrackPlay(Database::id_type id);
+		void handleTracksAdd(std::vector<Database::Track::pointer> tracks);
+		void handleTracksPlay(std::vector<Database::Track::pointer> tracks);
 
 		Filters* _filters;
 };

src/ui/PlaylistView.cpp

@@ -70,9 +70,10 @@ Playlist::addTracks(const std::vector<Database::Track::pointer>& tracks)
 		playlist = Database::Playlist::create(DboSession(), currentPlaylistName, false, CurrentUser());
 	}
 
+	std::size_t pos = playlist->getCount();
 	for (auto track : tracks)
 	{
-		playlist.modify()->addTrack(track);
+		Database::PlaylistEntry::create(DboSession(), track, playlist, pos++);
 	}
 
 	addSome();
@@ -133,7 +134,6 @@ Playlist::addSome()
 		if (release)
 		{
 			entry->setCondition("if-has-release", true);
-			// TODO anchor
 			Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id())));
 			Wt::WText *releaseText = new Wt::WText(releaseAnchor);
 			releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));

src/ui/TracksView.cpp

@@ -47,6 +47,20 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent)
 	_search->setPlaceholderText(Wt::WString::tr("msg-search-placeholder"));
 	_search->textInput().connect(this, &Tracks::refresh);
 
+	auto playBtn = new Wt::WText(Wt::WString::tr("btn-tracks-play-btn"), Wt::XHTMLText);
+	container->bindWidget("play-btn", playBtn);
+	playBtn->clicked().connect(std::bind([=]
+	{
+		tracksPlay.emit(getTracks());
+	}));
+
+	auto addBtn = new Wt::WText(Wt::WString::tr("btn-tracks-add-btn"), Wt::XHTMLText);
+	container->bindWidget("add-btn", addBtn);
+	addBtn->clicked().connect(std::bind([=]
+	{
+		tracksAdd.emit(getTracks());
+	}));
+
 	_tracksContainer = new Wt::WContainerWidget();
 	container->bindWidget("tracks", _tracksContainer);
 
@@ -64,6 +78,23 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent)
 	filters->updated().connect(this, &Tracks::refresh);
 }
 
+std::vector<Database::Track::pointer>
+Tracks::getTracks(int offset, int size, bool& moreResults)
+{
+	auto searchKeywords = splitString(_search->text().toUTF8(), " ");
+	auto clusterIds = _filters->getClusterIds();
+
+	Wt::Dbo::Transaction transaction(DboSession());
+
+	return Track::getByFilter(DboSession(), clusterIds, searchKeywords, offset, size, moreResults);
+}
+
+std::vector<Database::Track::pointer>
+Tracks::getTracks()
+{
+	bool moreResults;
+	return getTracks(-1, -1, moreResults);
+}
 
 void
 Tracks::refresh()
@@ -75,14 +106,10 @@ Tracks::refresh()
 void
 Tracks::addSome()
 {
-	auto searchKeywords = splitString(_search->text().toUTF8(), " ");
-
-	auto clusterIds = _filters->getClusterIds();
-
 	Wt::Dbo::Transaction transaction(DboSession());
 
 	bool moreResults;
-	auto tracks = Track::getByFilter(DboSession(), clusterIds, searchKeywords, _tracksContainer->count(), 20, moreResults);
+	auto tracks = getTracks(_tracksContainer->count(), 20, moreResults);
 
 	for (auto track : tracks)
 	{
@@ -105,7 +132,6 @@ Tracks::addSome()
 		if (release)
 		{
 			entry->setCondition("if-has-release", true);
-			// TODO anchor
 			Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(track->getRelease().id())));
 			Wt::WText *releaseText = new Wt::WText(releaseAnchor);
 			releaseText->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));

src/ui/TracksView.hpp

@@ -34,10 +34,16 @@ class Tracks : public Wt::WContainerWidget
 		Wt::Signal<Database::id_type> trackAdd;
 		Wt::Signal<Database::id_type> trackPlay;
 
+		Wt::Signal<std::vector<Database::Track::pointer>> tracksAdd;
+		Wt::Signal<std::vector<Database::Track::pointer>> tracksPlay;
+
 	private:
 		void refresh();
 		void addSome();
 
+		std::vector<Database::Track::pointer> getTracks(int offset, int size, bool& moreResults);
+		std::vector<Database::Track::pointer> getTracks();
+
 		Wt::WContainerWidget* _tracksContainer;
 		Wt::WTemplate* _showMore;
 		Wt::WLineEdit* _search;