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

New UI: filters now operational on all views

Browse Source
This commit is contained in:
emeric
2018-01-31 13:06:59 +01:00
parent 6591006fcc
commit 0da8d83288
12 changed files with 81 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/database/Release.cpp
+39 -8
View File
@@ -108,7 +108,7 @@ getQuery(Wt::Dbo::Session& session,
WhereClause clusterClause;
for (auto id : clusterIds)
clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id));
clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id));
where.And(clusterClause);
}
@@ -195,17 +195,48 @@ Release::hasVariousArtists() const
}
std::vector<Wt::Dbo::ptr<Track>>
Release::getTracks() const
Release::getTracks(const std::vector<id_type>& clusterIds) const
{
assert(self());
assert(self()->id() != Wt::Dbo::dbo_traits<Release>::invalidId() );
assert(session());
Wt::Dbo::collection<Wt::Dbo::ptr<Track>> res = session()->query<Wt::Dbo::ptr<Track>>(
"SELECT t FROM track t INNER JOIN release r ON t.release_id = r.id")
.where("r.id = ?")
.orderBy("t.disc_number,t.track_number")
.bind(id());
WhereClause where;
return std::vector<Wt::Dbo::ptr<Track>>(res.begin(), res.end());
std::ostringstream oss;
oss << "SELECT t FROM track t INNER JOIN release r ON t.release_id = r.id";
if (!clusterIds.empty())
{
oss << " INNER JOIN cluster c ON c.id = t_c.cluster_id INNER JOIN track_cluster t_c ON t_c.track_id = t.id";
WhereClause clusterClause;
for (auto id : clusterIds)
clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id));
where.And(clusterClause);
}
where.And(WhereClause("r.id = ?")).bind(std::to_string(id()));
oss << " " << where.get();
if (!clusterIds.empty())
oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size();
oss << " ORDER BY t.disc_number,t.track_number";
Wt::Dbo::Query<Track::pointer> query = session()->query<Track::pointer>( oss.str() );
for (const std::string& bindArg : where.getBindArgs())
{
query.bind(bindArg);
}
Wt::Dbo::collection< Wt::Dbo::ptr<Track> > res = query;
return std::vector< Wt::Dbo::ptr<Track> > (res.begin(), res.end());
}
} // namespace Database
src/database/Release.hpp
+1 -1
View File
@@ -57,7 +57,7 @@ class Release : public Wt::Dbo::Dbo<Release>
int size,
bool& moreExpected);
std::vector<Wt::Dbo::ptr<Track>> getTracks() const;
std::vector<Wt::Dbo::ptr<Track>> getTracks(const std::vector<id_type>& clusters = std::vector<id_type>()) const;
// Create
static pointer create(Wt::Dbo::Session& session, const std::string& name, const std::string& MBID = "");
src/database/Track.cpp
+1 -1
View File
@@ -129,7 +129,7 @@ getQuery(Wt::Dbo::Session& session,
WhereClause clusterClause;
for (auto id : clusterIds)
clusterClause.And(WhereClause("c.id = ?")).bind(std::to_string(id));
clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id));
where.And(clusterClause);
}
src/ui/ArtistView.cpp
+4 -4
View File
@@ -84,8 +84,8 @@ Artist::refresh()
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::WImage *cover = new Wt::WImage(coverAnchor);
Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
Wt::WImage* cover = new Wt::WImage(coverAnchor);
cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128));
// Some images may not be square
cover->setWidth(128);
@@ -93,8 +93,8 @@ Artist::refresh()
}
{
Wt::WAnchor *releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
Wt::WText *releaseName = new Wt::WText(releaseAnchor);
Wt::WAnchor* releaseAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
Wt::WText* releaseName = new Wt::WText(releaseAnchor);
releaseName->setText(Wt::WString::fromUTF8(release->getName(), Wt::PlainText));
entry->bindWidget("name", releaseAnchor);
}
src/ui/Explore.cpp
+3 -3
View File
@@ -83,9 +83,9 @@ Explore::Explore(Wt::WContainerWidget* parent)
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*/));
stack->addWidget(new Releases(filters));
stack->addWidget(new Release(filters));
stack->addWidget(new Tracks(filters));
wApp->internalPathChanged().connect(std::bind([=]
{
src/ui/ReleaseView.cpp
+5 -5
View File
@@ -33,8 +33,9 @@
namespace UserInterface {
Release::Release(Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent)
Release::Release(Filters* filters, Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent),
_filters(filters)
{
wApp->internalPathChanged().connect(std::bind([=]
{
@@ -109,10 +110,9 @@ Release::refresh()
auto tracksContainer = new Wt::WContainerWidget();
t->bindWidget("tracks", tracksContainer);
std::vector<Database::Cluster::id_type> clusterIds; // TODO fill
auto clusterIds = _filters->getClusterIds();
auto tracks = release->getTracks(clusterIds);
// auto tracks = release->getTracks(clusterIds);
auto tracks = release->getTracks();
bool variousArtists = release->hasVariousArtists();
for (auto track : tracks)
src/ui/ReleaseView.hpp
+5 -1
View File
@@ -21,15 +21,19 @@
#include <Wt/WContainerWidget>
#include "Filters.hpp"
namespace UserInterface {
class Release : public Wt::WContainerWidget
{
public:
Release(Wt::WContainerWidget* parent = 0);
Release(Filters* filters, Wt::WContainerWidget* parent = 0);
private:
void refresh();
Filters* _filters;
};
} // namespace UserInterface
src/ui/ReleasesView.cpp
+8 -7
View File
@@ -36,8 +36,9 @@ namespace UserInterface {
using namespace Database;
Releases::Releases(Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent)
Releases::Releases(Filters* filters, Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent),
_filters(filters)
{
auto releases = new Wt::WTemplate(Wt::WString::tr("template-releases"), this);
releases->addFunction("tr", &Wt::WTemplate::Functions::tr);
@@ -63,7 +64,7 @@ Releases::refresh(std::vector<std::string> searchKeywords)
{
_releasesContainer->clear();
std::vector<Cluster::id_type> clusterIds; // TODO fill
auto clusterIds = _filters->getClusterIds();
Wt::Dbo::Transaction transaction(DboSession());
@@ -75,8 +76,8 @@ Releases::refresh(std::vector<std::string> searchKeywords)
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::WImage *cover = new Wt::WImage(coverAnchor);
Wt::WAnchor* coverAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/release/" + std::to_string(release.id())));
Wt::WImage* cover = new Wt::WImage(coverAnchor);
cover->setImageLink(SessionImageResource()->getReleaseUrl(release.id(), 128));
// Some images may not be square
cover->setWidth(128);
@@ -91,8 +92,8 @@ Releases::refresh(std::vector<std::string> searchKeywords)
}
else
{
Wt::WAnchor *artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id())));
Wt::WText *artist = new Wt::WText(artistAnchor);
Wt::WAnchor* artistAnchor = new Wt::WAnchor(Wt::WLink(Wt::WLink::InternalPath, "/artist/" + std::to_string(artists.front().id())));
Wt::WText* artist = new Wt::WText(artistAnchor);
artist->setText(Wt::WString::fromUTF8(artists.front()->getName(), Wt::PlainText));
entry->bindWidget("artist-name", artistAnchor);
}
src/ui/ReleasesView.hpp
+5 -2
View File
@@ -21,17 +21,20 @@
#include <Wt/WContainerWidget>
#include "Filters.hpp"
namespace UserInterface {
class Releases : public Wt::WContainerWidget
{
public:
Releases(Wt::WContainerWidget* parent = 0);
Releases(Filters* filters, Wt::WContainerWidget* parent = 0);
private:
void refresh(std::vector<std::string> searchKeywords = std::vector<std::string>());
Wt::WContainerWidget *_releasesContainer;
Filters* _filters;
Wt::WContainerWidget* _releasesContainer;
};
} // namespace UserInterface
src/ui/TracksView.cpp
+4 -3
View File
@@ -35,8 +35,9 @@ namespace UserInterface {
using namespace Database;
Tracks::Tracks(Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent)
Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent)
: Wt::WContainerWidget(parent),
_filters(filters)
{
auto tracks = new Wt::WTemplate(Wt::WString::tr("template-tracks"), this);
tracks->addFunction("tr", &Wt::WTemplate::Functions::tr);
@@ -62,7 +63,7 @@ Tracks::refresh(std::vector<std::string> searchKeywords)
{
_tracksContainer->clear();
std::vector<Cluster::id_type> clusterIds; // TODO fill
auto clusterIds = _filters->getClusterIds();
Wt::Dbo::Transaction transaction(DboSession());
src/ui/TracksView.hpp
+5 -2
View File
@@ -21,17 +21,20 @@
#include <Wt/WContainerWidget>
#include "Filters.hpp"
namespace UserInterface {
class Tracks : public Wt::WContainerWidget
{
public:
Tracks(Wt::WContainerWidget* parent = 0);
Tracks(Filters* filters, Wt::WContainerWidget* parent = 0);
private:
void refresh(std::vector<std::string> searchKeywords = std::vector<std::string>());
Wt::WContainerWidget *_tracksContainer;
Wt::WContainerWidget* _tracksContainer;
Filters* _filters;
};
} // namespace UserInterface