Still converting to bootstrap 5. Restored search
This commit is contained in:
emeric
+1
-1
@@ -34,7 +34,7 @@
|
||||
</message>
|
||||
|
||||
<message id="Lms.Explore.Artists.template.entry">
|
||||
${name class="text-decoration-none text-reset"}
|
||||
${name class="text-decoration-none link-secondary"}
|
||||
</message>
|
||||
|
||||
</messages>
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@
|
||||
<div class="col">
|
||||
<h3>${name}</h3>
|
||||
${<if-has-release-artists>}${artists}${</if-has-release-artists>}
|
||||
${<if-has-various-release-artists>}${tr:Lms.Explore.various-artists}${</if-has-various-release-artists>}
|
||||
${<if-has-various-release-artists>}<div class="text-secondary">${tr:Lms.Explore.various-artists}</div>${</if-has-various-release-artists>}
|
||||
<div class="small text-muted">${<if-has-year>}${year}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>} · ${</if-has-year>}${duration}</div>
|
||||
${clusters class="mb-2"}
|
||||
</div>
|
||||
@@ -47,7 +47,7 @@
|
||||
</message>
|
||||
|
||||
<message id="Lms.Explore.Release.template.entry-release-artist">
|
||||
${artist}
|
||||
${artist class="text-decoration-none link-success"}
|
||||
</message>
|
||||
|
||||
<message id="Lms.Explore.Release.template.entry-disc">
|
||||
|
||||
@@ -41,10 +41,10 @@
|
||||
<message id="Lms.Explore.Releases.template.entry-grid">
|
||||
<div class="card border-0 bg-transparent">
|
||||
${cover class="shadow-sm"}
|
||||
${release-name class="text-truncate text-nowrap"}
|
||||
${<if-has-year>}${year}${</if-has-year>}
|
||||
${<if-has-artist>}${artist-name class=" text-truncate text-nowrap"}${</if-has-artist>}
|
||||
${<if-has-various-artists>}${tr:Lms.Explore.various-artists}${</if-has-various-artists>}
|
||||
${release-name class="text-truncate text-nowrap text-decoration-none link-success"}
|
||||
${<if-has-artist>}${artist-name class=" text-truncate text-nowrap text-decoration-none link-secondary"}${</if-has-artist>}
|
||||
${<if-has-various-artists>}<div class="text-truncate text-nowrap text-success">${tr:Lms.Explore.various-artists}</div>${</if-has-various-artists>}
|
||||
${<if-has-year>}<div class="small text-muted">${year}</div>${</if-has-year>}
|
||||
</div>
|
||||
</message>
|
||||
|
||||
|
||||
+16
-2
@@ -3,8 +3,22 @@
|
||||
<!--FORMS message blocks-->
|
||||
|
||||
<message id="Lms.Explore.Search.template">
|
||||
${mode class="nav nav-pills mb-3"}
|
||||
${stack}
|
||||
<ul class="nav nav-pills mb-3" id="myTab" role="tablist">
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link active" id="releases-tab" data-bs-toggle="tab" data-bs-target="#releases" type="button" role="tab" aria-controls="releases" aria-selected="true">${tr:Lms.Explore.releases}</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="artists-tab" data-bs-toggle="tab" data-bs-target="#artists" type="button" role="tab" aria-controls="artists" aria-selected="false">${tr:Lms.Explore.artists}</button>
|
||||
</li>
|
||||
<li class="nav-item" role="presentation">
|
||||
<button class="nav-link" id="tracks-tab" data-bs-toggle="tab" data-bs-target="#tracks" type="button" role="tab" aria-controls="tracks" aria-selected="false">${tr:Lms.Explore.tracks}</button>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="tab-content" id="myTabContent">
|
||||
<div class="tab-pane show active" id="releases" role="tabpanel" aria-labelledby="releases-tab">${releases}</div>
|
||||
<div class="tab-pane" id="artists" role="tabpanel" aria-labelledby="artists-tab">${artists}</div>
|
||||
<div class="tab-pane" id="tracks" role="tabpanel" aria-labelledby="tracks-tab">${tracks}</div>
|
||||
</div>
|
||||
</message>
|
||||
|
||||
</messages>
|
||||
|
||||
@@ -268,7 +268,9 @@ Release::refreshView()
|
||||
{
|
||||
if (!firstArtist)
|
||||
artistsContainer->addNew<Wt::WText>(" · ");
|
||||
artistsContainer->addWidget(LmsApplication::createArtistAnchor(artist));
|
||||
auto anchor {LmsApplication::createArtistAnchor(artist)};
|
||||
anchor->addStyleClass("link-success text-decoration-none"); // hack
|
||||
artistsContainer->addWidget(std::move(anchor));
|
||||
firstArtist = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,19 +19,12 @@
|
||||
|
||||
#include "SearchView.hpp"
|
||||
|
||||
#include <functional>
|
||||
|
||||
#include <Wt/WAnchor.h>
|
||||
#include <Wt/WImage.h>
|
||||
#include <Wt/WStackedWidget.h>
|
||||
|
||||
#include "services/database/Artist.hpp"
|
||||
#include "services/database/Release.hpp"
|
||||
#include "services/database/Session.hpp"
|
||||
#include "services/database/Track.hpp"
|
||||
|
||||
#include "common/InfiniteScrollingContainer.hpp"
|
||||
#include "common/LoadingIndicator.hpp"
|
||||
#include "ArtistListHelpers.hpp"
|
||||
#include "Filters.hpp"
|
||||
#include "LmsApplication.hpp"
|
||||
@@ -45,30 +38,20 @@ namespace UserInterface
|
||||
SearchView::SearchView(Filters* filters)
|
||||
: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Search.template")}
|
||||
, _filters {filters}
|
||||
, _releaseCollector {*filters, ReleaseCollector::Mode::Search, getMaxCount(Mode::Release)}
|
||||
, _artistCollector {*filters, ArtistCollector::Mode::Search, getMaxCount(Mode::Artist)}
|
||||
, _releaseCollector {*filters, ReleaseCollector::Mode::Search, getMaxCount(Mode::Release)}
|
||||
, _trackCollector {*filters, TrackCollector::Mode::Search, getMaxCount(Mode::Track)}
|
||||
{
|
||||
addFunction("tr", &Wt::WTemplate::Functions::tr);
|
||||
|
||||
Wt::WStackedWidget* stack {bindNew<Wt::WStackedWidget>("stack")};
|
||||
_menu = bindNew<Wt::WMenu>("mode", stack);
|
||||
_artists = bindNew<InfiniteScrollingContainer>("artists", Wt::WString::tr("Lms.infinite-scrolling-container"));
|
||||
_artists->onRequestElements.connect([this] { addSomeArtists(); });
|
||||
|
||||
auto addItem = [=](const Wt::WString& str, [[maybe_unused]] Mode mode, const Wt::WString& templateStr, std::function<void()> onRequestElementsFunc)
|
||||
{
|
||||
assert(modeToIndex(mode) == _results.size());
|
||||
_releases = bindNew<InfiniteScrollingContainer>("releases", Wt::WString::tr("Lms.Explore.Releases.template.container"));
|
||||
_releases->onRequestElements.connect([this] { addSomeReleases(); });
|
||||
|
||||
auto results {std::make_unique<InfiniteScrollingContainer>(templateStr)};
|
||||
results->onRequestElements.connect(std::move(onRequestElementsFunc));
|
||||
|
||||
_results.push_back(results.get());
|
||||
_menu->addItem(str, std::move(results));
|
||||
};
|
||||
|
||||
// same order as Mode!
|
||||
addItem(Wt::WString::tr("Lms.Explore.releases"), Mode::Release, Wt::WString::tr("Lms.Explore.Releases.template.container"), [this]{ addSomeReleases(); });
|
||||
addItem(Wt::WString::tr("Lms.Explore.artists"), Mode::Artist, Wt::WString::tr("Lms.infinite-scrolling-container"), [this]{ addSomeArtists(); });
|
||||
addItem(Wt::WString::tr("Lms.Explore.tracks"), Mode::Track, Wt::WString::tr("Lms.infinite-scrolling-container"), [this]{ addSomeTracks(); });
|
||||
_tracks = bindNew<InfiniteScrollingContainer>("tracks", Wt::WString::tr("Lms.infinite-scrolling-container"));
|
||||
_tracks->onRequestElements.connect([this] { addSomeTracks(); });
|
||||
|
||||
_filters->updated().connect([=]
|
||||
{
|
||||
@@ -76,24 +59,6 @@ namespace UserInterface
|
||||
});
|
||||
}
|
||||
|
||||
std::size_t
|
||||
SearchView::modeToIndex(Mode mode) const
|
||||
{
|
||||
return static_cast<std::size_t>(mode);
|
||||
}
|
||||
|
||||
Wt::WMenuItem&
|
||||
SearchView::getItemMenu(Mode mode) const
|
||||
{
|
||||
return *_menu->itemAt(modeToIndex(mode));
|
||||
}
|
||||
|
||||
InfiniteScrollingContainer&
|
||||
SearchView::getResultContainer(Mode mode) const
|
||||
{
|
||||
return *_results[modeToIndex(mode)];
|
||||
}
|
||||
|
||||
std::size_t
|
||||
SearchView::getBatchSize(Mode mode) const
|
||||
{
|
||||
@@ -122,92 +87,76 @@ namespace UserInterface
|
||||
void
|
||||
SearchView::refreshView()
|
||||
{
|
||||
for (InfiniteScrollingContainer* results : _results)
|
||||
results->clear();
|
||||
_artists->clear();
|
||||
_releases->clear();
|
||||
_tracks->clear();
|
||||
|
||||
addSomeReleases();
|
||||
addSomeArtists();
|
||||
addSomeReleases();
|
||||
addSomeTracks();
|
||||
}
|
||||
|
||||
void
|
||||
SearchView::addSomeArtists()
|
||||
{
|
||||
InfiniteScrollingContainer& results {getResultContainer(Mode::Artist)};
|
||||
using namespace Database;
|
||||
|
||||
const Range range {_artists->getCount(), getBatchSize(Mode::Artist)};
|
||||
const RangeResults<ArtistId> artistIds {_artistCollector.get(range)};
|
||||
|
||||
{
|
||||
using namespace Database;
|
||||
|
||||
const Range range {results.getCount(), getBatchSize(Mode::Artist)};
|
||||
const RangeResults<ArtistId> artistIds {_artistCollector.get(range)};
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const ArtistId artistId : artistIds.results)
|
||||
{
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const ArtistId artistId : artistIds.results)
|
||||
{
|
||||
const Artist::pointer artist {Artist::find(LmsApp->getDbSession(), artistId)};
|
||||
results.add(ArtistListHelpers::createEntry(artist));
|
||||
}
|
||||
const Artist::pointer artist {Artist::find(LmsApp->getDbSession(), artistId)};
|
||||
_artists->add(ArtistListHelpers::createEntry(artist));
|
||||
}
|
||||
|
||||
results.setHasMore(artistIds.moreResults);
|
||||
}
|
||||
|
||||
getItemMenu(Mode::Artist).setDisabled(results.getCount() == 0);
|
||||
_artists->setHasMore(artistIds.moreResults);
|
||||
}
|
||||
|
||||
void
|
||||
SearchView::addSomeReleases()
|
||||
{
|
||||
InfiniteScrollingContainer& results {getResultContainer(Mode::Release)};
|
||||
using namespace Database;
|
||||
|
||||
const Range range {_releases->getCount(), getBatchSize(Mode::Release)};
|
||||
const RangeResults<ReleaseId> releaseIds {_releaseCollector.get(range)};
|
||||
|
||||
{
|
||||
using namespace Database;
|
||||
|
||||
const Range range {results.getCount(), getBatchSize(Mode::Release)};
|
||||
const RangeResults<ReleaseId> releaseIds {_releaseCollector.get(range)};
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const ReleaseId releaseId : releaseIds.results)
|
||||
{
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const ReleaseId releaseId : releaseIds.results)
|
||||
{
|
||||
const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)};
|
||||
results.add(ReleaseListHelpers::createEntry(release));
|
||||
}
|
||||
const Release::pointer release {Release::find(LmsApp->getDbSession(), releaseId)};
|
||||
_releases->add(ReleaseListHelpers::createEntry(release));
|
||||
}
|
||||
|
||||
results.setHasMore(releaseIds.moreResults);
|
||||
}
|
||||
|
||||
getItemMenu(Mode::Release).setDisabled(results.getCount() == 0);
|
||||
_releases->setHasMore(releaseIds.moreResults);
|
||||
}
|
||||
|
||||
void
|
||||
SearchView::addSomeTracks()
|
||||
{
|
||||
InfiniteScrollingContainer& results {getResultContainer(Mode::Track)};
|
||||
using namespace Database;
|
||||
|
||||
const Range range {_tracks->getCount(), getBatchSize(Mode::Track)};
|
||||
const RangeResults<TrackId> trackIds {_trackCollector.get(range)};
|
||||
|
||||
{
|
||||
using namespace Database;
|
||||
|
||||
const Range range {results.getCount(), getBatchSize(Mode::Track)};
|
||||
const RangeResults<TrackId> trackIds {_trackCollector.get(range)};
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const TrackId trackId : trackIds.results)
|
||||
{
|
||||
auto transaction {LmsApp->getDbSession().createSharedTransaction()};
|
||||
|
||||
for (const TrackId trackId : trackIds.results)
|
||||
{
|
||||
const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)};
|
||||
results.add(TrackListHelpers::createEntry(track, tracksAction));
|
||||
}
|
||||
const Track::pointer track {Track::find(LmsApp->getDbSession(), trackId)};
|
||||
_tracks->add(TrackListHelpers::createEntry(track, tracksAction));
|
||||
}
|
||||
|
||||
results.setHasMore(trackIds.moreResults);
|
||||
}
|
||||
|
||||
getItemMenu(Mode::Track).setDisabled(results.getCount() == 0);
|
||||
_tracks->setHasMore(trackIds.moreResults);
|
||||
}
|
||||
} // namespace UserInterface
|
||||
|
||||
|
||||
@@ -21,8 +21,7 @@
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include <Wt/WContainerWidget.h>
|
||||
#include <Wt/WMenu.h>
|
||||
#include <Wt/WStackedWidget.h>
|
||||
#include <Wt/WTemplate.h>
|
||||
|
||||
#include "ArtistCollector.hpp"
|
||||
@@ -49,15 +48,11 @@ namespace UserInterface
|
||||
// same order as in the menu
|
||||
enum class Mode
|
||||
{
|
||||
Release,
|
||||
Artist,
|
||||
Release,
|
||||
Track,
|
||||
};
|
||||
|
||||
std::size_t modeToIndex(Mode mode) const;
|
||||
Wt::WMenuItem& getItemMenu(Mode mode) const;
|
||||
InfiniteScrollingContainer& getResultContainer(Mode mode) const;
|
||||
|
||||
static constexpr Mode _defaultMode {Mode::Release};
|
||||
static inline std::unordered_map<Mode, std::size_t> _batchSizes
|
||||
{
|
||||
@@ -75,16 +70,19 @@ namespace UserInterface
|
||||
std::size_t getMaxCount(Mode mode) const;
|
||||
|
||||
void refreshView();
|
||||
void addSomeReleases();
|
||||
void addSomeArtists();
|
||||
void addSomeReleases();
|
||||
void addSomeTracks();
|
||||
|
||||
Filters* _filters {};
|
||||
Wt::WMenu* _menu {};
|
||||
ReleaseCollector _releaseCollector;
|
||||
ArtistCollector _artistCollector;
|
||||
ReleaseCollector _releaseCollector;
|
||||
TrackCollector _trackCollector;
|
||||
|
||||
InfiniteScrollingContainer* _artists;
|
||||
InfiniteScrollingContainer* _releases;
|
||||
InfiniteScrollingContainer* _tracks;
|
||||
|
||||
std::vector<InfiniteScrollingContainer*> _results;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user