owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a play/add all on tracks view

Browse Source
This commit is contained in:
emeric
2018-02-25 08:57:05 +01:00
parent fe53103445
commit aa54b5b599
12 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/tracks.xml
+1
View File
@@ -6,6 +6,7 @@
<message id="template-tracks">
<div class="page-header">
<h2>${tr:msg-tracks}</h2>
${play-btn}${add-btn}
</div>
<div class="form-group">
<div class="input-group">
src/database/DbArtist.cpp
+3 -1
View File
@@ -120,7 +120,9 @@ Artist::getByFilter(Wt::Dbo::Session& session,
const std::vector<std::string> keywords,
int offset, int size, bool& moreResults)
{
Wt::Dbo::collection<Artist::pointer> collection = getQuery(session, clusters, keywords).limit(size + 1).offset(offset);
Wt::Dbo::collection<Artist::pointer> collection = getQuery(session, clusters, keywords)
.limit(size != -1 ? size + 1 : -1)
.offset(offset);
auto res = std::vector<pointer>(collection.begin(), collection.end());
src/database/Playlist.cpp
+6 -6
View File
@@ -61,12 +61,6 @@ Playlist::getAll(Wt::Dbo::Session& session, Wt::Dbo::ptr<User> user)
return std::vector<Playlist::pointer>(res.begin(), res.end());
}
void
Playlist::addTrack(Wt::Dbo::ptr<Track> track)
{
_entries.insert( PlaylistEntry::create(*session(), track, self(), _entries.size()) );
}
PlaylistEntry::PlaylistEntry(Wt::Dbo::ptr<Track> track, Wt::Dbo::ptr<Playlist> playlist, int pos)
: _pos(pos),
_track(track),
@@ -107,4 +101,10 @@ Playlist::getTracks(int offset, int size, bool& moreResults) const
return res;
}
std::size_t
Playlist::getCount() const
{
return _entries.size();
}
} // namespace Database
src/database/Playlist.hpp
+1 -1
View File
@@ -50,10 +50,10 @@ class Playlist : public Wt::Dbo::Dbo<Playlist>
bool isPublic() const { return _isPublic; }
// Modifiers
void addTrack(Wt::Dbo::ptr<Track> track);
void clear() { _entries.clear(); }
// Get tracks, ordered by position
std::size_t getCount() const;
std::vector<Wt::Dbo::ptr<Track>> getTracks(int offset, int size, bool& moreResults) const;
template<class Action>
src/database/Release.cpp
+3 -1
View File
@@ -118,7 +118,9 @@ Release::getByFilter(Wt::Dbo::Session& session,
const std::vector<std::string> keywords,
int offset, int size, bool& moreResults)
{
Wt::Dbo::collection<pointer> collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset);
Wt::Dbo::collection<pointer> collection = getQuery(session, clusterIds, keywords)
.limit(size != -1 ? size + 1 : -1)
.offset(offset);
auto res = std::vector<pointer>(collection.begin(), collection.end());
src/database/Track.cpp
+12 -1
View File
@@ -169,7 +169,9 @@ Track::getByFilter(Wt::Dbo::Session& session,
const std::vector<std::string> keywords,
int offset, int size, bool& moreResults)
{
Wt::Dbo::collection<pointer> collection = getQuery(session, clusterIds, keywords).limit(size + 1).offset(offset);
Wt::Dbo::collection<pointer> collection = getQuery(session, clusterIds, keywords)
.limit(size != -1 ? size + 1 : -1)
.offset(offset);
auto res = std::vector<pointer>(collection.begin(), collection.end());
@@ -184,6 +186,15 @@ Track::getByFilter(Wt::Dbo::Session& session,
return res;
}
std::vector<Track::pointer>
Track::getByFilter(Wt::Dbo::Session& session,
const std::set<id_type>& clusters)
{
bool moreResults;
return getByFilter(session, clusters, std::vector<std::string>(), -1, -1, moreResults);
}
boost::optional<std::size_t>
Track::getTrackNumber(void) const
{
src/database/Track.hpp
+2
View File
@@ -118,6 +118,8 @@ class Track
static pointer getByPath(Wt::Dbo::Session& session, const boost::filesystem::path& p);
static pointer getById(Wt::Dbo::Session& session, id_type id);
static pointer getByMBID(Wt::Dbo::Session& session, const std::string& MBID);
static std::vector<pointer> getByFilter(Wt::Dbo::Session& session,
const std::set<id_type>& clusters); // tracks that belong to these clusters
static std::vector<pointer> getByFilter(Wt::Dbo::Session& session,
const std::set<id_type>& clusters, // tracks that belong to these clusters
const std::vector<std::string> keywords, // name must match all of these keywords
src/ui/Explore.cpp
+14
View File
@@ -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
+2
View File
@@ -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
+2 -2
View File
@@ -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
+32 -6
View File
@@ -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
+6
View File
@@ -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;