From c0ef664061bff5516031607676022cfb9d4941be Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 27 Apr 2020 14:50:18 +0200 Subject: [PATCH 1/8] Fixed a bug when the playqueue is emptied (by a rescan for example) and repeat all is active --- src/lms/ui/PlayQueueView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lms/ui/PlayQueueView.cpp b/src/lms/ui/PlayQueueView.cpp index b634429d..34c82186 100644 --- a/src/lms/ui/PlayQueueView.cpp +++ b/src/lms/ui/PlayQueueView.cpp @@ -224,7 +224,7 @@ PlayQueue::loadTrack(std::size_t pos, bool play) // If out of range, stop playing if (pos >= tracklist->getCount()) { - if (!_repeatAll) + if (!_repeatAll || tracklist->getCount() == 0) { stop(); return; From 6c1a7863ebc8a9803c7d2859fd5b83dc9c4b8459 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 27 Apr 2020 14:58:12 +0200 Subject: [PATCH 2/8] Recycled the default cover cache to cache any cover (cache is still small to fit on devices that have small RAM constraints) --- src/libs/cover/impl/CoverArtGrabber.cpp | 105 +++++++++++------- src/libs/cover/impl/CoverArtGrabber.hpp | 65 +++++++++-- .../cover/include/cover/ICoverArtGrabber.hpp | 2 + src/lms/main.cpp | 9 +- 4 files changed, 132 insertions(+), 49 deletions(-) diff --git a/src/libs/cover/impl/CoverArtGrabber.cpp b/src/libs/cover/impl/CoverArtGrabber.cpp index 8646d8bf..efd1c73c 100644 --- a/src/libs/cover/impl/CoverArtGrabber.cpp +++ b/src/libs/cover/impl/CoverArtGrabber.cpp @@ -26,6 +26,7 @@ #include "database/Track.hpp" #include "utils/Logger.hpp" +#include "utils/Random.hpp" namespace { @@ -52,37 +53,11 @@ Grabber::Grabber(const std::filesystem::path& execPath) void Grabber::setDefaultCover(const std::filesystem::path& p) { - std::unique_lock lock {_mutex}; - _defaultCover = std::make_unique(); if (!_defaultCover->load(p)) throw LmsException("Cannot read default cover file '" + p.string() + "'"); } -Image -Grabber::getDefaultCover(std::size_t size) -{ - LMS_LOG(COVER, DEBUG) << "Getting a default cover using size = " << size; - std::unique_lock lock {_mutex}; - - auto it = _defaultCovers.find(size); - if (it == _defaultCovers.end()) - { - Image cover = *_defaultCover; - - LMS_LOG(COVER, DEBUG) << "default cover size = " << cover.getSize().width << " x " << cover.getSize().height; - - LMS_LOG(COVER, DEBUG) << "Scaling cover to size = " << size; - cover.scale(Geometry{size, size}); - LMS_LOG(COVER, DEBUG) << "Scaling DONE"; - auto res = _defaultCovers.insert(std::make_pair(size, cover)); - assert(res.second); - it = res.first; - } - - return it->second; -} - static std::optional getFromAvMediaFile(const Av::MediaFile& input) { @@ -173,7 +148,11 @@ Grabber::getFromTrack(Database::Session& dbSession, Database::IdType trackId, st { using namespace Database; - std::optional cover; + const CacheEntryDesc cacheEntryDesc {CacheEntryDesc::Type::Track, trackId, size}; + std::optional cover {loadFromCache(cacheEntryDesc)}; + + if (cover) + return *cover; bool hasCover {}; bool isMultiDisc {}; @@ -182,7 +161,7 @@ Grabber::getFromTrack(Database::Session& dbSession, Database::IdType trackId, st { auto transaction {dbSession.createSharedTransaction()}; - Track::pointer track = Track::getById(dbSession, trackId); + const Track::pointer track {Track::getById(dbSession, trackId)}; if (track) { hasCover = track->hasCover(); @@ -207,9 +186,11 @@ Grabber::getFromTrack(Database::Session& dbSession, Database::IdType trackId, st } if (!cover) - cover = getDefaultCover(size); - else - cover->scale(Geometry {size, size}); + cover = *_defaultCover; + + cover->scale(Geometry {size, size}); + + saveToCache(cacheEntryDesc, *cover); return *cover; } @@ -218,32 +199,53 @@ Grabber::getFromTrack(Database::Session& dbSession, Database::IdType trackId, st Image Grabber::getFromRelease(Database::Session& session, Database::IdType releaseId, std::size_t size) { - std::optional cover; + const CacheEntryDesc cacheEntryDesc {CacheEntryDesc::Type::Release, releaseId, size}; + std::optional cover {loadFromCache(cacheEntryDesc)}; + + if (cover) + return *cover; std::optional trackId; { auto transaction {session.createSharedTransaction()}; - auto release {Database::Release::getById(session, releaseId)}; + const auto release {Database::Release::getById(session, releaseId)}; if (release) { - auto tracks {release->getTracks()}; + const auto tracks {release->getTracks()}; if (!tracks.empty()) trackId = tracks.front().id(); } } if (trackId) - return getFromTrack(session, *trackId, size); - - if (!cover) - cover = getDefaultCover(size); + { + cover = getFromTrack(session, *trackId, size); + } else + { + if (!cover) + cover = *_defaultCover; + cover->scale(Geometry {size, size}); + } + + saveToCache(cacheEntryDesc, *cover); return *cover; } +void +Grabber::flushCache() +{ + std::unique_lock lock {_cacheMutex}; + + LMS_LOG(COVER, DEBUG) << "Cache stats: hits = " << _cacheHits << ", misses = " << _cacheMisses; + _cacheHits = 0; + _cacheMisses = 0; + _cache.clear(); +} + std::vector Grabber::getFromTrack(Database::Session& session, Database::IdType trackId, Format format, std::size_t width) { @@ -262,5 +264,32 @@ Grabber::getFromRelease(Database::Session& session, Database::IdType releaseId, return cover.save(format); } +void +Grabber::saveToCache(const CacheEntryDesc& entryDesc, const Image& image) +{ + std::unique_lock lock {_cacheMutex}; + + if (_cache.size() >= _maxCacheEntries) + _cache.erase(Random::pickRandom(_cache)); + + _cache[entryDesc] = image; +} + +std::optional +Grabber::loadFromCache(const CacheEntryDesc& entryDesc) +{ + std::shared_lock lock {_cacheMutex}; + + auto it {_cache.find(entryDesc)}; + if (it == std::cend(_cache)) + { + ++_cacheMisses; + return std::nullopt; + } + + ++_cacheHits; + return it->second; +} + } // namespace CoverArt diff --git a/src/libs/cover/impl/CoverArtGrabber.hpp b/src/libs/cover/impl/CoverArtGrabber.hpp index df932315..1e6df791 100644 --- a/src/libs/cover/impl/CoverArtGrabber.hpp +++ b/src/libs/cover/impl/CoverArtGrabber.hpp @@ -20,10 +20,10 @@ #pragma once #include -#include -#include +#include #include #include +#include #include "cover/ICoverArtGrabber.hpp" #include "database/Types.hpp" @@ -36,7 +36,48 @@ namespace Database namespace CoverArt { + struct CacheEntryDesc + { + enum class Type + { + Track, + Release, + }; + Type type; + Database::IdType id; + std::size_t size; + + bool operator==(const CacheEntryDesc& other) const + { + return type == other.type + && id == other.id + && size == other.size; + } + }; + +} // ns CoverArt + +namespace std +{ + + template<> + class hash + { + public: + size_t operator()(const CoverArt::CacheEntryDesc& e) const + { + size_t h = std::hash()(static_cast(e.type)); + h ^= std::hash()(e.id) << 1; + h ^= std::hash()(e.size) << 1; + return h; + } + }; + +} // ns std + +namespace CoverArt +{ class Grabber : public IGrabber { public: @@ -47,12 +88,14 @@ namespace CoverArt Grabber(Grabber&&) = delete; Grabber& operator=(Grabber&&) = delete; + private: + void setDefaultCover(const std::filesystem::path& defaultCoverPath) override; std::vector getFromTrack(Database::Session& dbSession, Database::IdType trackId, Format format, std::size_t width) override; std::vector getFromRelease(Database::Session& dbSession, Database::IdType releaseId, Format format, std::size_t width) override; + void flushCache() override; - private: Image getFromTrack(Database::Session& dbSession, Database::IdType trackId, std::size_t size); Image getFromRelease(Database::Session& dbSession, Database::IdType releaseId, std::size_t size); @@ -60,14 +103,20 @@ namespace CoverArt std::optional getFromTrack(const std::filesystem::path& path) const; std::vector getCoverPaths(const std::filesystem::path& directoryPath) const; std::optional getFromDirectory(const std::filesystem::path& path) const; - Image getDefaultCover(std::size_t size); - std::mutex _mutex; - std::unique_ptr _defaultCover; - std::map _defaultCovers; + std::unique_ptr _defaultCover; // unique_ptr to defer initializing + std::shared_mutex _cacheMutex; + std::unordered_map _cache; + std::size_t _cacheMisses {}; + std::size_t _cacheHits {}; + + void saveToCache(const CacheEntryDesc& entryDesc, const Image& image); + std::optional loadFromCache(const CacheEntryDesc& entryDesc); + + static inline constexpr std::size_t _maxCacheEntries {300}; static inline const std::vector _fileExtensions {".jpg", ".jpeg", ".png", ".bmp"}; // TODO parametrize - static inline const std::size_t _maxFileSize {10000000}; + static inline constexpr std::size_t _maxFileSize {10000000}; static inline const std::vector _preferredFileNames {"cover", "front"}; // TODO parametrize }; diff --git a/src/libs/cover/include/cover/ICoverArtGrabber.hpp b/src/libs/cover/include/cover/ICoverArtGrabber.hpp index c62e3955..e9cda763 100644 --- a/src/libs/cover/include/cover/ICoverArtGrabber.hpp +++ b/src/libs/cover/include/cover/ICoverArtGrabber.hpp @@ -40,6 +40,8 @@ class IGrabber virtual std::vector getFromTrack(Database::Session& dbSession, Database::IdType trackId, Format format, std::size_t width) = 0; virtual std::vector getFromRelease(Database::Session& dbSession, Database::IdType releaseId, Format format, std::size_t width) = 0; + + virtual void flushCache() = 0; }; std::unique_ptr createGrabber(const std::filesystem::path& execPath); diff --git a/src/lms/main.cpp b/src/lms/main.cpp index bbaa1985..0911e8db 100644 --- a/src/lms/main.cpp +++ b/src/lms/main.cpp @@ -148,6 +148,9 @@ int main(int argc, char* argv[]) Scanner::IMediaScanner& mediaScanner {ServiceProvider::assign(Scanner::createMediaScanner(database))}; Recommendation::IEngine& recommendationEngine {ServiceProvider::assign(Recommendation::createEngine(database))}; + CoverArt::IGrabber& coverArtGrabber {ServiceProvider::assign(CoverArt::createGrabber(argv[0]))}; + coverArtGrabber.setDefaultCover(server.appRoot() + "/images/unknown-cover.jpg"); + mediaScanner.scanComplete().connect([&]() { auto status = mediaScanner.getStatus(); @@ -161,11 +164,11 @@ int main(int argc, char* argv[]) { LMS_LOG(MAIN, INFO) << "Scanner did not change files, not reloading the recommendation engine..."; } + // Flush cover cache even if no changes: + // covers may be external files that changed and we don't keep track of them + coverArtGrabber.flushCache(); }); - CoverArt::IGrabber& coverArtGrabber {ServiceProvider::assign(CoverArt::createGrabber(argv[0]))}; - coverArtGrabber.setDefaultCover(server.appRoot() + "/images/unknown-cover.jpg"); - API::Subsonic::SubsonicResource subsonicResource {database}; // bind API resources From 9edad1314ee4fbd5c56768396cdf24406544d433 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 2 May 2020 14:34:40 +0200 Subject: [PATCH 3/8] Use the last modified file attribute in order to display recently added items. fixes #51 --- src/libs/database/impl/Artist.cpp | 6 +++--- src/libs/database/impl/Release.cpp | 6 +++--- src/libs/database/impl/Track.cpp | 6 +++--- src/libs/database/include/database/Artist.hpp | 2 +- src/libs/database/include/database/Release.hpp | 2 +- src/libs/database/include/database/Track.hpp | 2 +- src/libs/subsonic/impl/SubsonicResource.cpp | 2 +- src/lms/ui/explore/ArtistsInfoView.cpp | 4 ++-- src/lms/ui/explore/ReleasesInfoView.cpp | 4 ++-- src/lms/ui/explore/TracksInfoView.cpp | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp index 8f310180..cba62539 100644 --- a/src/libs/database/impl/Artist.cpp +++ b/src/libs/database/impl/Artist.cpp @@ -230,13 +230,13 @@ Artist::getByFilter(Session& session, } std::vector -Artist::getLastAdded(Session& session, Wt::WDateTime after, std::optional limit) +Artist::getLastWritten(Session& session, Wt::WDateTime after, std::optional limit) { session.checkSharedLocked(); Wt::Dbo::collection res = session.getDboSession().query("SELECT a from artist a INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id INNER JOIN track t ON t.id = t_a_l.track_id") - .where("t.file_added > ?").bind(after) + .where("t.file_last_write > ?").bind(after) .groupBy("a.id") - .orderBy("t.file_added DESC") + .orderBy("t.file_last_write DESC") .limit(limit ? static_cast(*limit) : -1); return std::vector(res.begin(), res.end()); diff --git a/src/libs/database/impl/Release.cpp b/src/libs/database/impl/Release.cpp index a8535f49..d7c8491b 100644 --- a/src/libs/database/impl/Release.cpp +++ b/src/libs/database/impl/Release.cpp @@ -145,14 +145,14 @@ Release::getAllOrphans(Session& session) } std::vector -Release::getLastAdded(Session& session, const Wt::WDateTime& after, std::optional offset, std::optional limit) +Release::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional offset, std::optional limit) { session.checkSharedLocked(); Wt::Dbo::collection res = session.getDboSession().query("SELECT r from release r INNER JOIN track t ON r.id = t.release_id") - .where("t.file_added > ?").bind(after) + .where("t.file_last_write > ?").bind(after) .groupBy("r.id") - .orderBy("t.file_added DESC") + .orderBy("t.file_last_write DESC") .offset(offset ? static_cast(*offset) : -1) .limit(limit ? static_cast(*limit) : -1); diff --git a/src/libs/database/impl/Track.cpp b/src/libs/database/impl/Track.cpp index f0deedab..cc286ee0 100644 --- a/src/libs/database/impl/Track.cpp +++ b/src/libs/database/impl/Track.cpp @@ -147,13 +147,13 @@ Track::getMBIDDuplicates(Session& session) } std::vector -Track::getLastAdded(Session& session, const Wt::WDateTime& after, std::optional limit) +Track::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional limit) { session.checkSharedLocked(); Wt::Dbo::collection res = session.getDboSession().find() - .where("file_added > ?").bind(after) - .orderBy("file_added DESC") + .where("file_last_write > ?").bind(after) + .orderBy("file_last_write DESC") .limit(limit ? static_cast(*limit) : -1); return std::vector(res.begin(), res.end()); diff --git a/src/libs/database/include/database/Artist.hpp b/src/libs/database/include/database/Artist.hpp index f6f5df7b..f29d4637 100644 --- a/src/libs/database/include/database/Artist.hpp +++ b/src/libs/database/include/database/Artist.hpp @@ -77,7 +77,7 @@ class Artist : public Wt::Dbo::Dbo static std::vector getAll(Session& session, SortMethod sortMethod, std::optional offset = {}, std::optional size = {}); static std::vector getAllIds(Session& session); static std::vector getAllOrphans(Session& session); // No track related - static std::vector getLastAdded(Session& session, Wt::WDateTime after, std::optional size = {}); + static std::vector getLastWritten(Session& session, Wt::WDateTime after, std::optional size = {}); static std::vector getAllIdsWithClusters(Session& session, std::optional limit = {}); // Accessors diff --git a/src/libs/database/include/database/Release.hpp b/src/libs/database/include/database/Release.hpp index 29b93c58..7b61148b 100644 --- a/src/libs/database/include/database/Release.hpp +++ b/src/libs/database/include/database/Release.hpp @@ -56,7 +56,7 @@ class Release : public Wt::Dbo::Dbo static std::vector getAllIds(Session& session); static std::vector getAllOrderedByArtist(Session& session, std::optional offset = {}, std::optional size = {}); static std::vector getAllRandom(Session& session, std::optional size = {}); - static std::vector getLastAdded(Session& session, const Wt::WDateTime& after, std::optional offset = {}, std::optional size = {}); + static std::vector getLastWritten(Session& session, const Wt::WDateTime& after, std::optional offset = {}, std::optional size = {}); static std::vector getByYear(Session& session, int yearFrom, int yearTo, std::optional offset = {}, std::optional size = {}); static std::vector getByClusters(Session& session, const std::set& clusters); diff --git a/src/libs/database/include/database/Track.hpp b/src/libs/database/include/database/Track.hpp index 9dbd4083..4a83f560 100644 --- a/src/libs/database/include/database/Track.hpp +++ b/src/libs/database/include/database/Track.hpp @@ -77,7 +77,7 @@ class Track : public Wt::Dbo::Dbo static std::vector getAllIds(Session& session); static std::vector> getAllPaths(Session& session, std::optional offset = std::nullopt, std::optional size = std::nullopt); static std::vector getMBIDDuplicates(Session& session); - static std::vector getLastAdded(Session& session, const Wt::WDateTime& after, std::optional size = 1); + static std::vector getLastWritten(Session& session, const Wt::WDateTime& after, std::optional size = 1); static std::vector getAllWithMBIDAndMissingFeatures(Session& session); static std::vector getAllIdsWithFeatures(Session& session, std::optional limit = {}); static std::vector getAllIdsWithClusters(Session& session, std::optional limit = {}); diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index b34211a9..bab3fa94 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -696,7 +696,7 @@ handleGetAlbumListRequestCommon(const RequestContext& context, bool id3) else if (type == "newest") { auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)}; - releases = Release::getLastAdded(context.dbSession, after, offset, size); + releases = Release::getLastWritten(context.dbSession, after, offset, size); } else if (type == "alphabeticalByName") { diff --git a/src/lms/ui/explore/ArtistsInfoView.cpp b/src/lms/ui/explore/ArtistsInfoView.cpp index e9181a64..ac0dd65d 100644 --- a/src/lms/ui/explore/ArtistsInfoView.cpp +++ b/src/lms/ui/explore/ArtistsInfoView.cpp @@ -57,10 +57,10 @@ ArtistsInfo::ArtistsInfo() void ArtistsInfo::refreshRecentlyAdded() { - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6); auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const std::vector artists {Artist::getLastAdded(LmsApp->getDbSession(), after, 5)}; + const std::vector artists {Artist::getLastWritten(LmsApp->getDbSession(), after, 5)}; _recentlyAddedContainer->clear(); for (const Database::Artist::pointer& artist : artists) diff --git a/src/lms/ui/explore/ReleasesInfoView.cpp b/src/lms/ui/explore/ReleasesInfoView.cpp index 0693cc32..f5690ec8 100644 --- a/src/lms/ui/explore/ReleasesInfoView.cpp +++ b/src/lms/ui/explore/ReleasesInfoView.cpp @@ -58,11 +58,11 @@ ReleasesInfo::ReleasesInfo() void ReleasesInfo::refreshRecentlyAdded() { - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1); + auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6); auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto releases {Release::getLastAdded(LmsApp->getDbSession(), after, 0, 5)}; + const auto releases {Release::getLastWritten(LmsApp->getDbSession(), after, 0, 5)}; _recentlyAddedContainer->clear(); for (const Database::Release::pointer& release : releases) diff --git a/src/lms/ui/explore/TracksInfoView.cpp b/src/lms/ui/explore/TracksInfoView.cpp index d05cc200..b4907003 100644 --- a/src/lms/ui/explore/TracksInfoView.cpp +++ b/src/lms/ui/explore/TracksInfoView.cpp @@ -74,10 +74,10 @@ TracksInfo::TracksInfo() void TracksInfo::refreshRecentlyAdded() { - const auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-1)}; + const auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)}; auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto tracks {Track::getLastAdded(LmsApp->getDbSession(), after, 5)}; + const auto tracks {Track::getLastWritten(LmsApp->getDbSession(), after, 5)}; _recentlyAddedContainer->clear(); addEntries(_recentlyAddedContainer, tracks); From d6a60c662870e9decda1a547e427fcf525c50270 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 2 May 2020 15:43:37 +0200 Subject: [PATCH 4/8] Cleanup (spotted using codefactor.io) --- README.md | 2 +- docroot/css/lms.css | 64 ++++++++++++++++++++------------------------- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 40145c8a..e293642b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # LMS - Lightweight Music Server -[![Build Status](https://travis-ci.org/epoupon/lms.svg?branch=master)](https://travis-ci.org/epoupon/lms) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/epoupon/lms) +[![Build Status](https://travis-ci.org/epoupon/lms.svg?branch=master)](https://travis-ci.org/epoupon/lms) ![GitHub release (latest by date)](https://img.shields.io/github/v/release/epoupon/lms) [![CodeFactor](https://www.codefactor.io/repository/github/epoupon/lms/badge/master)](https://www.codefactor.io/repository/github/epoupon/lms/overview/master) _LMS_ is a self-hosted music streaming software: access your music collection from anywhere using a web interface! diff --git a/docroot/css/lms.css b/docroot/css/lms.css index b0735192..938203f8 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -27,7 +27,7 @@ a, a:link, a:active, a:visited { min-height: 48px; padding-top: 8px; padding-bottom: 8px; - margin: 0px; + margin: 0; } .Lms-admin-users-add-btn { @@ -75,24 +75,24 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-cover-smaller { width: 64px; /* some cover may not be square */ border-radius: 3px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } .Lms-cover-small { width: 96px; /* some cover may not be square */ border-radius: 3px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } .Lms-cover-medium { width: 128px; border-radius: 3px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } .Lms-cover-large { border-radius: 3px; - box-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4); + box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } .Lms-entry-playing { @@ -155,7 +155,7 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { } .Lms-explore-releaselink { - margin: 0px; + margin: 0; padding-top: 4px; padding-bottom: 4px; } @@ -179,7 +179,7 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-explore-artistlink { min-height: 28px; - margin: 0px; + margin: 0; } .Lms-explore-tracks-entry { @@ -212,11 +212,11 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-explore-tracksinfo-entry { min-height: 28px; - margin: 0px; + margin: 0; } .Lms-navbar { - border-radius: 0px; + border-radius: 0; } .Lms-playqueue-btn { @@ -270,7 +270,7 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-playhistory-entry { min-height: 32px; - margin-bottom: 0px; + margin-bottom: 0; } .Lms-playhistory-entry-name { @@ -284,8 +284,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { bottom: 0; width: 100%; height: 70px; - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; background-color: var(--player-background-color); } @@ -329,8 +329,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-player-seek::-webkit-slider-thumb { -webkit-appearance: none; -moz-appearance: none; - height: 0px; - width: 0px; + height: 0; + width: 0; } .Lms-player-seek-container { @@ -344,8 +344,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-player-seek-common { position: absolute; width:100%; - top: 0px; - left: 0px; + top: 0; + left: 0; height: 8px; border-radius: 3px; } @@ -353,8 +353,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { .Lms-player-seek::-moz-range-thumb { -webkit-appearance: none; -moz-appearance: none; - height: 0px; - width: 0px; + height: 0; + width: 0; } .Lms-player-text-center { @@ -375,22 +375,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { display: flex; } -.Lms-player-volume-slider::-webkit-slider-thumb { - background-color: var(--body-color); -} - -.Lms-player-volume-slider::-webkit-slider-thumb:hover { - background-color: var(--hover-color); -} - -.Lms-player-volume-slider::-moz-range-thumb { - background-color: var(--body-color); -} - -.Lms-player-volume-slider::-moz-range-thumb:hover { - background-color: var(--hover-color); -} - .Lms-player-volume-slider { -webkit-appearance: none; appearance: none; @@ -405,19 +389,29 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { } .Lms-player-volume-slider::-webkit-slider-thumb { - -webkit-appearance: none; /* Override default look */ + -webkit-appearance: none; + background-color: var(--body-color); appearance: none; width: 14px; height: 14px; border-radius: 7px; } +.Lms-player-volume-slider::-webkit-slider-thumb:hover { + background-color: var(--hover-color); +} + .Lms-player-volume-slider::-moz-range-thumb { + background-color: var(--body-color); width: 14px; height: 14px; border-radius: 7px; } +.Lms-player-volume-slider::-moz-range-thumb:hover { + background-color: var(--hover-color); +} + .Lms-player-volume-slider-container { display: inline-block; width: 85px; From e69c4038ac5d8ab60d025f8981f44db802d16127 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 2 May 2020 16:03:29 +0200 Subject: [PATCH 5/8] Add a hint for files that are going to be transcoded. ref #53 --- src/libs/subsonic/impl/SubsonicResource.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index bab3fa94..df58215f 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -263,6 +263,22 @@ getTrackPath(const Track::pointer& track) return path; } +static +std::string_view +formatToSuffix(AudioFormat format) +{ + switch (format) + { + case AudioFormat::MP3: return "mp3"; + case AudioFormat::OGG_OPUS: return "opus"; + case AudioFormat::MATROSKA_OPUS: return "mka"; + case AudioFormat::OGG_VORBIS: return "ogg"; + case AudioFormat::WEBM_VORBIS: return "webm"; + } + + return ""; +} + static Response::Node trackToResponseNode(const Track::pointer& track, Session& dbSession, const User::pointer& user) @@ -293,6 +309,9 @@ trackToResponseNode(const Track::pointer& track, Session& dbSession, const User: trackResponse.setAttribute("suffix", extension.string().substr(1)); } + if (user->getSubsonicTranscodeEnable()) + trackResponse.setAttribute("transcodeSuffix", formatToSuffix(user->getSubsonicTranscodeFormat())); + trackResponse.setAttribute("coverArt", IdToString({Id::Type::Track, track.id()})); auto artists {track->getArtists()}; From 8277b9c82ba03154242185867fb7860e59c5d7df Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 2 May 2020 20:46:18 +0200 Subject: [PATCH 6/8] Corrected typo. fixes #53 --- src/libs/subsonic/impl/SubsonicResource.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index df58215f..39e38f40 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -310,7 +310,7 @@ trackToResponseNode(const Track::pointer& track, Session& dbSession, const User: } if (user->getSubsonicTranscodeEnable()) - trackResponse.setAttribute("transcodeSuffix", formatToSuffix(user->getSubsonicTranscodeFormat())); + trackResponse.setAttribute("transcodedSuffix", formatToSuffix(user->getSubsonicTranscodeFormat())); trackResponse.setAttribute("coverArt", IdToString({Id::Type::Track, track.id()})); From 74fc4e058e3b88faa13844c40b735aee20d9fa4b Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 10 May 2020 13:11:43 +0200 Subject: [PATCH 7/8] New UI layout and UI improvements. Fixes #50 --- approot/admin-users.xml | 2 +- approot/artist.xml | 20 +- approot/artistinfo.xml | 10 - approot/artistlink.xml | 13 - approot/artists.xml | 23 +- approot/artistsinfo.xml | 12 - approot/explore.xml | 13 +- approot/messages.xml | 32 +- approot/messages_fr.xml | 29 +- approot/playhistory.xml | 45 -- approot/playqueue.xml | 4 +- approot/release.xml | 33 +- approot/releaseinfo.xml | 15 - approot/releaselink.xml | 23 - approot/releases.xml | 30 +- approot/releasesinfo.xml | 12 - approot/search.xml | 42 ++ approot/templates.xml | 49 +- approot/tracks.xml | 13 +- docroot/css/lms.css | 84 ++- docroot/js/collapse.js | 211 ++++++++ docroot/js/dropdown.js | 165 ++++++ docroot/js/transition.js | 59 +++ src/libs/cover/impl/CoverArtGrabber.hpp | 6 +- src/libs/database/impl/Artist.cpp | 218 +++++--- src/libs/database/impl/Db.cpp | 20 +- src/libs/database/impl/Release.cpp | 158 +++--- src/libs/database/impl/Session.cpp | 1 + src/libs/database/impl/Track.cpp | 155 +++--- src/libs/database/impl/TrackList.cpp | 273 ++++++++-- src/libs/database/include/database/Artist.hpp | 15 +- src/libs/database/include/database/Db.hpp | 26 +- .../database/include/database/Release.hpp | 10 +- src/libs/database/include/database/Track.hpp | 10 +- .../database/include/database/TrackList.hpp | 12 +- src/libs/database/include/database/Types.hpp | 9 +- src/libs/subsonic/impl/SubsonicResource.cpp | 26 +- src/libs/utils/impl/Random.cpp | 7 +- src/libs/utils/include/utils/Random.hpp | 2 + src/lms/CMakeLists.txt | 11 +- src/lms/main.cpp | 15 +- src/lms/ui/LmsApplication.cpp | 136 ++--- src/lms/ui/LmsTheme.cpp | 29 +- src/lms/ui/LmsTheme.hpp | 1 - src/lms/ui/MediaPlayer.cpp | 10 + src/lms/ui/PlayHistoryView.cpp | 132 ----- src/lms/ui/common/ValueStringModel.hpp | 4 +- src/lms/ui/explore/ArtistInfoView.cpp | 81 --- src/lms/ui/explore/ArtistInfoView.hpp | 39 -- .../{ArtistLink.cpp => ArtistListHelpers.cpp} | 30 +- .../{ArtistLink.hpp => ArtistListHelpers.hpp} | 21 +- src/lms/ui/explore/ArtistView.cpp | 162 +++--- src/lms/ui/explore/ArtistView.hpp | 19 +- src/lms/ui/explore/ArtistsInfoView.cpp | 83 --- src/lms/ui/explore/ArtistsInfoView.hpp | 41 -- src/lms/ui/explore/ArtistsView.cpp | 162 ++++-- src/lms/ui/explore/ArtistsView.hpp | 49 +- src/lms/ui/explore/Explore.cpp | 69 +-- src/lms/ui/explore/Explore.hpp | 4 +- src/lms/ui/explore/Filters.cpp | 6 +- src/lms/ui/explore/ReleaseInfoView.cpp | 116 ----- src/lms/ui/explore/ReleaseInfoView.hpp | 39 -- src/lms/ui/explore/ReleaseLink.cpp | 63 --- src/lms/ui/explore/ReleaseListHelpers.cpp | 68 +++ ...ReleaseLink.hpp => ReleaseListHelpers.hpp} | 16 +- src/lms/ui/explore/ReleaseView.cpp | 99 +++- src/lms/ui/explore/ReleaseView.hpp | 38 +- src/lms/ui/explore/ReleasesInfoView.cpp | 85 ---- src/lms/ui/explore/ReleasesInfoView.hpp | 41 -- src/lms/ui/explore/ReleasesView.cpp | 233 ++++++--- src/lms/ui/explore/ReleasesView.hpp | 44 +- src/lms/ui/explore/SearchView.cpp | 183 +++++++ .../SearchView.hpp} | 25 +- src/lms/ui/explore/TracksInfoView.cpp | 97 ---- src/lms/ui/explore/TracksInfoView.hpp | 41 -- src/lms/ui/explore/TracksView.cpp | 286 +++++++---- src/lms/ui/explore/TracksView.hpp | 45 +- src/test/database/DatabaseTest.cpp | 478 +++++++++++++++--- src/tools/metadata/LmsMetadata.cpp | 2 +- 79 files changed, 3003 insertions(+), 1987 deletions(-) delete mode 100644 approot/artistinfo.xml delete mode 100644 approot/artistlink.xml delete mode 100644 approot/artistsinfo.xml delete mode 100644 approot/playhistory.xml delete mode 100644 approot/releaseinfo.xml delete mode 100644 approot/releaselink.xml delete mode 100644 approot/releasesinfo.xml create mode 100644 approot/search.xml create mode 100755 docroot/js/collapse.js create mode 100755 docroot/js/dropdown.js create mode 100755 docroot/js/transition.js delete mode 100644 src/lms/ui/PlayHistoryView.cpp delete mode 100644 src/lms/ui/explore/ArtistInfoView.cpp delete mode 100644 src/lms/ui/explore/ArtistInfoView.hpp rename src/lms/ui/explore/{ArtistLink.cpp => ArtistListHelpers.cpp} (52%) rename src/lms/ui/explore/{ArtistLink.hpp => ArtistListHelpers.hpp} (68%) delete mode 100644 src/lms/ui/explore/ArtistsInfoView.cpp delete mode 100644 src/lms/ui/explore/ArtistsInfoView.hpp delete mode 100644 src/lms/ui/explore/ReleaseInfoView.cpp delete mode 100644 src/lms/ui/explore/ReleaseInfoView.hpp delete mode 100644 src/lms/ui/explore/ReleaseLink.cpp create mode 100644 src/lms/ui/explore/ReleaseListHelpers.cpp rename src/lms/ui/explore/{ReleaseLink.hpp => ReleaseListHelpers.hpp} (77%) delete mode 100644 src/lms/ui/explore/ReleasesInfoView.cpp delete mode 100644 src/lms/ui/explore/ReleasesInfoView.hpp create mode 100644 src/lms/ui/explore/SearchView.cpp rename src/lms/ui/{PlayHistoryView.hpp => explore/SearchView.hpp} (68%) delete mode 100644 src/lms/ui/explore/TracksInfoView.cpp delete mode 100644 src/lms/ui/explore/TracksInfoView.hpp diff --git a/approot/admin-users.xml b/approot/admin-users.xml index 3e27948c..8407e944 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -2,7 +2,7 @@ -
+

${tr:Lms.Admin.Users.users}

${users} diff --git a/approot/artist.xml b/approot/artist.xml index 41c5e32f..766fb397 100644 --- a/approot/artist.xml +++ b/approot/artist.xml @@ -3,12 +3,22 @@ -
-

${name}

- ${clusters} - ${play-btn}${add-btn} +
+
+
+

${name}

+ ${clusters} + ${play-btn}${add-btn} +
+ ${releases class="Lms-explore-artist-entries-container"} +
+
+
+

${tr:Lms.Explore.Artist.similar-artists}

+ ${similar-artists} +
+
- ${releases} diff --git a/approot/artistinfo.xml b/approot/artistinfo.xml deleted file mode 100644 index 4e442180..00000000 --- a/approot/artistinfo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - -

${tr:Lms.Explore.ArtistInfo.similar-artists}

- ${similar-artists} - - - diff --git a/approot/artistlink.xml b/approot/artistlink.xml deleted file mode 100644 index 0bb277de..00000000 --- a/approot/artistlink.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - -
-
- ${name class="Lms-artistname text-primary"} -
-
- - - diff --git a/approot/artists.xml b/approot/artists.xml index eb42b80e..333e0ca8 100644 --- a/approot/artists.xml +++ b/approot/artists.xml @@ -3,21 +3,14 @@ -
+

${tr:Lms.Explore.artists}

-
-
-
-
+ ${mode class="nav nav-pills Lms-explore-mode-container"} +
+
${link-type}
-
-
- - ${search} -
-
${artists}
@@ -35,4 +28,12 @@
+ +
+
+ ${name class="Lms-artistname text-primary"} +
+
+ + diff --git a/approot/artistsinfo.xml b/approot/artistsinfo.xml deleted file mode 100644 index 5a6e33dd..00000000 --- a/approot/artistsinfo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -

${tr:Lms.Explore.ArtistsInfo.most-played}

- ${most-played} -

${tr:Lms.Explore.ArtistsInfo.recently-added}

- ${recently-added} - - - diff --git a/approot/explore.xml b/approot/explore.xml index 6fa8c947..2cd86c7c 100644 --- a/approot/explore.xml +++ b/approot/explore.xml @@ -2,23 +2,14 @@ -
-
- ${contents class="Lms-explore-contents"} -
-
- ${filters class="well well-sm"} - ${info class="well well-sm"} -
-
+ ${contents class="Lms-explore-contents"} -

${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}

- ${clusters} + ${add-filter class="btn-sm btn-info"} ${clusters class="Lms-explore-clusters"} diff --git a/approot/messages.xml b/approot/messages.xml index e6746547..8aa13f70 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -4,13 +4,13 @@ Add +Administration Apply Discard -Administration Cancel Create Login -Logout + Logout Not a directory Password Bad login / password combination @@ -23,6 +23,7 @@ Are you sure? Another session has been open. Reopen this one? Save +User Artist not found @@ -37,6 +38,7 @@ Music collection Scan now! Monthly + Music collection Never Media root directory Recommendation engine @@ -77,6 +79,7 @@ Demo Edit Users + Users Audio transcode bitrate limit @@ -100,11 +103,15 @@ Add filter +All Artists Filter added Filters +Most played +Random +Recently added +Recently played Albums -Search... Show more Tracks Type @@ -112,28 +119,21 @@ Various artists -Similar artists +Similar artists All artists Track artists Album artists -Recently added -Top artists -Similar albums +Similar albums Copyright Disc {1} - -Recently added -Top albums - - -Recently added -Top tracks - + +Search... +Search results Clear @@ -162,6 +162,7 @@ Change password Dark mode Cannot save using a demo account! + Settings Bad password Old password must be filled in ReplayGain mode @@ -188,7 +189,6 @@ Always Only when format is not supported Never -Settings New settings saved! diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 1890750c..0d5a4cbe 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -4,13 +4,13 @@ Ajouter +Administration Appliquer Annuler -Administration Annuler Créer Login -Logout + Quitter N'est pas un répertoire Mot de passe Mauvaise combinaison login / mot de passe @@ -23,6 +23,7 @@ Êtes-vous sûr ? Une autre session a été ouverte. Reouvrir celle-ci ? Sauvegarder +Utilisateur Cet artiste n'existe pas @@ -37,6 +38,7 @@ Collection de musiques Scanner maintenant ! Tous les mois + Collection de musiques Jamais Dossier racine des fichiers de musique Moteur de recommandation @@ -77,6 +79,7 @@ Demo Editer Utilisateurs + Utilisateurs Limite du bitrate pour le transcodage @@ -100,11 +103,15 @@ Ajouter filtre +Tous Artistes Filtre ajouté Filtres +Plus joués +Aléatoire +Ajoutés récemment +Joués récemment Albums -Rechercher... Voir plus Pistes Type @@ -112,28 +119,21 @@ Artistes divers -Artistes similaires +Artistes similaires Tous les artistes Artistes de piste Artistes d'album -Ajouts récents -Artistes populaires Albums similaires Copyright Disque {1} - -Ajouts récents -Albums populaires - - -Ajouts récents -Pistes populaires - + +Rechercher... +Résultats de la recherche Effacer @@ -162,6 +162,7 @@ Changement de mot de passe Mode sombre Impossible de sauvegarder en utilisant un compte de démo ! + Paramètres Mauvais mot de passe L'ancien mot de passe doit être renseigné Mode ReplayGain diff --git a/approot/playhistory.xml b/approot/playhistory.xml deleted file mode 100644 index 90d46d5d..00000000 --- a/approot/playhistory.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - -
-
-
-

${tr:Lms.PlayHistory.playhistory}

-
- ${entries} -
-
- ${show-more class="btn-primary Lms-show-more"} -
-
-
-
- - - -
-
-
- -
- -

${name}

- ${} - ${}${release class="Lms-releasename text-primary"}${} - ${}${artists}${} - ${} -
-
-
-
- - - - ${artist class="Lms-artistname text-muted"} - - - diff --git a/approot/playqueue.xml b/approot/playqueue.xml index 50ce2b0d..4e89013f 100644 --- a/approot/playqueue.xml +++ b/approot/playqueue.xml @@ -10,7 +10,7 @@
-
+

${tr:Lms.PlayQueue.playqueue}

${clear-btn}${shuffle-btn}${repeat-btn}${radio-btn}

${nb-tracks}

@@ -33,7 +33,7 @@

${name}

diff --git a/approot/release.xml b/approot/release.xml index 3e311468..b2b48c92 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -8,18 +8,31 @@
-
+
${cover class="Lms-explore-release-cover"} -
+
+
+
+

${name}

+ ${}

${artist class="Lms-artistname text-muted"}

${} +
${}${year}${}${} (${orig-year})${}
+ ${clusters} + ${play-btn}${add-btn} +
+ ${container class="Lms-explore-release-entries-container"} +
+
+
+ ${} +

${tr:Lms.Explore.Release.copyright}

+ ${}${copyright}${} + ${}${copyright-url}${} + ${} +

${tr:Lms.Explore.Release.similar-releases}

+ ${similar-releases} +
+
-
-

${name}

- ${}

${artist class="Lms-artistname text-muted"}

${} -
${}${year}${}${} (${orig-year})${}
- ${clusters} - ${play-btn}${add-btn} -
- ${container} diff --git a/approot/releaseinfo.xml b/approot/releaseinfo.xml deleted file mode 100644 index f30c6f5b..00000000 --- a/approot/releaseinfo.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - ${} -

${tr:Lms.Explore.Release.copyright}

- ${}${copyright}${} - ${}${copyright-url}${} - ${} -

${tr:Lms.Explore.ReleaseInfo.similar-releases}

- ${similar-releases} - - - diff --git a/approot/releaselink.xml b/approot/releaselink.xml deleted file mode 100644 index 6c028c21..00000000 --- a/approot/releaselink.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - -
-
-
-
- ${cover class="media-object Lms-cover"} -
-
-
- ${release-name class="Lms-releasename text-primary"} -
- ${}${artist-name class="Lms-artistname text-muted"}${} -
-
-
-
- - - diff --git a/approot/releases.xml b/approot/releases.xml index 9a54f043..d3fce2d0 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -3,16 +3,11 @@ -
+

${tr:Lms.Explore.releases}

+ ${mode class="nav nav-pills Lms-explore-mode-container"} ${play-btn}${add-btn}
-
-
- - ${search} -
-
${releases}
@@ -26,7 +21,7 @@
- ${cover class="media-object Lms-cover"} + ${cover class="media-object Lms-cover Lms-cover-container-medium"}

@@ -40,4 +35,23 @@

+ +
+
+
+
+ ${cover class="media-object Lms-cover Lms-cover-container-smaller"} +
+
+
+ ${release-name class="Lms-releasename text-primary"} +
+ ${}${artist-name class="Lms-artistname text-muted"}${} +
+
+
+
+ + + diff --git a/approot/releasesinfo.xml b/approot/releasesinfo.xml deleted file mode 100644 index 56bf978e..00000000 --- a/approot/releasesinfo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -

${tr:Lms.Explore.ReleasesInfo.most-played}

- ${most-played} -

${tr:Lms.Explore.ReleasesInfo.recently-added}

- ${recently-added} - - - diff --git a/approot/search.xml b/approot/search.xml new file mode 100644 index 00000000..0697b472 --- /dev/null +++ b/approot/search.xml @@ -0,0 +1,42 @@ + + + + + +
+

${tr:Lms.Explore.Search.search}

+
+ ${} +

${tr:Lms.Explore.artists}

+ ${artists} + ${} + ${} +

${tr:Lms.Explore.releases}

+ ${releases} + ${} + ${} +

${tr:Lms.Explore.tracks}

+ ${tracks} + ${} + + + +
+
+
+ +
+

${name}

+ ${} + ${}${release class="Lms-releasename text-primary"}${} + ${}${artists}${} + ${} +
+
+
+
+ + + diff --git a/approot/templates.xml b/approot/templates.xml index bc95730e..78d826d1 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -2,7 +2,54 @@ - ${navbar-top class="Lms-navbar"} +
${contents class="Lms-contents"}
diff --git a/approot/tracks.xml b/approot/tracks.xml index 0890848a..eaf00d79 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -4,19 +4,18 @@ -
+

${tr:Lms.Explore.tracks}

+ ${mode class="nav nav-pills Lms-explore-mode-container"} ${play-btn}${add-btn}
-
-
- - ${search} +
+
+ ${tracks}
- ${tracks}
-
+
${show-more class="btn-primary Lms-show-more"}
diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 938203f8..9f9746d5 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -4,25 +4,15 @@ a, a:link, a:active, a:visited { cursor: pointer; } +body { + padding-bottom: 78px; +} + .Lms-vertical-align { display: flex; align-items: center; } -.Lms-horizontal-center { - display: flex; - justify-content: center; -} - -.Lms-contents { - margin-bottom: 78px; -} - -.Lms-show-more { - margin-top: 8px; - margin-bottom: 8px; -} - .Lms-admin-users-entry { min-height: 48px; padding-top: 8px; @@ -63,6 +53,10 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { filter: brightness(130%); } +.Lms-clusters-control { + margin-top: 4px; +} + .Lms-control-btn:hover { color: var(--hover-color); cursor: pointer; @@ -72,18 +66,27 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { filter: brightness(130%); } +.Lms-cover-container-smaller { +} + .Lms-cover-smaller { - width: 64px; /* some cover may not be square */ + width: 64px; border-radius: 3px; box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } +.Lms-cover-container-small { +} + .Lms-cover-small { - width: 96px; /* some cover may not be square */ + width: 96px; border-radius: 3px; box-shadow: 0 2px 3px rgba(0, 0, 0, 0.4); } +.Lms-cover-container-medium { +} + .Lms-cover-medium { width: 128px; border-radius: 3px; @@ -107,6 +110,10 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { width: 28px; } +.Lms-explore-clusters { + display: inline-block; +} + .Lms-explore-contents { margin-bottom: 24px; } @@ -120,6 +127,10 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { max-width: 100%; } +.Lms-explore-release-entries-container { + margin-bottom: 15px; +} + .Lms-explore-release-entry-tracknumber { text-align: right; white-space: nowrap; @@ -160,12 +171,9 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { padding-bottom: 4px; } -.Lms-explore-artists-entry { - min-height: 48px; -} - -.Lms-explore-artists-entry-name { - font-style: normal; +.Lms-explore-artists-entry-small { + min-height: 28px; + margin: 0; } .Lms-explore-artists-input { @@ -177,9 +185,12 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { padding-bottom: 8px; } -.Lms-explore-artistlink { - min-height: 28px; - margin: 0; +.Lms-explore-artist-entries-container { + margin-bottom: 15px; +} + +.Lms-explore-mode-container { + margin-bottom: 8px; } .Lms-explore-tracks-entry { @@ -215,8 +226,21 @@ a.Lms-artistname:hover, a.Lms-artistname:focus { margin: 0; } -.Lms-navbar { - border-radius: 0; +.Lms-header { + padding-bottom: 9px; + margin-top: 20px; + margin-bottom: 20px; +} + +.Lms-horizontal-center { + display: flex; + justify-content: center; +} + +.Lms-navbar-search { + max-width: 175px; + padding-top: 7.5px; + padding-bottom: 7.5px; } .Lms-playqueue-btn { @@ -426,3 +450,9 @@ a.Lms-releasename:hover, a.Lms-releasename:focus { color: var(--hover-color); } +.Lms-show-more { + margin-top: 8px; + margin-bottom: 8px; +} + + diff --git a/docroot/js/collapse.js b/docroot/js/collapse.js new file mode 100755 index 00000000..9e26465d --- /dev/null +++ b/docroot/js/collapse.js @@ -0,0 +1,211 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.3.6 + * http://getbootstrap.com/javascript/#collapse + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + + '[data-toggle="collapse"][data-target="#' + element.id + '"]') + this.transitioning = null + + if (this.options.parent) { + this.$parent = this.getParent() + } else { + this.addAriaAndCollapsedClass(this.$element, this.$trigger) + } + + if (this.options.toggle) this.toggle() + } + + Collapse.VERSION = '3.3.6' + + Collapse.TRANSITION_DURATION = 350 + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var activesData + var actives = this.$parent && this.$parent.children('.panel').children('.in, .collapsing') + + if (actives && actives.length) { + activesData = actives.data('bs.collapse') + if (activesData && activesData.transitioning) return + } + + var startEvent = $.Event('show.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + if (actives && actives.length) { + Plugin.call(actives, 'hide') + activesData || actives.data('bs.collapse', null) + } + + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + .addClass('collapsing')[dimension](0) + .attr('aria-expanded', true) + + this.$trigger + .removeClass('collapsed') + .attr('aria-expanded', true) + + this.transitioning = 1 + + var complete = function () { + this.$element + .removeClass('collapsing') + .addClass('collapse in')[dimension]('') + this.transitioning = 0 + this.$element + .trigger('shown.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + var scrollSize = $.camelCase(['scroll', dimension].join('-')) + + this.$element + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(Collapse.TRANSITION_DURATION)[dimension](this.$element[0][scrollSize]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + + var startEvent = $.Event('hide.bs.collapse') + this.$element.trigger(startEvent) + if (startEvent.isDefaultPrevented()) return + + var dimension = this.dimension() + + this.$element[dimension](this.$element[dimension]())[0].offsetHeight + + this.$element + .addClass('collapsing') + .removeClass('collapse in') + .attr('aria-expanded', false) + + this.$trigger + .addClass('collapsed') + .attr('aria-expanded', false) + + this.transitioning = 1 + + var complete = function () { + this.transitioning = 0 + this.$element + .removeClass('collapsing') + .addClass('collapse') + .trigger('hidden.bs.collapse') + } + + if (!$.support.transition) return complete.call(this) + + this.$element + [dimension](0) + .one('bsTransitionEnd', $.proxy(complete, this)) + .emulateTransitionEnd(Collapse.TRANSITION_DURATION) + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + Collapse.prototype.getParent = function () { + return $(this.options.parent) + .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]') + .each($.proxy(function (i, element) { + var $element = $(element) + this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element) + }, this)) + .end() + } + + Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) { + var isOpen = $element.hasClass('in') + + $element.attr('aria-expanded', isOpen) + $trigger + .toggleClass('collapsed', !isOpen) + .attr('aria-expanded', isOpen) + } + + function getTargetFromTrigger($trigger) { + var href + var target = $trigger.attr('data-target') + || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7 + + return $(target) + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false + if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + var old = $.fn.collapse + + $.fn.collapse = Plugin + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { + var $this = $(this) + + if (!$this.attr('data-target')) e.preventDefault() + + var $target = getTargetFromTrigger($this) + var data = $target.data('bs.collapse') + var option = data ? 'toggle' : $this.data() + + Plugin.call($target, option) + }) + +}(jQuery); diff --git a/docroot/js/dropdown.js b/docroot/js/dropdown.js new file mode 100755 index 00000000..df6be869 --- /dev/null +++ b/docroot/js/dropdown.js @@ -0,0 +1,165 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.3.6 + * http://getbootstrap.com/javascript/#dropdowns + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle="dropdown"]' + var Dropdown = function (element) { + $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.VERSION = '3.3.6' + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + function clearMenus(e) { + if (e && e.which === 3) return + $(backdrop).remove() + $(toggle).each(function () { + var $this = $(this) + var $parent = getParent($this) + var relatedTarget = { relatedTarget: this } + + if (!$parent.hasClass('open')) return + + if (e && e.type == 'click' && /input|textarea/i.test(e.target.tagName) && $.contains($parent[0], e.target)) return + + $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this.attr('aria-expanded', 'false') + $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget)) + }) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) { + // if mobile we use a backdrop because click events don't delegate + $(document.createElement('div')) + .addClass('dropdown-backdrop') + .insertAfter($(this)) + .on('click', clearMenus) + } + + var relatedTarget = { relatedTarget: this } + $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget)) + + if (e.isDefaultPrevented()) return + + $this + .trigger('focus') + .attr('aria-expanded', 'true') + + $parent + .toggleClass('open') + .trigger($.Event('shown.bs.dropdown', relatedTarget)) + } + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive && e.which != 27 || isActive && e.which == 27) { + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') + } + + var desc = ' li:not(.disabled):visible a' + var $items = $parent.find('.dropdown-menu' + desc) + + if (!$items.length) return + + var index = $items.index(e.target) + + if (e.which == 38 && index > 0) index-- // up + if (e.which == 40 && index < $items.length - 1) index++ // down + if (!~index) index = 0 + + $items.eq(index).trigger('focus') + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + function Plugin(option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.dropdown') + + if (!data) $this.data('bs.dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + var old = $.fn.dropdown + + $.fn.dropdown = Plugin + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown) + +}(jQuery); diff --git a/docroot/js/transition.js b/docroot/js/transition.js new file mode 100755 index 00000000..fae36ed9 --- /dev/null +++ b/docroot/js/transition.js @@ -0,0 +1,59 @@ +/* ======================================================================== + * Bootstrap: transition.js v3.3.6 + * http://getbootstrap.com/javascript/#transitions + * ======================================================================== + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * ======================================================================== */ + + ++function ($) { + 'use strict'; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + WebkitTransition : 'webkitTransitionEnd', + MozTransition : 'transitionend', + OTransition : 'oTransitionEnd otransitionend', + transition : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + + return false // explicit for ie8 ( ._.) + } + + // http://blog.alexmaccaw.com/css-transitions + $.fn.emulateTransitionEnd = function (duration) { + var called = false + var $el = this + $(this).one('bsTransitionEnd', function () { called = true }) + var callback = function () { if (!called) $($el).trigger($.support.transition.end) } + setTimeout(callback, duration) + return this + } + + $(function () { + $.support.transition = transitionEnd() + + if (!$.support.transition) return + + $.event.special.bsTransitionEnd = { + bindType: $.support.transition.end, + delegateType: $.support.transition.end, + handle: function (e) { + if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments) + } + } + }) + +}(jQuery); diff --git a/src/libs/cover/impl/CoverArtGrabber.hpp b/src/libs/cover/impl/CoverArtGrabber.hpp index 1e6df791..a153b8b4 100644 --- a/src/libs/cover/impl/CoverArtGrabber.hpp +++ b/src/libs/cover/impl/CoverArtGrabber.hpp @@ -44,9 +44,9 @@ namespace CoverArt Release, }; - Type type; + Type type; Database::IdType id; - std::size_t size; + std::size_t size; bool operator==(const CacheEntryDesc& other) const { @@ -114,7 +114,7 @@ namespace CoverArt void saveToCache(const CacheEntryDesc& entryDesc, const Image& image); std::optional loadFromCache(const CacheEntryDesc& entryDesc); - static inline constexpr std::size_t _maxCacheEntries {300}; + static inline constexpr std::size_t _maxCacheEntries {1000}; static inline const std::vector _fileExtensions {".jpg", ".jpeg", ".png", ".bmp"}; // TODO parametrize static inline constexpr std::size_t _maxFileSize {10000000}; static inline const std::vector _preferredFileNames {"cover", "front"}; // TODO parametrize diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp index cba62539..22c46d67 100644 --- a/src/libs/database/impl/Artist.cpp +++ b/src/libs/database/impl/Artist.cpp @@ -74,91 +74,133 @@ Artist::create(Session& session, const std::string& name, const std::optional static -Wt::Dbo::Query -getQuery(Session& session, +Wt::Dbo::Query +createQuery(Session& session, + const std::string& queryStr, const std::set& clusterIds, const std::vector& keywords, - std::optional linkType, - Artist::SortMethod sortMethod) + std::optional linkType) { session.checkSharedLocked(); - WhereClause where; + auto query {session.getDboSession().query(queryStr)}; + query.join("track t ON t.id = t_a_l.track_id"); + query.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id"); - std::ostringstream oss; - oss << "SELECT DISTINCT a FROM artist a"; + if (linkType) + query.where("t_a_l.type = ?").bind(*linkType); if (!keywords.empty()) { - WhereClause whereKeywordsName; - WhereClause whereKeywordsSortName; + std::vector clauses; + std::vector sortClauses; - for (auto keyword : keywords) + for (const std::string& keyword : keywords) { - whereKeywordsName.And(WhereClause("a.name LIKE ?")).bind("%%" + keyword + "%%"); - whereKeywordsSortName.And(WhereClause("a.sort_name LIKE ?")).bind("%%" + keyword + "%%"); + clauses.push_back("a.name LIKE ?"); + query.bind("%%" + keyword + "%%"); + + sortClauses.push_back("a.sort_name LIKE ?"); + query.bind("%%" + keyword + "%%"); } - where.And(whereKeywordsName.Or(whereKeywordsSortName)); + query.where("(" + StringUtils::joinStrings(clauses, " AND ") + ") OR (" + StringUtils::joinStrings(sortClauses, " AND ") + ")"); } - if (!clusterIds.empty() || linkType) - { - oss << " INNER JOIN track t ON t.id = t_a_l.track_id INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.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); - } - if (linkType) - where.And(WhereClause {"t_a_l.type = ?"}.bind(std::to_string(static_cast(*linkType)))); - } - oss << " " << where.get(); - if (!clusterIds.empty()) - oss << " GROUP BY t.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size(); - - switch (sortMethod) { - case Artist::SortMethod::None: - break; - case Artist::SortMethod::ByName: - oss << " ORDER BY a.name COLLATE NOCASE"; - break; - case Artist::SortMethod::BySortName: - oss << " ORDER BY a.sort_name COLLATE NOCASE"; - break; - } + std::ostringstream oss; + oss << "a.id IN (SELECT DISTINCT a.id FROM artist a" + " INNER JOIN track t ON t.id = t_a_l.track_id" + " INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id" + " INNER JOIN cluster c ON c.id = t_c.cluster_id" + " INNER JOIN track_cluster t_c ON t_c.track_id = t.id"; - Wt::Dbo::Query query = session.getDboSession().query( oss.str() ); + WhereClause clusterClause; + for (const IdType clusterId : clusterIds) + { + clusterClause.Or(WhereClause("c.id = ?")); + query.bind(clusterId); + } - for (const std::string& bindArg : where.getBindArgs()) - { - query.bind(bindArg); + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id,a.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size() << ")"; + + query.where(oss.str()); } return query; } std::vector -Artist::getAll(Session& session, SortMethod sortMethod, std::optional offset, std::optional size) +Artist::getAll(Session& session) { session.checkSharedLocked(); - Wt::Dbo::collection res = getQuery(session, {}, {}, std::nullopt, sortMethod) - .limit(size ? static_cast(*size) + 1 : -1) - .offset(offset ? static_cast(*offset) : -1); - + Wt::Dbo::collection res = session.getDboSession().find(); return std::vector(res.begin(), res.end()); } +std::vector +Artist::getAll(Session& session, SortMethod sortMethod) +{ + session.checkSharedLocked(); + + auto query {session.getDboSession().find()}; + switch (sortMethod) + { + case Artist::SortMethod::None: + break; + case Artist::SortMethod::ByName: + query.orderBy("name COLLATE NOCASE"); + break; + case Artist::SortMethod::BySortName: + query.orderBy("sort_name COLLATE NOCASE"); + break; + } + + Wt::Dbo::collection res = query; + return std::vector(res.begin(), res.end()); +} + + +std::vector +Artist::getAll(Session& session, SortMethod sortMethod, std::optional range, bool& moreResults) +{ + session.checkSharedLocked(); + + auto query {createQuery(session, "SELECT a FROM Artist a", {}, {}, std::nullopt)}; + + switch (sortMethod) + { + case Artist::SortMethod::None: + break; + case Artist::SortMethod::ByName: + query.orderBy("a.name COLLATE NOCASE"); + break; + case Artist::SortMethod::BySortName: + query.orderBy("a.sort_name COLLATE NOCASE"); + break; + } + + Wt::Dbo::collection collection = query + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; +} + std::vector Artist::getAllIds(Session& session) { @@ -168,6 +210,21 @@ Artist::getAllIds(Session& session) return std::vector(res.begin(), res.end()); } +std::vector +Artist::getAllIdsRandom(Session& session, const std::set& clusters, std::optional linkType, std::optional size) +{ + session.checkSharedLocked(); + + auto query {createQuery(session, "SELECT DISTINCT a.id from artist a", clusters, {}, linkType)}; + + Wt::Dbo::collection res = query + .orderBy("RANDOM()") + .limit(size ? static_cast(*size) : -1); + + return std::vector(res.begin(), res.end()); + +} + std::vector Artist::getAllOrphans(Session& session) { @@ -197,8 +254,8 @@ Artist::getByClusters(Session& session, const std::set& clusters, SortMe assert(!clusters.empty()); session.checkSharedLocked(); - bool more; - return getByFilter(session, clusters, {}, {}, sortMethod, {}, {}, more); + bool more{}; + return getByFilter(session, clusters, {}, std::nullopt, sortMethod, std::nullopt, more); } std::vector @@ -207,18 +264,31 @@ Artist::getByFilter(Session& session, const std::vector& keywords, std::optional linkType, SortMethod sortMethod, - std::optional offset, - std::optional size, + std::optional range, bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection collection = getQuery(session, clusters, keywords, linkType, sortMethod) - .limit(size ? static_cast(*size) + 1 : -1) - .offset(offset ? static_cast(*offset) : -1); + + auto query {createQuery(session, "SELECT DISTINCT a from artist a", clusters, keywords, linkType)}; + switch (sortMethod) + { + case Artist::SortMethod::None: + break; + case Artist::SortMethod::ByName: + query.orderBy("a.name COLLATE NOCASE"); + break; + case Artist::SortMethod::BySortName: + query.orderBy("a.sort_name COLLATE NOCASE"); + break; + } + + Wt::Dbo::collection collection = query + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); auto res {std::vector(collection.begin(), collection.end())}; - if (size && res.size() == static_cast(*size) + 1) + if (range && res.size() == static_cast(range->limit) + 1) { moreResults = true; res.pop_back(); @@ -230,14 +300,29 @@ Artist::getByFilter(Session& session, } std::vector -Artist::getLastWritten(Session& session, Wt::WDateTime after, std::optional limit) +Artist::getLastWritten(Session& session, std::optional after, const std::set& clusters, std::optional linkType, std::optional range, bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection res = session.getDboSession().query("SELECT a from artist a INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id INNER JOIN track t ON t.id = t_a_l.track_id") - .where("t.file_last_write > ?").bind(after) - .groupBy("a.id") + + auto query {createQuery(session, "SELECT DISTINCT a from artist a", clusters, {}, linkType)}; + + if (after) + query.where("t.file_last_write > ?").bind(*after); + + Wt::Dbo::collection collection = query .orderBy("t.file_last_write DESC") - .limit(limit ? static_cast(*limit) : -1); + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; return std::vector(res.begin(), res.end()); } @@ -427,7 +512,6 @@ void Artist::setSortName(const std::string& sortName) { _sortName = std::string(sortName, 0 , _maxNameLength); - LMS_LOG(DB, DEBUG) << "SORT NAME = '" << _sortName << "'"; } } // namespace Database diff --git a/src/libs/database/impl/Db.cpp b/src/libs/database/impl/Db.cpp index dd6b8d0e..4d745877 100644 --- a/src/libs/database/impl/Db.cpp +++ b/src/libs/database/impl/Db.cpp @@ -46,9 +46,25 @@ Db::Db(const std::filesystem::path& dbPath) void Db::executeSql(const std::string& sql) { - auto connection {_connectionPool->getConnection()}; + ScopedConnection connection {*_connectionPool}; connection->executeSql(sql); - _connectionPool->returnConnection(std::move(connection)); +} + + +Db::ScopedConnection::ScopedConnection(Wt::Dbo::SqlConnectionPool& pool) +: _connectionPool {pool} +, _connection {_connectionPool.getConnection()} +{ +} + +Db::ScopedConnection::~ScopedConnection() +{ + _connectionPool.returnConnection(std::move(_connection)); +} + +Wt::Dbo::SqlConnection* Db::ScopedConnection::operator->() const +{ + return _connection.get(); } } // namespace Database diff --git a/src/libs/database/impl/Release.cpp b/src/libs/database/impl/Release.cpp index d7c8491b..23646eaa 100644 --- a/src/libs/database/impl/Release.cpp +++ b/src/libs/database/impl/Release.cpp @@ -31,6 +31,45 @@ namespace Database { +template +static +Wt::Dbo::Query +createQuery(Session& session, + const std::string& queryStr, + const std::set& clusterIds, + const std::vector& keywords) +{ + + auto query {session.getDboSession().query(queryStr)}; + query.join("track t ON t.release_id = r.id"); + + for (const std::string& keyword : keywords) + query.where("r.name LIKE ?").bind("%%" + keyword + "%%"); + + if (!clusterIds.empty()) + { + std::ostringstream oss; + oss << "r.id IN (SELECT DISTINCT r.id FROM release r" + " INNER JOIN track t ON t.release_id = r.id" + " 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 (const IdType clusterId : clusterIds) + { + clusterClause.Or(WhereClause("c.id = ?")); + query.bind(clusterId); + } + + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size() << ")"; + + query.where(oss.str()); + } + + return query; +} + Release::Release(const std::string& name, const std::optional& MBID) : _name {std::string(name, 0 , _maxNameLength)}, _MBID {MBID ? MBID->getAsString() : ""} @@ -84,13 +123,13 @@ Release::getCount(Session& session) } std::vector -Release::getAll(Session& session, std::optional offset, std::optional size) +Release::getAll(Session& session, std::optional range) { session.checkSharedLocked(); Wt::Dbo::collection res = session.getDboSession().find() - .offset(offset ? static_cast(*offset) : -1) - .limit(size ? static_cast(*size) : -1) + .offset(range ? static_cast(range->offset) : -1) + .limit(range ? static_cast(range->limit) : -1) .orderBy("name COLLATE NOCASE"); return std::vector(res.begin(), res.end()); @@ -123,17 +162,34 @@ Release::getAllOrderedByArtist(Session& session, std::optional offs } std::vector -Release::getAllRandom(Session& session, std::optional size) +Release::getAllRandom(Session& session, const std::set& clusterIds, std::optional size) { session.checkSharedLocked(); - Wt::Dbo::collection res = session.getDboSession().find() - .limit(size ? static_cast(*size) : -1) - .orderBy("RANDOM()"); + auto query {createQuery(session, "SELECT DISTINCT r from release r", clusterIds,{})}; + + Wt::Dbo::collection res = query + .orderBy("RANDOM()") + .limit(size ? static_cast(*size) : -1); return std::vector(res.begin(), res.end()); } +std::vector +Release::getAllIdsRandom(Session& session, const std::set& clusterIds, std::optional size) +{ + session.checkSharedLocked(); + + auto query {createQuery(session, "SELECT DISTINCT r.id from release r", clusterIds,{})}; + + Wt::Dbo::collection res = query + .orderBy("RANDOM()") + .limit(size ? static_cast(*size) : -1); + + return std::vector(res.begin(), res.end()); +} + + std::vector Release::getAllOrphans(Session& session) { @@ -145,18 +201,34 @@ Release::getAllOrphans(Session& session) } std::vector -Release::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional offset, std::optional limit) +Release::getLastWritten(Session& session, + std::optional after, + const std::set& clusterIds, + std::optional range, + bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection res = session.getDboSession().query("SELECT r from release r INNER JOIN track t ON r.id = t.release_id") - .where("t.file_last_write > ?").bind(after) - .groupBy("r.id") - .orderBy("t.file_last_write DESC") - .offset(offset ? static_cast(*offset) : -1) - .limit(limit ? static_cast(*limit) : -1); + auto query {createQuery(session, "SELECT r from release r", clusterIds, {})}; + if (after) + query.where("t.file_last_write > ?").bind(after); - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection collection = query + .orderBy("t.file_last_write DESC") + .groupBy("r.id") + .offset(range ? static_cast(range->offset) : -1) + .limit(range ? static_cast(range->limit) + 1: -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; } std::vector @@ -173,47 +245,6 @@ Release::getByYear(Session& session, int yearFrom, int yearTo, std::optional(res.begin(), res.end()); } -static -Wt::Dbo::Query -getQuery(Session& session, - const std::set& clusterIds, - const std::vector& keywords) -{ - WhereClause where; - - std::ostringstream oss; - oss << "SELECT DISTINCT r FROM release r"; - - for (auto keyword : keywords) - where.And(WhereClause("r.name LIKE ?")).bind("%%" + keyword + "%%"); - - if (!clusterIds.empty()) - { - oss << " INNER JOIN track t ON t.release_id = r.id 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); - } - - oss << " " << where.get(); - - if (!clusterIds.empty()) - oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); - - oss << " ORDER BY r.name COLLATE NOCASE"; - - Wt::Dbo::Query query = session.getDboSession().query( oss.str() ); - - for (const std::string& bindArg : where.getBindArgs()) - query.bind(bindArg); - - return query; -} - std::vector Release::getByClusters(Session& session, const std::set& clusters) { @@ -222,26 +253,27 @@ Release::getByClusters(Session& session, const std::set& clusters) session.checkSharedLocked(); bool moreResults; - return getByFilter(session, clusters, {}, {}, {}, moreResults); + return getByFilter(session, clusters, {}, std::nullopt, moreResults); } std::vector Release::getByFilter(Session& session, const std::set& clusterIds, const std::vector& keywords, - std::optional offset, - std::optional size, + std::optional range, bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords) - .limit(size ? static_cast(*size) + 1 : -1) - .offset(offset ? static_cast(*offset) : -1); + Wt::Dbo::collection collection = createQuery(session, "SELECT r from release r", clusterIds, keywords) + .groupBy("r.id") + .orderBy("r.name COLLATE NOCASE") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); auto res {std::vector(collection.begin(), collection.end())}; - if (size && res.size() == static_cast(*size) + 1) + if (range && res.size() == static_cast(range->limit) + 1) { moreResults = true; res.pop_back(); diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp index 2e96ffd1..39319ff2 100644 --- a/src/libs/database/impl/Session.cpp +++ b/src/libs/database/impl/Session.cpp @@ -378,6 +378,7 @@ Session::prepareTables() _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); _session.execute("CREATE INDEX IF NOT EXISTS release_name_nocase_idx ON release(name COLLATE NOCASE)"); _session.execute("CREATE INDEX IF NOT EXISTS release_mbid_idx ON release(mbid)"); + _session.execute("CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)"); _session.execute("CREATE INDEX IF NOT EXISTS track_path_idx ON track(file_path)"); _session.execute("CREATE INDEX IF NOT EXISTS track_name_idx ON track(name)"); _session.execute("CREATE INDEX IF NOT EXISTS track_name_nocase_idx ON track(name COLLATE NOCASE)"); diff --git a/src/libs/database/impl/Track.cpp b/src/libs/database/impl/Track.cpp index cc286ee0..26dcc37f 100644 --- a/src/libs/database/impl/Track.cpp +++ b/src/libs/database/impl/Track.cpp @@ -32,9 +32,46 @@ namespace Database { +template +static +Wt::Dbo::Query +createQuery(Session& session, + const std::string& queryStr, + const std::set& clusterIds, + const std::vector& keywords) +{ + session.checkSharedLocked(); + + auto query {session.getDboSession().query(queryStr)}; + + for (const std::string& keyword : keywords) + query.where("t.name LIKE ?").bind("%%" + keyword + "%%"); + + if (!clusterIds.empty()) + { + std::ostringstream oss; + oss << "t.id IN (SELECT DISTINCT t.id FROM track t" + " INNER JOIN track_cluster t_c ON t_c.track_id = t.id" + " INNER JOIN cluster c ON c.id = t_c.cluster_id"; + + WhereClause clusterClause; + for (const IdType clusterId : clusterIds) + { + clusterClause.Or(WhereClause("c.id = ?")); + query.bind(clusterId); + } + + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size() << ")"; + + query.where(oss.str()); + } + + return query; +} + Track::Track(const std::filesystem::path& p) -: -_filePath( p.string() ) +: _filePath {p.string()} { } @@ -58,17 +95,34 @@ Track::getAll(Session& session, std::optional limit) } std::vector -Track::getAllRandom(Session& session, std::optional limit) +Track::getAllRandom(Session& session, const std::set& clusterIds, std::optional limit) { session.checkSharedLocked(); - Wt::Dbo::collection res {session.getDboSession().find() - .limit(limit ? static_cast(*limit) : -1) - .orderBy("RANDOM()")}; + auto query {createQuery(session, "SELECT t from track t", clusterIds, {})}; - return std::vector(std::cbegin(res), std::cend(res)); + Wt::Dbo::collection collection = query + .orderBy("RANDOM()") + .limit(limit ? static_cast(*limit) + 1: -1); + + return std::vector(collection.begin(), collection.end()); } +std::vector +Track::getAllIdsRandom(Session& session, const std::set& clusterIds, std::optional limit) +{ + session.checkSharedLocked(); + + auto query {createQuery(session, "SELECT t.id from track t", clusterIds, {})}; + + Wt::Dbo::collection collection = query + .orderBy("RANDOM()") + .limit(limit ? static_cast(*limit) + 1: -1); + + return std::vector(collection.begin(), collection.end()); +} + + std::vector Track::getAllIds(Session& session) { @@ -147,16 +201,30 @@ Track::getMBIDDuplicates(Session& session) } std::vector -Track::getLastWritten(Session& session, const Wt::WDateTime& after, std::optional limit) +Track::getLastWritten(Session& session, std::optional after, const std::set& clusterIds, std::optional range, bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection res = session.getDboSession().find() - .where("file_last_write > ?").bind(after) - .orderBy("file_last_write DESC") - .limit(limit ? static_cast(*limit) : -1); + auto query {createQuery(session, "SELECT t from track t", clusterIds, {})}; + if (after) + query.where("t.file_last_write > ?").bind(after); - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection collection = query + .orderBy("t.file_last_write DESC") + .groupBy("t.id") + .offset(range ? static_cast(range->offset) : -1) + .limit(range ? static_cast(range->limit) + 1: -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; } std::vector @@ -225,66 +293,21 @@ Track::hasTrackFeatures() const return (_trackFeatures.lock() != Database::TrackFeatures::pointer()); } -static -Wt::Dbo::Query< Track::pointer > -getQuery(Session& session, - const std::set& clusterIds, - const std::vector& keywords) -{ - session.checkSharedLocked(); - - WhereClause where; - - std::ostringstream oss; - oss << "SELECT t FROM track t"; - - for (auto keyword : keywords) - where.And(WhereClause("t.name LIKE ?")).bind("%%" + keyword + "%%"); - - 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); - } - - oss << " " << where.get(); - - if (!clusterIds.empty()) - oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size(); - - oss << " ORDER BY t.name COLLATE NOCASE"; - - Wt::Dbo::Query query = session.getDboSession().query( oss.str() ); - - for (const std::string& bindArg : where.getBindArgs()) - query.bind(bindArg); - - return query; -} - std::vector Track::getByFilter(Session& session, const std::set& clusterIds, const std::vector& keywords, - std::optional offset, - std::optional size, + std::optional range, bool& moreResults) { session.checkSharedLocked(); - Wt::Dbo::collection collection = getQuery(session, clusterIds, keywords) - .limit(size ? static_cast(*size) + 1 : -1) - .offset(offset ? static_cast(*offset) : -1); + Wt::Dbo::collection collection = createQuery(session, "SELECT t from track t", clusterIds, keywords) + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); std::vector res(collection.begin(), collection.end()); - - if (size && (res.size() == static_cast(*size) + 1)) + if (range && (res.size() == static_cast(range->limit) + 1)) { moreResults = true; res.pop_back(); @@ -340,12 +363,10 @@ Track::getByClusters(Session& session, session.checkSharedLocked(); bool moreResults; - return getByFilter(session, clusters, - {}, - {}, - {}, + {}, // keywords + std::nullopt, // range moreResults); } diff --git a/src/libs/database/impl/TrackList.cpp b/src/libs/database/impl/TrackList.cpp index a7fc145c..5ac4da9d 100644 --- a/src/libs/database/impl/TrackList.cpp +++ b/src/libs/database/impl/TrackList.cpp @@ -28,6 +28,7 @@ #include "database/Session.hpp" #include "database/User.hpp" #include "database/Track.hpp" +#include "SqlQuery.hpp" namespace Database { @@ -106,6 +107,23 @@ TrackList::getById(Session& session, IdType id) return session.getDboSession().find().where("id = ?").bind(id); } +std::size_t +TrackList::getCount() const +{ + return _entries.size(); +} + +Wt::Dbo::ptr +TrackList::getEntry(std::size_t pos) const +{ + Wt::Dbo::ptr res; + + auto entries = getEntries(pos, 1); + if (!entries.empty()) + res = entries.front(); + + return res; +} std::vector> TrackList::getEntries(std::optional offset, std::optional size) const @@ -139,22 +157,180 @@ TrackList::getEntriesReverse(std::optional offset, std::optional>(entries.begin(), entries.end()); } -Wt::Dbo::ptr -TrackList::getEntry(std::size_t pos) const +static +Wt::Dbo::Query +createArtistsQuery(Wt::Dbo::Session& session, const std::string& queryStr, IdType tracklistId, const std::set& clusterIds, std::optional linkType) { - Wt::Dbo::ptr res; + auto query {session.query(queryStr)}; + query.join("track t ON t.id = t_a_l.track_id"); + query.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id"); + query.join("tracklist_entry p_e ON p_e.track_id = t.id"); + query.join("tracklist p ON p.id = p_e.tracklist_id"); - auto entries = getEntries(pos, 1); - if (!entries.empty()) - res = entries.front(); + query.where("p.id = ?").bind(tracklistId); + + if (linkType) + query.where("t_a_l.type = ?").bind(*linkType); + + if (!clusterIds.empty()) + { + std::ostringstream oss; + oss << "a.id IN (SELECT DISTINCT a.id FROM artist a" + " INNER JOIN track t ON t.id = t_a_l.track_id" + " INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id" + " 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 = ?")); + query.bind(id); + } + + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id,a.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size() << ")"; + + query.where(oss.str()); + } + + return query; +} + +static +Wt::Dbo::Query +createReleasesQuery(Wt::Dbo::Session& session, const std::string& queryStr, IdType tracklistId, const std::set& clusterIds) +{ + auto query {session.query(queryStr)}; + query.join("track t ON t.release_id = r.id"); + query.join("tracklist_entry p_e ON p_e.track_id = t.id"); + query.join("tracklist p ON p.id = p_e.tracklist_id"); + + query.where("p.id = ?").bind(tracklistId); + + if (!clusterIds.empty()) + { + std::ostringstream oss; + oss << "r.id IN (SELECT DISTINCT r.id FROM release r" + " INNER JOIN track t ON t.release_id = r.id" + " 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 = ?")); + query.bind(id); + } + + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id HAVING COUNT(DISTINCT c.id) = " << clusterIds.size() << ")"; + + query.where(oss.str()); + } + + return query; +} + +static +Wt::Dbo::Query +createTracksQuery(Wt::Dbo::Session& session, IdType tracklistId, const std::set& clusterIds) +{ + auto query {session.query("SELECT t from track t INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id")}; + + query.where("p.id = ?").bind(tracklistId); + + if (!clusterIds.empty()) + { + std::ostringstream oss; + oss << "t.id IN (SELECT DISTINCT t.id FROM track t" + " INNER JOIN track_cluster t_c ON t_c.track_id = t.id" + " INNER JOIN cluster c ON c.id = t_c.cluster_id"; + + WhereClause clusterClause; + for (auto id : clusterIds) + { + clusterClause.Or(WhereClause("c.id = ?")).bind(std::to_string(id)); + query.bind(id); + } + + oss << " " << clusterClause.get(); + oss << " GROUP BY t.id HAVING COUNT(*) = " << clusterIds.size() << ")"; + + query.where(oss.str()); + } + + return query; +} + +std::vector +TrackList::getArtistsReverse(const std::set& clusterIds, std::optional linkType, std::optional range, bool& moreResults) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection collection = createArtistsQuery(*session(), "SELECT DISTINCT a from artist a", self()->id(), clusterIds, linkType) + .orderBy("p_e.id DESC") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; return res; } -std::size_t -TrackList::getCount() const +std::vector +TrackList::getReleasesReverse(const std::set& clusterIds, std::optional range, bool& moreResults) const { - return _entries.size(); + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection collection = createReleasesQuery(*session(), "SELECT DISTINCT r from release r", self()->id(), clusterIds) + .orderBy("p_e.id DESC") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; +} + +std::vector +TrackList::getTracksReverse(const std::set& clusterIds, std::optional range, bool& moreResults) const +{ + assert(session()); + assert(IdIsValid(self()->id())); + + Wt::Dbo::collection collection = createTracksQuery(*session(), self()->id(), clusterIds) + .orderBy("p_e.id DESC") + .groupBy("t.id") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; } std::vector> @@ -235,48 +411,85 @@ TrackList::getDuration() const } std::vector -TrackList::getTopArtists(std::size_t limit) const +TrackList::getTopArtists(const std::set& clusterIds, std::optional linkType, std::optional range, bool& moreResults) const { assert(session()); assert(IdIsValid(self()->id())); - Wt::Dbo::collection res = session()->query("SELECT a from artist a INNER JOIN track t ON t.id = t_a_l.track_id INNER JOIN track_artist_link t_a_l ON t_a_l.artist_id = a.id INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") - .where("p.id = ?").bind(self()->id()) - .groupBy("a.id") - .orderBy("COUNT(a.id) DESC") - .limit(static_cast(limit)); + auto query {createArtistsQuery(*session(), "SELECT a from artist a", self()->id(), clusterIds, linkType)}; - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection collection = query + .orderBy("COUNT(a.id) DESC") + .groupBy("a.id") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + + return res; } std::vector -TrackList::getTopReleases(std::size_t limit) const +TrackList::getTopReleases(const std::set& clusterIds, std::optional range, bool& moreResults) const { assert(session()); assert(IdIsValid(self()->id())); - Wt::Dbo::collection res = session()->query("SELECT r from release r INNER JOIN track t ON t.release_id = r.id INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") - .where("p.id = ?").bind(self()->id()) - .groupBy("r.id") - .orderBy("COUNT(r.id) DESC") - .limit(static_cast(limit)); + auto query {createReleasesQuery(*session(), "SELECT r from release r", self()->id(), clusterIds)}; - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection collection = query + .orderBy("COUNT(r.id) DESC") + .groupBy("r.id") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; } std::vector -TrackList::getTopTracks(std::size_t limit) const +TrackList::getTopTracks(const std::set& clusterIds, std::optional range, bool& moreResults) const { assert(session()); assert(IdIsValid(self()->id())); - Wt::Dbo::collection res = session()->query("SELECT t from track t INNER JOIN tracklist_entry p_e ON p_e.track_id = t.id INNER JOIN tracklist p ON p.id = p_e.tracklist_id") - .where("p.id = ?").bind(self()->id()) - .groupBy("t.id") - .orderBy("COUNT(t.id) DESC") - .limit(static_cast(limit)); + auto query {createTracksQuery(*session(), self()->id(), clusterIds)}; - return std::vector(res.begin(), res.end()); + Wt::Dbo::collection collection = query + .orderBy("COUNT(t.id) DESC") + .groupBy("t.id") + .limit(range ? static_cast(range->limit) + 1 : -1) + .offset(range ? static_cast(range->offset) : -1); + + auto res {std::vector(collection.begin(), collection.end())}; + + if (range && res.size() == static_cast(range->limit) + 1) + { + moreResults = true; + res.pop_back(); + } + else + moreResults = false; + + return res; } TrackListEntry::TrackListEntry(Wt::Dbo::ptr track, Wt::Dbo::ptr tracklist) diff --git a/src/libs/database/include/database/Artist.hpp b/src/libs/database/include/database/Artist.hpp index f29d4637..642e4aa8 100644 --- a/src/libs/database/include/database/Artist.hpp +++ b/src/libs/database/include/database/Artist.hpp @@ -70,14 +70,21 @@ class Artist : public Wt::Dbo::Dbo const std::vector& keywords, // if non empty, name must match all of these keywords (name + sort name fields) std::optional linkType, // if set, only artists that have produced at least one track with this link type SortMethod sortMethod, - std::optional offset, - std::optional size, + std::optional range, bool& moreExpected); - static std::vector getAll(Session& session, SortMethod sortMethod, std::optional offset = {}, std::optional size = {}); + static std::vector getAll(Session& session); + static std::vector getAll(Session& session, SortMethod sortMethod); + static std::vector getAll(Session& session, SortMethod sortMethod, std::optional range, bool& moreResults); static std::vector getAllIds(Session& session); + static std::vector getAllIdsRandom(Session& session, const std::set& clusters, std::optional linkType, std::optional size = {}); static std::vector getAllOrphans(Session& session); // No track related - static std::vector getLastWritten(Session& session, Wt::WDateTime after, std::optional size = {}); + static std::vector getLastWritten(Session& session, + std::optional after, + const std::set& clusters, + std::optional linkType, // if set, only artists that have produced at least one track with this link type + std::optional, + bool& moreResults); static std::vector getAllIdsWithClusters(Session& session, std::optional limit = {}); // Accessors diff --git a/src/libs/database/include/database/Db.hpp b/src/libs/database/include/database/Db.hpp index 17470c19..58345405 100644 --- a/src/libs/database/include/database/Db.hpp +++ b/src/libs/database/include/database/Db.hpp @@ -39,6 +39,24 @@ class Db std::shared_mutex& getMutex() { return _sharedMutex; } Wt::Dbo::SqlConnectionPool& getConnectionPool() { return *_connectionPool; } + class ScopedConnection + { + public: + ScopedConnection(Wt::Dbo::SqlConnectionPool& pool); + ~ScopedConnection(); + + ScopedConnection(const ScopedConnection& ) = delete; + ScopedConnection(ScopedConnection&& ) = delete; + ScopedConnection& operator=(const ScopedConnection& ) = delete; + ScopedConnection& operator=(ScopedConnection&& ) = delete; + + Wt::Dbo::SqlConnection* operator->() const; + + private: + Wt::Dbo::SqlConnectionPool& _connectionPool; + std::unique_ptr _connection; + }; + class ScopedNoForeignKeys { public: @@ -51,9 +69,13 @@ class Db _db.executeSql("PRAGMA foreign_keys=ON"); } - private: - Db& _db; + ScopedNoForeignKeys(const ScopedNoForeignKeys&) = delete; + ScopedNoForeignKeys(ScopedNoForeignKeys&&) = delete; + ScopedNoForeignKeys& operator=(const ScopedNoForeignKeys&) = delete; + ScopedNoForeignKeys& operator=(ScopedNoForeignKeys&&) = delete; + private: + Db& _db; }; void executeSql(const std::string& sql); diff --git a/src/libs/database/include/database/Release.hpp b/src/libs/database/include/database/Release.hpp index 7b61148b..d2deceb7 100644 --- a/src/libs/database/include/database/Release.hpp +++ b/src/libs/database/include/database/Release.hpp @@ -52,19 +52,19 @@ class Release : public Wt::Dbo::Dbo static std::vector getByName(Session& session, const std::string& name); static pointer getById(Session& session, IdType id); static std::vector getAllOrphans(Session& session); // no track related - static std::vector getAll(Session& session, std::optional offset = {}, std::optional size = {}); + static std::vector getAll(Session& session, std::optional range = std::nullopt); static std::vector getAllIds(Session& session); static std::vector getAllOrderedByArtist(Session& session, std::optional offset = {}, std::optional size = {}); - static std::vector getAllRandom(Session& session, std::optional size = {}); - static std::vector getLastWritten(Session& session, const Wt::WDateTime& after, std::optional offset = {}, std::optional size = {}); + static std::vector getAllRandom(Session& session, const std::set& clusters, std::optional size = {}); + static std::vector getAllIdsRandom(Session& session, const std::set& clusters, std::optional size = {}); + static std::vector getLastWritten(Session& session, std::optional after, const std::set& clusters, std::optional range, bool& moreResults); static std::vector getByYear(Session& session, int yearFrom, int yearTo, std::optional offset = {}, std::optional size = {}); static std::vector getByClusters(Session& session, const std::set& clusters); static std::vector getByFilter(Session& session, const std::set& clusters, // if non empty, at least one release that belongs to these clusters const std::vector& keywords, // if non empty, name must match all of these keywords - std::optional offset, - std::optional size, + std::optional range, bool& moreExpected); static std::vector getAllIdsWithClusters(Session& session, std::optional limit = {}); diff --git a/src/libs/database/include/database/Track.hpp b/src/libs/database/include/database/Track.hpp index 4a83f560..53fabb71 100644 --- a/src/libs/database/include/database/Track.hpp +++ b/src/libs/database/include/database/Track.hpp @@ -68,16 +68,16 @@ class Track : public Wt::Dbo::Dbo static std::vector getByFilter(Session& session, const std::set& clusters, // if non empty, tracks that belong to these clusters const std::vector& keywords, // if non empty, name must match all of these keywords - std::optional offset, - std::optional size, + std::optional range, bool& moreExpected); - static std::vector getAll(Session& session, std::optional limit = {}); - static std::vector getAllRandom(Session& session, std::optional limit = {}); + static std::vector getAll(Session& session, std::optional limit = std::nullopt); + static std::vector getAllRandom(Session& session, const std::set& clusters, std::optional limit = std::nullopt); + static std::vector getAllIdsRandom(Session& session, const std::set& clusters, std::optional limit = std::nullopt); static std::vector getAllIds(Session& session); static std::vector> getAllPaths(Session& session, std::optional offset = std::nullopt, std::optional size = std::nullopt); static std::vector getMBIDDuplicates(Session& session); - static std::vector getLastWritten(Session& session, const Wt::WDateTime& after, std::optional size = 1); + static std::vector getLastWritten(Session& session, std::optional after, const std::set& clusters, std::optional range, bool& moreResults); static std::vector getAllWithMBIDAndMissingFeatures(Session& session); static std::vector getAllIdsWithFeatures(Session& session, std::optional limit = {}); static std::vector getAllIdsWithClusters(Session& session, std::optional limit = {}); diff --git a/src/libs/database/include/database/TrackList.hpp b/src/libs/database/include/database/TrackList.hpp index 6b38435d..a7e2ec02 100644 --- a/src/libs/database/include/database/TrackList.hpp +++ b/src/libs/database/include/database/TrackList.hpp @@ -21,9 +21,11 @@ #include #include +#include #include +#include "TrackArtistLink.hpp" #include "Types.hpp" namespace Database { @@ -51,9 +53,9 @@ class TrackList : public Wt::Dbo::Dbo TrackList(const std::string& name, Type type, bool isPublic, Wt::Dbo::ptr user); // Stats utility - std::vector> getTopArtists(std::size_t limit = 1) const; - std::vector> getTopReleases(std::size_t limit = 1) const; - std::vector> getTopTracks(std::size_t limit = 1) const; + std::vector> getTopArtists(const std::set& clusterIds, std::optional linkType, std::optional range, bool& moreResults) const; + std::vector> getTopReleases(const std::set& clusterIds, std::optional range, bool& moreResults) const; + std::vector> getTopTracks(const std::set& clusterIds, std::optional range, bool& moreResults) const; // Search utility static pointer get(Session& session, const std::string& name, Type type, Wt::Dbo::ptr user); @@ -82,6 +84,10 @@ class TrackList : public Wt::Dbo::Dbo std::vector> getEntries(std::optional offset = {}, std::optional size = {}) const; std::vector> getEntriesReverse(std::optional offset = {}, std::optional size = {}) const; + std::vector> getArtistsReverse(const std::set& clusterIds, std::optional linkType, std::optional range, bool& moreResults) const; + std::vector> getReleasesReverse(const std::set& clusterIds, std::optional range, bool& moreResults) const; + std::vector> getTracksReverse(const std::set& clusterIds, std::optional range, bool& moreResults) const; + std::vector getTrackIds() const; std::chrono::milliseconds getDuration() const; diff --git a/src/libs/database/include/database/Types.hpp b/src/libs/database/include/database/Types.hpp index 704e6897..058b5052 100644 --- a/src/libs/database/include/database/Types.hpp +++ b/src/libs/database/include/database/Types.hpp @@ -21,12 +21,19 @@ #include -namespace Database { +namespace Database +{ using IdType = Wt::Dbo::dbo_default_traits::IdType; static inline bool IdIsValid(IdType id) { return id != Wt::Dbo::dbo_default_traits::invalidId(); } + + struct Range + { + std::size_t offset {}; + std::size_t limit {}; + }; } diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp index 39e38f40..a78d028a 100644 --- a/src/libs/subsonic/impl/SubsonicResource.cpp +++ b/src/libs/subsonic/impl/SubsonicResource.cpp @@ -677,7 +677,7 @@ handleGetRandomSongsRequest(RequestContext& context) if (!user) throw UserNotAuthorizedError {}; - auto tracks {Track::getAllRandom(context.dbSession, size)}; + auto tracks {Track::getAllRandom(context.dbSession, {}, size)}; Response response {Response::createOkResponse()}; @@ -710,16 +710,17 @@ handleGetAlbumListRequestCommon(const RequestContext& context, bool id3) if (type == "random") { // Random results are paginated, but there is no acceptable way to handle the pagination params without repeating some albums - releases = Release::getAllRandom(context.dbSession, size); + releases = Release::getAllRandom(context.dbSession, {}, size); } else if (type == "newest") { auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)}; - releases = Release::getLastWritten(context.dbSession, after, offset, size); + bool moreResults {}; + releases = Release::getLastWritten(context.dbSession, after, {}, Range {offset, size}, moreResults); } else if (type == "alphabeticalByName") { - releases = Release::getAll(context.dbSession, offset, size); + releases = Release::getAll(context.dbSession, Range {offset, size}); } else if (type == "alphabeticalByArtist") { @@ -748,7 +749,7 @@ handleGetAlbumListRequestCommon(const RequestContext& context, bool id3) if (cluster) { bool more; - releases = Release::getByFilter(context.dbSession, {cluster.id()}, {}, offset, size, more); + releases = Release::getByFilter(context.dbSession, {cluster.id()}, {}, Range {offset, size}, more); } } } @@ -935,7 +936,7 @@ handleGetArtistsRequest(RequestContext& context) {}, linkType, Artist::SortMethod::BySortName, - {}, {}, more)}; + std::nullopt, more)}; for (const Artist::pointer& artist : artists) indexNode.addArrayChild("artist", artistToResponseNode(user, artist, true /* id3 */)); @@ -966,7 +967,8 @@ handleGetMusicDirectoryRequest(RequestContext& context) { directoryNode.setAttribute("name", "Music"); - auto artists {Artist::getAll(context.dbSession, Artist::SortMethod::BySortName)}; + bool moreResults{}; + auto artists {Artist::getAll(context.dbSession, Artist::SortMethod::BySortName, std::nullopt, moreResults)}; for (const Artist::pointer& artist : artists) directoryNode.addArrayChild("child", artistToResponseNode(user, artist, false /* no id3 */)); @@ -1078,7 +1080,7 @@ handleGetIndexesRequest(RequestContext& context) {}, linkType, Artist::SortMethod::BySortName, - {}, {}, more)}; + std::nullopt, more)}; for (const Artist::pointer& artist : artists) indexNode.addArrayChild("artist", artistToResponseNode(user, artist, false /* no id3 */)); @@ -1296,7 +1298,7 @@ handleGetSongsByGenreRequest(RequestContext& context) Response::Node& songsByGenreNode {response.createNode("songsByGenre")}; bool more; - auto tracks {Track::getByFilter(context.dbSession, {cluster.id()}, {}, offset, size, more)}; + auto tracks {Track::getByFilter(context.dbSession, {cluster.id()}, {}, Range {offset, size}, more)}; for (const Track::pointer& track : tracks) songsByGenreNode.addArrayChild("song", trackToResponseNode(track, context.dbSession, user)); @@ -1367,19 +1369,19 @@ handleSearchRequestCommon(RequestContext& context, bool id3) bool more; { - auto artists {Artist::getByFilter(context.dbSession, {}, keywords, std::nullopt, Artist::SortMethod::BySortName, artistOffset, artistCount, more)}; + auto artists {Artist::getByFilter(context.dbSession, {}, keywords, std::nullopt, Artist::SortMethod::BySortName, Range {artistOffset, artistCount}, more)}; for (const Artist::pointer& artist : artists) searchResult2Node.addArrayChild("artist", artistToResponseNode(user, artist, id3)); } { - auto releases {Release::getByFilter(context.dbSession, {}, keywords, albumOffset, albumCount, more)}; + auto releases {Release::getByFilter(context.dbSession, {}, keywords, Range {albumOffset, albumCount}, more)}; for (const Release::pointer& release : releases) searchResult2Node.addArrayChild("album", releaseToResponseNode(release, context.dbSession, user, id3)); } { - auto tracks {Track::getByFilter(context.dbSession, {}, keywords, songOffset, songCount, more)}; + auto tracks {Track::getByFilter(context.dbSession, {}, keywords, Range {songOffset, songCount}, more)}; for (const Track::pointer& track : tracks) searchResult2Node.addArrayChild("song", trackToResponseNode(track, context.dbSession, user)); } diff --git a/src/libs/utils/impl/Random.cpp b/src/libs/utils/impl/Random.cpp index eb081ae0..5cf67add 100644 --- a/src/libs/utils/impl/Random.cpp +++ b/src/libs/utils/impl/Random.cpp @@ -24,10 +24,15 @@ namespace Random { RandGenerator& getRandGenerator() { static thread_local std::random_device rd; - static thread_local std::mt19937 randGenerator(rd()); + static thread_local RandGenerator randGenerator(rd()); return randGenerator; } +RandGenerator createSeededGenerator(std::size_t seed) +{ + return RandGenerator {seed}; +} + } // Random diff --git a/src/libs/utils/include/utils/Random.hpp b/src/libs/utils/include/utils/Random.hpp index 6c7ede58..5469d1e6 100644 --- a/src/libs/utils/include/utils/Random.hpp +++ b/src/libs/utils/include/utils/Random.hpp @@ -27,6 +27,8 @@ namespace Random { using RandGenerator = std::mt19937; RandGenerator& getRandGenerator(); +RandGenerator createSeededGenerator(std::size_t seed); + template T getRandom(T min, T max) diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt index bac11ebd..6755b1c1 100644 --- a/src/lms/CMakeLists.txt +++ b/src/lms/CMakeLists.txt @@ -7,7 +7,6 @@ add_executable(lms ui/LmsTheme.cpp ui/MediaPlayer.cpp ui/PlayQueueView.cpp - ui/PlayHistoryView.cpp ui/SettingsView.cpp ui/TrackStringUtils.cpp ui/admin/DatabaseSettingsView.cpp @@ -16,19 +15,15 @@ add_executable(lms ui/admin/UserView.cpp ui/admin/UsersView.cpp ui/common/Validators.cpp - ui/explore/ArtistInfoView.cpp - ui/explore/ArtistLink.cpp - ui/explore/ArtistsInfoView.cpp + ui/explore/ArtistListHelpers.cpp ui/explore/ArtistView.cpp ui/explore/ArtistsView.cpp ui/explore/Explore.cpp ui/explore/Filters.cpp - ui/explore/ReleaseInfoView.cpp - ui/explore/ReleaseLink.cpp - ui/explore/ReleasesInfoView.cpp + ui/explore/ReleaseListHelpers.cpp ui/explore/ReleasesView.cpp ui/explore/ReleaseView.cpp - ui/explore/TracksInfoView.cpp + ui/explore/SearchView.cpp ui/explore/TracksView.cpp ui/resource/AudioFileResource.cpp ui/resource/AudioTranscodeResource.cpp diff --git a/src/lms/main.cpp b/src/lms/main.cpp index 0911e8db..3cdfa1a1 100644 --- a/src/lms/main.cpp +++ b/src/lms/main.cpp @@ -77,7 +77,20 @@ std::vector generateWtConfig(std::string execPath) pt.put("server.application-settings.log-file", wtLogFilePath.string()); pt.put("server.application-settings.log-config", ServiceProvider::get()->getString("log-config", "* -debug -info:WebRequest")); pt.put("server.application-settings.behind-reverse-proxy", ServiceProvider::get()->getBool("behind-reverse-proxy", false)); - pt.put("server.application-settings.progressive-bootstrap", true); + + { + boost::property_tree::ptree viewport; + viewport.put(".name", "viewport"); + viewport.put(".content", "width=device-width, initial-scale=1, user-scalable=no"); + pt.add_child("server.application-settings.head-matter.meta", viewport); + } + { + boost::property_tree::ptree themeColor; + themeColor.put(".name", "theme-color"); + themeColor.put(".content", "#303030"); + pt.add_child("server.application-settings.head-matter.meta", themeColor); + } + std::ofstream oss(wtConfigPath.string().c_str(), std::ios::out); boost::property_tree::xml_parser::write_xml(oss, pt); diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index ff5df69f..de5cfbf8 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -21,9 +21,7 @@ #include #include -#include -#include -#include +#include #include #include #include @@ -35,6 +33,8 @@ #include "database/Release.hpp" #include "database/User.hpp" #include "explore/Explore.hpp" +#include "explore/Filters.hpp" +#include "explore/SearchView.hpp" #include "utils/Logger.hpp" #include "utils/Service.hpp" #include "utils/String.hpp" @@ -50,13 +50,14 @@ #include "LmsApplicationException.hpp" #include "LmsTheme.hpp" #include "MediaPlayer.hpp" -#include "PlayHistoryView.hpp" #include "PlayQueueView.hpp" #include "SettingsView.hpp" namespace UserInterface { +static constexpr const char* defaultPath {"/releases"}; + std::unique_ptr LmsApplication::create(const Wt::WEnvironment& env, Database::Db& db, LmsApplicationGroupContainer& appGroups) { @@ -115,7 +116,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, _dbSession {db}, _appGroups {appGroups} { - addMetaHeader(Wt::MetaHeaderType::Meta, "viewport", "width=device-width, user-scalable=no"); useStyleSheet("resources/font-awesome/css/font-awesome.min.css"); @@ -125,31 +125,27 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env, messageResourceBundle().use(appRoot() + "admin-user"); messageResourceBundle().use(appRoot() + "admin-users"); messageResourceBundle().use(appRoot() + "artist"); - messageResourceBundle().use(appRoot() + "artistinfo"); - messageResourceBundle().use(appRoot() + "artistlink"); messageResourceBundle().use(appRoot() + "artists"); - messageResourceBundle().use(appRoot() + "artistsinfo"); messageResourceBundle().use(appRoot() + "error"); messageResourceBundle().use(appRoot() + "explore"); messageResourceBundle().use(appRoot() + "login"); messageResourceBundle().use(appRoot() + "mediaplayer"); messageResourceBundle().use(appRoot() + "messages"); messageResourceBundle().use(appRoot() + "playqueue"); - messageResourceBundle().use(appRoot() + "playhistory"); messageResourceBundle().use(appRoot() + "release"); - messageResourceBundle().use(appRoot() + "releaseinfo"); - messageResourceBundle().use(appRoot() + "releaselink"); messageResourceBundle().use(appRoot() + "releases"); - messageResourceBundle().use(appRoot() + "releasesinfo"); + messageResourceBundle().use(appRoot() + "search"); messageResourceBundle().use(appRoot() + "settings"); messageResourceBundle().use(appRoot() + "templates"); messageResourceBundle().use(appRoot() + "tracks"); - messageResourceBundle().use(appRoot() + "tracksinfo"); // Require js here to avoid async problems requireJQuery("js/jquery-1.10.2.min.js"); require("js/mediaplayer.js"); require("js/bootstrap-notify.js"); + require("js/collapse.js"); + require("js/dropdown.js"); + require("js/transition.js"); setTitle("LMS"); @@ -245,7 +241,7 @@ LmsApplication::finalize() Wt::WLink LmsApplication::createArtistLink(Database::Artist::pointer artist) { - return Wt::WLink(Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id())); + return Wt::WLink {Wt::LinkType::InternalPath, "/artist/" + std::to_string(artist.id())}; } std::unique_ptr @@ -265,7 +261,7 @@ LmsApplication::createArtistAnchor(Database::Artist::pointer artist, bool addTex Wt::WLink LmsApplication::createReleaseLink(Database::Release::pointer release) { - return Wt::WLink(Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id())); + return Wt::WLink {Wt::LinkType::InternalPath, "/release/" + std::to_string(release.id())}; } std::unique_ptr @@ -289,10 +285,10 @@ LmsApplication::createCluster(Database::Cluster::pointer cluster, bool canDelete { switch (cluster->getType().id() % 6) { - case 0: return "label-primary"; - case 1: return "label-default"; - case 2: return "label-info"; - case 3: return "label-warning"; + case 0: return "label-info"; + case 1: return "label-warning"; + case 2: return "label-primary"; + case 3: return "label-default"; case 4: return "label-success"; case 5: return "label-danger"; } @@ -316,7 +312,7 @@ LmsApplication::handleException(LmsApplicationException& e) Wt::WTemplate* t {root()->addNew(Wt::WString::tr("Lms.Error.template"))}; t->addFunction("tr", &Wt::WTemplate::Functions::tr); - t->bindString("error", e.what()); + t->bindString("error", e.what(), Wt::TextFormat::Plain); Wt::WPushButton* btn {t->bindNew("btn-go-home", Wt::WString::tr("Lms.Error.go-home"))}; btn->clicked().connect([this]() { @@ -337,7 +333,7 @@ enum IdxRoot { IdxExplore = 0, IdxPlayQueue, - IdxPlayHistory, + IdxSearch, IdxSettings, IdxAdminDatabase, IdxAdminUsers, @@ -360,7 +356,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) { "/release", IdxExplore, false }, { "/tracks", IdxExplore, false }, { "/playqueue", IdxPlayQueue, false }, - { "/playhistory", IdxPlayHistory, false }, + { "/search", IdxSearch, false }, { "/settings", IdxSettings, false }, { "/admin/database", IdxAdminDatabase, true }, { "/admin/users", IdxAdminUsers, true }, @@ -381,7 +377,7 @@ handlePathChange(Wt::WStackedWidget* stack, bool isAdmin) } } - wApp->setInternalPath("/artists", true); + wApp->setInternalPath(defaultPath, true); } LmsApplicationGroup& @@ -436,69 +432,35 @@ LmsApplication::createHome() Wt::WTemplate* main {root()->addWidget(std::make_unique(Wt::WString::tr("Lms.template")))}; - // Navbar - Wt::WNavigationBar* navbar {main->bindNew("navbar-top")}; - navbar->setTitle("LMS", Wt::WLink {Wt::LinkType::InternalPath, "/artists"}); - navbar->setResponsive(true); + main->addFunction("tr", &Wt::WTemplate::Functions::tr); // MediaPlayer _mediaPlayer = main->bindNew("player"); - Wt::WMenu* menu {navbar->addMenu(std::make_unique())}; + main->bindNew("title", Wt::WLink {Wt::LinkType::InternalPath, defaultPath}, "LMS"); + main->bindNew("artists", Wt::WLink {Wt::LinkType::InternalPath, "/artists"}, Wt::WString::tr("Lms.Explore.artists")); + main->bindNew("releases", Wt::WLink {Wt::LinkType::InternalPath, "/releases"}, Wt::WString::tr("Lms.Explore.releases")); + main->bindNew("tracks", Wt::WLink {Wt::LinkType::InternalPath, "/tracks"}, Wt::WString::tr("Lms.Explore.tracks")); + + Filters* filters {main->bindNew("filters")}; + main->bindNew("playqueue", Wt::WLink {Wt::LinkType::InternalPath, "/playqueue"}, Wt::WString::tr("Lms.PlayQueue.playqueue")); + main->bindString("username", getUserLoginName(), Wt::TextFormat::Plain); + main->bindNew("settings", Wt::WLink {Wt::LinkType::InternalPath, "/settings"}, Wt::WString::tr("Lms.Settings.menu-settings")); + { - auto menuItem = menu->insertItem(0, Wt::WString::tr("Lms.Explore.artists")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/artists")); - menuItem->setSelectable(false); - } - { - auto menuItem = menu->insertItem(1, Wt::WString::tr("Lms.Explore.releases")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/releases")); - menuItem->setSelectable(false); - } - { - auto menuItem = menu->insertItem(2, Wt::WString::tr("Lms.Explore.tracks")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/tracks")); - menuItem->setSelectable(false); - } - { - auto menuItem = menu->insertItem(3, Wt::WString::tr("Lms.PlayQueue.playqueue")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/playqueue")); - menuItem->setSelectable(false); - } - { - auto menuItem = menu->insertItem(4, Wt::WString::tr("Lms.PlayHistory.playhistory")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/playhistory")); - menuItem->setSelectable(false); + auto* logout {main->bindNew("logout")}; + logout->setText(Wt::WString::tr("Lms.logout")); + logout->clicked().connect(this, &LmsApplication::handleUserLoggedOut); } - Wt::WMenu* rightMenu = navbar->addMenu(std::make_unique(), Wt::AlignmentFlag::Right); - std::size_t itemCounter = 0; + Wt::WLineEdit* searchEdit {main->bindNew("search")}; + searchEdit->setPlaceholderText(Wt::WString::tr("Lms.Explore.Search.search-placeholder")); + if (isUserAdmin()) { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.administration")); - menuItem->setSelectable(false); - - auto admin = std::make_unique(); - auto dbSettings = admin->insertItem(0, Wt::WString::tr("Lms.Admin.Database.database")); - dbSettings->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/admin/database")); - dbSettings->setSelectable(false); - - auto usersSettings = admin->insertItem(1, Wt::WString::tr("Lms.Admin.Users.users")); - usersSettings->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/admin/users")); - usersSettings->setSelectable(false); - - menuItem->setMenu(std::move(admin)); - } - - { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.Settings.settings")); - menuItem->setLink(Wt::WLink(Wt::LinkType::InternalPath, "/settings")); - menuItem->setSelectable(false); - } - { - auto menuItem = rightMenu->insertItem(itemCounter++, Wt::WString::tr("Lms.logout")); - menuItem->setSelectable(true); - menuItem->triggered().connect(this, &LmsApplication::handleUserLoggedOut); + main->setCondition("if-is-admin", true); + main->bindNew("database", Wt::WLink {Wt::LinkType::InternalPath, "/admin/database"}, Wt::WString::tr("Lms.Admin.Database.menu-database")); + main->bindNew("users", Wt::WLink {Wt::LinkType::InternalPath, "/admin/users"}, Wt::WString::tr("Lms.Admin.Users.menu-users")); } // Contents @@ -506,11 +468,22 @@ LmsApplication::createHome() Wt::WStackedWidget* mainStack = main->bindNew("contents"); mainStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); - Explore* explore = mainStack->addNew(); + Explore* explore = mainStack->addNew(filters); PlayQueue* playqueue = mainStack->addNew(); - mainStack->addNew(); + auto* search {mainStack->addNew(filters)}; mainStack->addNew(); + searchEdit->enterPressed().connect([=] + { + setInternalPath("/search", true); + }); + + searchEdit->textInput().connect([=] + { + setInternalPath("/search", true); + search->refreshView(searchEdit->text().toUTF8()); + }); + // Admin stuff if (isUserAdmin()) { @@ -603,7 +576,7 @@ LmsApplication::createHome() }); // Events from Application group - _events.appOpen.connect([=] (LmsApplicationInfo) + _events.appOpen.connect([=] { // Only one active session by user if (!LmsApp->isUserDemo()) @@ -670,8 +643,9 @@ LmsApplication::notifyMsg(MsgType type, const Wt::WString& message, std::chrono: "message: '" << StringUtils::jsEscape(message.toUTF8()) << "'" "},{" "type: '" << msgTypeToString(type) << "'," - "placement: {from: 'top', align: 'center'}," + "placement: {from: 'bottom', align: 'right'}," "timer: 250," + "offset: {x: 20, y: 80}," "delay: " << duration.count() << "" "});"; diff --git a/src/lms/ui/LmsTheme.cpp b/src/lms/ui/LmsTheme.cpp index 1ab59b3a..611c0e66 100644 --- a/src/lms/ui/LmsTheme.cpp +++ b/src/lms/ui/LmsTheme.cpp @@ -28,43 +28,20 @@ LmsTheme::LmsTheme(Database::User::UITheme theme) : _theme {theme} { setVersion(Wt::BootstrapVersion::v3); - setResponsive(true); - applyMetaHeader(); -} - -void -LmsTheme::applyMetaHeader() const -{ - switch (_theme) - { - case Database::User::UITheme::Dark: - LmsApp->addMetaHeader("theme-color", "#303030"); - break; - case Database::User::UITheme::Light: - LmsApp->removeMetaHeader(Wt::MetaHeaderType::Meta, "theme-color"); - break; - } + setResponsive(true); // Should be not necessary since applied via head-matter } void LmsTheme::setTheme(Database::User::UITheme theme) { // Hack, use the application interface directly since changing theme is not allowed - const auto currentStyleSheets {getStyleSheets(_theme)}; for (auto it {std::crbegin(currentStyleSheets)}; it != std::crend(currentStyleSheets); ++it) - { - LMS_LOG(UI, DEBUG) << "Removing css file '" << it->url() << "'"; LmsApp->removeStyleSheet(*it); - } _theme = theme; for (const auto& styleSheet : getStyleSheets(theme)) - { - LMS_LOG(UI, DEBUG) << "Adding css file '" << styleSheet.url() << "'"; LmsApp->useStyleSheet(styleSheet); - } - applyMetaHeader(); } std::vector @@ -86,8 +63,8 @@ LmsTheme::getStyleSheets(Database::User::UITheme theme) case Database::User::UITheme::Dark: return { - {"resources/themes/bootstrap/3/wt.css"}, {"css/bootstrap-darkly.min.css"}, + {"resources/themes/bootstrap/3/wt.css"}, {"css/lms.css"}, {"css/lms-darkly.css"}, }; @@ -95,8 +72,8 @@ LmsTheme::getStyleSheets(Database::User::UITheme theme) case Database::User::UITheme::Light: return { - {"resources/themes/bootstrap/3/wt.css"}, {"css/bootstrap-flatly.min.css"}, + {"resources/themes/bootstrap/3/wt.css"}, {"css/lms.css"}, {"css/lms-flatly.css"}, }; diff --git a/src/lms/ui/LmsTheme.hpp b/src/lms/ui/LmsTheme.hpp index c72ffd71..10ee14c2 100644 --- a/src/lms/ui/LmsTheme.hpp +++ b/src/lms/ui/LmsTheme.hpp @@ -37,7 +37,6 @@ class LmsTheme : public Wt::WBootstrapTheme private: - void applyMetaHeader() const; std::vector styleSheets() const override; static std::vector getStyleSheets(Database::User::UITheme theme); diff --git a/src/lms/ui/MediaPlayer.cpp b/src/lms/ui/MediaPlayer.cpp index b61c7236..fd0e0647 100644 --- a/src/lms/ui/MediaPlayer.cpp +++ b/src/lms/ui/MediaPlayer.cpp @@ -28,6 +28,7 @@ #include "database/Artist.hpp" #include "database/Release.hpp" #include "database/Track.hpp" +#include "database/TrackList.hpp" #include "database/User.hpp" #include "resource/ImageResource.hpp" @@ -290,6 +291,15 @@ MediaPlayer::loadTrack(Database::IdType trackId, bool play, float replayGain) LMS_LOG(UI, DEBUG) << "Running js = '" << oss.str() << "'"; wApp->doJavaScript(oss.str()); + { + auto transaction {LmsApp->getDbSession().createUniqueTransaction()}; + + const Database::Track::pointer track {Database::Track::getById(LmsApp->getDbSession(), trackId)}; + if (track) + Database::TrackListEntry::create(LmsApp->getDbSession(), track, LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())); + + }; + _trackIdLoaded = trackId; trackLoaded.emit(*_trackIdLoaded); } diff --git a/src/lms/ui/PlayHistoryView.cpp b/src/lms/ui/PlayHistoryView.cpp deleted file mode 100644 index 0fd2c956..00000000 --- a/src/lms/ui/PlayHistoryView.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/* - * 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 . - */ - -#include "PlayHistoryView.hpp" - -#include -#include - -#include "utils/Logger.hpp" - -#include "database/Track.hpp" -#include "database/TrackList.hpp" -#include "database/User.hpp" - -#include "resource/ImageResource.hpp" -#include "LmsApplication.hpp" -#include "MediaPlayer.hpp" - -namespace { - -using namespace UserInterface; - -std::unique_ptr createEntry(Database::Track::pointer track) -{ - auto entry = std::make_unique(Wt::WString::tr("Lms.PlayHistory.template.entry")); - - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); - - auto artists {track->getArtists()}; - auto release = track->getRelease(); - - if (!artists.empty() || release) - entry->setCondition("if-has-artists-or-release", true); - - if (!artists.empty()) - { - entry->setCondition("if-has-artists", true); - - Wt::WContainerWidget* artistContainer {entry->bindNew("artists")}; - for (const auto& artist : artists) - { - Wt::WTemplate* a {artistContainer->addNew(Wt::WString::tr("Lms.PlayHistory.template.entry-artist"))}; - a->bindWidget("artist", LmsApplication::createArtistAnchor(artist)); - } - } - if (release) - { - entry->setCondition("if-has-release", true); - entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease())); - { - Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); - cover->setStyleClass("Lms-cover-small"); - anchor->setImage(std::move(cover)); - } - } - else - { - auto cover = entry->bindNew("cover"); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(track.id(), 96)); - cover->setStyleClass("Lms-cover-small"); - } - - return entry; -} - -} - -namespace UserInterface { - -PlayHistory::PlayHistory() -: Wt::WTemplate {Wt::WString::tr("Lms.PlayHistory.template")} -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _entriesContainer = bindNew("entries"); - - _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); - _showMore->setHidden(true); - - _showMore->clicked().connect([=] - { - addSome(); - }); - - LmsApp->getMediaPlayer()->trackLoaded.connect([=](Database::IdType trackId) - { - auto transaction {LmsApp->getDbSession().createUniqueTransaction()}; - - Database::Track::pointer track {Database::Track::getById(LmsApp->getDbSession(), trackId)}; - if (track) - { - Database::TrackListEntry::create(LmsApp->getDbSession(), track, LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())); - _entriesContainer->insertWidget(0, createEntry(track)); - } - }); - - addSome(); -} - -void -PlayHistory::addSome() -{ - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const Database::TrackList::pointer trackList {LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())}; - auto trackEntries {trackList->getEntriesReverse(_entriesContainer->count(), 50)}; - for (const auto& trackEntry : trackEntries) - _entriesContainer->addWidget(createEntry(trackEntry->getTrack())); - - _showMore->setHidden(static_cast(_entriesContainer->count()) >= trackList->getCount()); -} - -} // namespace UserInterface - diff --git a/src/lms/ui/common/ValueStringModel.hpp b/src/lms/ui/common/ValueStringModel.hpp index 9c05c4ca..821016cf 100644 --- a/src/lms/ui/common/ValueStringModel.hpp +++ b/src/lms/ui/common/ValueStringModel.hpp @@ -32,12 +32,12 @@ class ValueStringModel : public Wt::WStringListModel { public: - T getValue(std::size_t row) + T getValue(std::size_t row) const { return Wt::cpp17::any_cast(data(index(static_cast(row), 0), Wt::ItemDataRole::User)); } - Wt::WString getString(std::size_t row) + Wt::WString getString(std::size_t row) const { return Wt::cpp17::any_cast(data(index(static_cast(row), 0), Wt::ItemDataRole::Display)); } diff --git a/src/lms/ui/explore/ArtistInfoView.cpp b/src/lms/ui/explore/ArtistInfoView.cpp deleted file mode 100644 index e9d3a3d9..00000000 --- a/src/lms/ui/explore/ArtistInfoView.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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 . - */ - -#include "ArtistInfoView.hpp" - -#include "database/Artist.hpp" -#include "recommendation/IEngine.hpp" -#include "utils/Service.hpp" -#include "utils/String.hpp" - -#include "ArtistLink.hpp" -#include "LmsApplication.hpp" - -using namespace Database; - -namespace UserInterface { - -ArtistInfo::ArtistInfo() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ArtistInfo.template")) -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _similarArtistsContainer = bindNew("similar-artists"); - - wApp->internalPathChanged().connect(std::bind([=] - { - refresh(); - })); - - LmsApp->getEvents().dbScanned.connect([=] - { - refresh(); - }); - - refresh(); -} - -void -ArtistInfo::refresh() -{ - _similarArtistsContainer->clear(); - - if (!wApp->internalPathMatches("/artist/")) - return; - - auto artistId = StringUtils::readAs(wApp->internalPathNextPart("/artist/")); - if (!artistId) - return; - - const std::vector artistsIds {ServiceProvider::get()->getSimilarArtists(LmsApp->getDbSession(), *artistId, 5)}; - - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - for (Database::IdType artistId : artistsIds) - { - Database::Artist::pointer artist {Database::Artist::getById(LmsApp->getDbSession(), artistId)}; - if (!artist) - continue; - - _similarArtistsContainer->addNew(artist); - } -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ArtistInfoView.hpp b/src/lms/ui/explore/ArtistInfoView.hpp deleted file mode 100644 index 0d9bc51f..00000000 --- a/src/lms/ui/explore/ArtistInfoView.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include -#include - -namespace UserInterface { - -class ArtistInfo : public Wt::WTemplate -{ - public: - ArtistInfo(); - - private: - void refresh(); - - Wt::WContainerWidget* _similarArtistsContainer; -}; - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ArtistLink.cpp b/src/lms/ui/explore/ArtistListHelpers.cpp similarity index 52% rename from src/lms/ui/explore/ArtistLink.cpp rename to src/lms/ui/explore/ArtistListHelpers.cpp index 2950b0b5..a19906ae 100644 --- a/src/lms/ui/explore/ArtistLink.cpp +++ b/src/lms/ui/explore/ArtistListHelpers.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Emeric Poupon + * Copyright (C) 2020 Emeric Poupon * * This file is part of LMS. * @@ -16,20 +16,32 @@ * You should have received a copy of the GNU General Public License * along with LMS. If not, see . */ - -#include "ArtistLink.hpp" +#include "ArtistListHelpers.hpp" #include #include "database/Artist.hpp" #include "LmsApplication.hpp" -namespace UserInterface { - -ArtistLink::ArtistLink(Database::Artist::pointer artist) -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ArtistLink.template")) +namespace UserInterface::ArtistListHelpers { - bindWidget("name", LmsApplication::createArtistAnchor(artist)); + std::unique_ptr + createEntry(const Wt::Dbo::ptr& artist) + { + auto res {std::make_unique(Wt::WString::tr("Lms.Explore.Artists.template.entry"))}; + res->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + + return res; + } + + std::unique_ptr + createEntrySmall(const Wt::Dbo::ptr& artist) + { + auto res {std::make_unique(Wt::WString::tr("Lms.Explore.Artists.template.entry-small"))}; + res->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + + return res; + } + } -} // namespace UserInterface diff --git a/src/lms/ui/explore/ArtistLink.hpp b/src/lms/ui/explore/ArtistListHelpers.hpp similarity index 68% rename from src/lms/ui/explore/ArtistLink.hpp rename to src/lms/ui/explore/ArtistListHelpers.hpp index c6ee303d..22dc67d8 100644 --- a/src/lms/ui/explore/ArtistLink.hpp +++ b/src/lms/ui/explore/ArtistListHelpers.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Emeric Poupon + * Copyright (C) 2020 Emeric Poupon * * This file is part of LMS. * @@ -19,19 +19,20 @@ #pragma once +#include + #include -namespace Database{ +#include "database/Types.hpp" + +namespace Database +{ class Artist; } -namespace UserInterface { - -class ArtistLink : public Wt::WTemplate +namespace UserInterface::ArtistListHelpers { - public: - ArtistLink(Wt::Dbo::ptr artist); - -}; - + std::unique_ptr createEntry(const Wt::Dbo::ptr& artist); + std::unique_ptr createEntrySmall(const Wt::Dbo::ptr& artist); } + diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index ea49ff55..56261ddc 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -27,12 +27,13 @@ #include "database/Artist.hpp" #include "database/Release.hpp" #include "database/ScanSettings.hpp" - +#include "recommendation/IEngine.hpp" #include "utils/Logger.hpp" #include "utils/String.hpp" #include "resource/ImageResource.hpp" +#include "ArtistListHelpers.hpp" #include "LmsApplication.hpp" #include "LmsApplicationException.hpp" #include "Filters.hpp" @@ -42,22 +43,26 @@ using namespace Database; namespace UserInterface { Artist::Artist(Filters* filters) -: _filters(filters) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Artist.template")} +, _filters(filters) { - wApp->internalPathChanged().connect([=] + addFunction("tr", &Wt::WTemplate::Functions::tr); + + LmsApp->internalPathChanged().connect([=] { - refresh(); + refreshView(); }); - refresh(); - - filters->updated().connect([=] { - refresh(); + filters->updated().connect([=] + { + refreshView(); }); + + refreshView(); } void -Artist::refresh() +Artist::refreshView() { if (!wApp->internalPathMatches("/artist/")) return; @@ -68,16 +73,17 @@ Artist::refresh() if (!artistId) return; - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + const std::vector similarArtistIds {ServiceProvider::get()->getSimilarArtists(LmsApp->getDbSession(), *artistId, 5)}; + + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; const Database::Artist::pointer artist = Database::Artist::getById(LmsApp->getDbSession(), *artistId); if (!artist) throw ArtistNotFoundException {*artistId}; - Wt::WTemplate* t {addNew(Wt::WString::tr("Lms.Explore.Artist.template"))}; - t->addFunction("tr", &Wt::WTemplate::Functions::tr); + refreshSimilarArtists(similarArtistIds); - Wt::WContainerWidget* clusterContainers = t->bindNew("clusters"); + Wt::WContainerWidget* clusterContainers = bindNew("clusters"); { auto clusterTypes = ScanSettings::get(LmsApp->getDbSession())->getClusterTypes(); @@ -97,9 +103,9 @@ Artist::refresh() } } - t->bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); + bindString("name", Wt::WString::fromUTF8(artist->getName()), Wt::TextFormat::Plain); { - Wt::WText* playBtn = t->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); + Wt::WText* playBtn = bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); playBtn->clicked().connect([=] { @@ -108,7 +114,7 @@ Artist::refresh() } { - Wt::WText* addBtn = t->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); + Wt::WText* addBtn = bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); addBtn->clicked().connect([=] { @@ -116,70 +122,92 @@ Artist::refresh() }); } - Wt::WContainerWidget* releasesContainer = t->bindNew("releases"); + Wt::WContainerWidget* releasesContainer = bindNew("releases"); auto releases = artist->getReleases(_filters->getClusterIds()); - - for (auto release : releases) + for (const auto& release : releases) { - auto releaseId = release.id(); + releasesContainer->addWidget(createRelease(artist, release)); + } +} - Wt::WTemplate* entry = releasesContainer->addNew(Wt::WString::tr("Lms.Explore.Artist.template.entry")); - entry->addFunction("tr", Wt::WTemplate::Functions::tr); +std::unique_ptr +Artist::createRelease(const Database::Artist::pointer& artist, const Release::pointer& release) +{ + auto releaseId = release.id(); + auto entry = std::make_unique(Wt::WString::tr("Lms.Explore.Artist.template.entry")); + entry->addFunction("tr", Wt::WTemplate::Functions::tr); + + { + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + cover->setStyleClass("Lms-cover-medium"); + anchor->setImage(std::move(cover)); + } + + entry->bindWidget("name", LmsApplication::createReleaseAnchor(release)); + + auto artists {release->getReleaseArtists()}; + if (artists.empty()) + artists = release->getArtists(); + + bool isSameArtist {(std::find(std::cbegin(artists), std::cend(artists), artist) != artists.end())}; + + if (artists.size() > 1) + { + entry->setCondition("if-has-artist", true); + entry->bindNew("artist", Wt::WString::tr("Lms.Explore.various-artists")); + } + else if (artists.size() == 1 && !isSameArtist) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist", LmsApplication::createArtistAnchor(artists.front())); + } + + std::optional year {release->getReleaseYear()}; + if (year) + { + entry->setCondition("if-has-year", true); + entry->bindInt("year", *year); + + std::optional originalYear {release->getReleaseYear(true)}; + if (originalYear && *originalYear != *year) { - Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); - cover->setStyleClass("Lms-cover-medium"); - anchor->setImage(std::move(cover)); + entry->setCondition("if-has-orig-year", true); + entry->bindInt("orig-year", *originalYear); } + } - entry->bindWidget("name", LmsApplication::createReleaseAnchor(release)); + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); + playBtn->clicked().connect([=] + { + releasesPlay.emit({releaseId}); + }); - auto artists {release->getReleaseArtists()}; - if (artists.empty()) - artists = release->getArtists(); + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); + addBtn->clicked().connect([=] + { + releasesAdd.emit({releaseId}); + }); - bool isSameArtist {(std::find(std::cbegin(artists), std::cend(artists), artist) != artists.end())}; + return entry; +} - if (artists.size() > 1) - { - entry->setCondition("if-has-artist", true); - entry->bindNew("artist", Wt::WString::tr("Lms.Explore.various-artists")); - } - else if (artists.size() == 1 && !isSameArtist) - { - entry->setCondition("if-has-artist", true); - entry->bindWidget("artist", LmsApplication::createArtistAnchor(artists.front())); - } +void +Artist::refreshSimilarArtists(const std::vector& similarArtistsId) +{ + auto* similarArtistsContainer {bindNew("similar-artists")}; - std::optional year {release->getReleaseYear()}; - if (year) - { - entry->setCondition("if-has-year", true); - entry->bindInt("year", *year); + for (Database::IdType artistId : similarArtistsId) + { + const Database::Artist::pointer similarArtist{Database::Artist::getById(LmsApp->getDbSession(), artistId)}; + if (!similarArtist) + continue; - std::optional originalYear {release->getReleaseYear(true)}; - if (originalYear && *originalYear != *year) - { - entry->setCondition("if-has-orig-year", true); - entry->bindInt("orig-year", *originalYear); - } - } - - Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); - playBtn->clicked().connect([=] - { - releasesPlay.emit({releaseId}); - }); - - Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); - addBtn->clicked().connect([=] - { - releasesAdd.emit({releaseId}); - }); + similarArtistsContainer->addWidget(ArtistListHelpers::createEntrySmall(similarArtist)); } } diff --git a/src/lms/ui/explore/ArtistView.hpp b/src/lms/ui/explore/ArtistView.hpp index abfb30d6..cfad36d6 100644 --- a/src/lms/ui/explore/ArtistView.hpp +++ b/src/lms/ui/explore/ArtistView.hpp @@ -19,16 +19,24 @@ #pragma once -#include +#include + #include +#include #include "database/Types.hpp" +namespace Database +{ + class Artist; + class Release; +} + namespace UserInterface { class Filters; -class Artist : public Wt::WContainerWidget +class Artist : public Wt::WTemplate { public: Artist(Filters* filters); @@ -40,9 +48,12 @@ class Artist : public Wt::WContainerWidget Wt::Signal&> releasesPlay; private: - void refresh(); + void refreshView(); + void refreshSimilarArtists(const std::vector& similarArtistsId); - Filters* _filters; + std::unique_ptr createRelease(const Wt::Dbo::ptr& artist, const Wt::Dbo::ptr& release); + + Filters* _filters {}; }; } // namespace UserInterface diff --git a/src/lms/ui/explore/ArtistsInfoView.cpp b/src/lms/ui/explore/ArtistsInfoView.cpp deleted file mode 100644 index ac0dd65d..00000000 --- a/src/lms/ui/explore/ArtistsInfoView.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* - * 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 . - */ - -#include "ArtistsInfoView.hpp" - -#include - -#include "database/Artist.hpp" -#include "database/TrackList.hpp" -#include "database/User.hpp" -#include "ArtistLink.hpp" -#include "LmsApplication.hpp" -#include "MediaPlayer.hpp" - -using namespace Database; - -namespace UserInterface { - -ArtistsInfo::ArtistsInfo() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ArtistsInfo.template")) -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _mostPlayedContainer = bindNew("most-played"); - _recentlyAddedContainer = bindNew("recently-added"); - - LmsApp->getEvents().dbScanned.connect([=] - { - refreshRecentlyAdded(); - }); - - LmsApp->getMediaPlayer()->trackLoaded.connect([=] - { - refreshMostPlayed(); - }); - - refreshMostPlayed(); - refreshRecentlyAdded(); -} - -void -ArtistsInfo::refreshRecentlyAdded() -{ - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6); - - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const std::vector artists {Artist::getLastWritten(LmsApp->getDbSession(), after, 5)}; - - _recentlyAddedContainer->clear(); - for (const Database::Artist::pointer& artist : artists) - _recentlyAddedContainer->addNew(artist); -} - -void -ArtistsInfo::refreshMostPlayed() -{ - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const std::vector artists {LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTopArtists(5)}; - - _mostPlayedContainer->clear(); - for (const Database::Artist::pointer& artist : artists) - _mostPlayedContainer->addNew(artist); -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ArtistsInfoView.hpp b/src/lms/ui/explore/ArtistsInfoView.hpp deleted file mode 100644 index dc9d83c1..00000000 --- a/src/lms/ui/explore/ArtistsInfoView.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include -#include - -namespace UserInterface { - -class ArtistsInfo : public Wt::WTemplate -{ - public: - ArtistsInfo(); - - void refreshRecentlyAdded(); - void refreshMostPlayed(); - - private: - Wt::WContainerWidget* _mostPlayedContainer; - Wt::WContainerWidget* _recentlyAddedContainer; -}; - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ArtistsView.cpp b/src/lms/ui/explore/ArtistsView.cpp index 28d1bfc9..abb90172 100644 --- a/src/lms/ui/explore/ArtistsView.cpp +++ b/src/lms/ui/explore/ArtistsView.cpp @@ -21,16 +21,15 @@ #include -#include -#include -#include -#include +#include #include "common/ValueStringModel.hpp" #include "database/Artist.hpp" +#include "database/User.hpp" +#include "database/TrackList.hpp" #include "utils/Logger.hpp" -#include "utils/String.hpp" +#include "ArtistListHelpers.hpp" #include "LmsApplication.hpp" #include "Filters.hpp" @@ -41,14 +40,29 @@ namespace UserInterface { using ArtistLinkModel = ValueStringModel>; Artists::Artists(Filters* filters) -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Artists.template")), - _filters(filters) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Artists.template")}, + _filters {filters} { addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = bindNew("search"); - _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); - _search->textInput().connect(this, &Artists::refresh); + { + auto* menu {bindNew("mode")}; + + auto addItem = [this](Wt::WMenu& menu,const Wt::WString& str, Mode mode) + { + auto* item {menu.addItem(str)}; + item->clicked().connect([this, mode] { refreshView(mode); }); + + if (mode == defaultMode) + item->renderSelected(true); + }; + + addItem(*menu, Wt::WString::tr("Lms.Explore.random"), Mode::Random); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-played"), Mode::RecentlyPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.most-played"), Mode::MostPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-added"), Mode::RecentlyAdded); + addItem(*menu, Wt::WString::tr("Lms.Explore.all"), Mode::All); + } _linkType = bindNew("link-type"); { @@ -58,51 +72,135 @@ Artists::Artists(Filters* filters) linkTypeModel->add(Wt::WString::tr("Lms.Explore.Artists.linktype-releaseartist"), TrackArtistLink::Type::ReleaseArtist); _linkType->setModel(linkTypeModel); } - _linkType->changed().connect(this, &Artists::refresh); + _linkType->changed().connect([this] { refreshView(); }); _container = bindNew("artists"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); - _showMore->clicked().connect(std::bind([=] + _showMore->clicked().connect([=] { addSome(); - })); + }); - refresh(); + refreshView(); - filters->updated().connect(this, &Artists::refresh); + filters->updated().connect([this] { refreshView(); }); } void -Artists::refresh() +Artists::refreshView() { _container->clear(); + _randomArtists.clear(); addSome(); } +void +Artists::refreshView(Mode mode) +{ + _mode = mode; + refreshView(); +} + +std::vector +Artists::getRandomArtists(std::optional range, bool& moreResults) +{ + std::vector artists; + + const std::optional linkType {static_cast(_linkType->model().get())->getValue(_linkType->currentIndex())}; + + if (_randomArtists.empty()) + _randomArtists = Artist::getAllIdsRandom(LmsApp->getDbSession(), _filters->getClusterIds(), linkType, maxItemsPerMode[Mode::Random]); + + { + auto itBegin {std::cbegin(_randomArtists) + std::min(range ? range->offset : 0, _randomArtists.size())}; + auto itEnd {std::cbegin(_randomArtists) + std::min(range ? range->offset + range->limit : _randomArtists.size(), _randomArtists.size())}; + + for (auto it {itBegin}; it != itEnd; ++it) + { + Artist::pointer artist {Artist::getById(LmsApp->getDbSession(), *it)}; + if (artist) + artists.push_back(artist); + } + + moreResults = (itEnd != std::cend(_randomArtists)); + } + + return artists; +} + +std::vector +Artists::getArtists(std::optional range, bool& moreResults) +{ + std::vector artists; + + const std::optional linkType {static_cast(_linkType->model().get())->getValue(_linkType->currentIndex())}; + + const std::optional modeLimit{maxItemsPerMode[_mode]}; + if (modeLimit) + { + if (range) + range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit); + else + range = Range {0, *modeLimit}; + } + + switch (_mode) + { + case Mode::Random: + artists = getRandomArtists(range, moreResults); + break; + + case Mode::RecentlyPlayed: + artists = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession()) + ->getArtistsReverse(_filters->getClusterIds(), + linkType, + range, moreResults); + break; + + case Mode::MostPlayed: + artists = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession()) + ->getTopArtists(_filters->getClusterIds(), + linkType, + range, moreResults); + break; + + case Mode::RecentlyAdded: + artists = Artist::getLastWritten(LmsApp->getDbSession(), + std::nullopt, + _filters->getClusterIds(), + linkType, + range, moreResults); + break; + + case Mode::All: + artists = Artist::getByFilter(LmsApp->getDbSession(), + _filters->getClusterIds(), + {}, + linkType, + Artist::SortMethod::BySortName, + range, moreResults); + break; + + default: + break; + } + + if (range && modeLimit && (range->offset + range->limit == *modeLimit)) + moreResults = false; + + return artists; +} + void Artists::addSome() { - const auto searchKeywords {StringUtils::splitString(_search->text().toUTF8(), " ")}; - - auto clusterIds = _filters->getClusterIds(); - auto linkModel = static_cast(_linkType->model().get()); - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; bool moreResults {}; - const std::vector artists {Artist::getByFilter(LmsApp->getDbSession(), - clusterIds, - searchKeywords, - linkModel->getValue(_linkType->currentIndex()), - Artist::SortMethod::BySortName, - _container->count(), 20, moreResults)}; - - for (const auto& artist : artists) + for (const Artist::pointer& artist : getArtists(Range {static_cast(_container->count()), batchSize}, moreResults)) { - Wt::WTemplate* entry {_container->addNew(Wt::WString::tr("Lms.Explore.Artists.template.entry"))}; - - entry->bindWidget("name", LmsApplication::createArtistAnchor(artist)); + _container->addWidget(ArtistListHelpers::createEntry(artist)); } _showMore->setHidden(!moreResults); diff --git a/src/lms/ui/explore/ArtistsView.hpp b/src/lms/ui/explore/ArtistsView.hpp index 169c7088..8fd173f2 100644 --- a/src/lms/ui/explore/ArtistsView.hpp +++ b/src/lms/ui/explore/ArtistsView.hpp @@ -19,15 +19,22 @@ #pragma once +#include +#include + #include #include -#include #include #include #include #include "database/Types.hpp" +namespace Database +{ + class Artist; +} + namespace UserInterface { class Filters; @@ -37,18 +44,40 @@ class Artists : public Wt::WTemplate public: Artists(Filters* filters); - Wt::Signal&> artistsAdd; - Wt::Signal&> artistsPlay; - private: - void refresh(); + enum class Mode + { + Random, + RecentlyPlayed, + RecentlyAdded, + MostPlayed, + All + }; + + void refreshView(); + void refreshView(Mode mode); void addSome(); - Filters* _filters; - Wt::WPushButton* _showMore; - Wt::WLineEdit* _search; - Wt::WComboBox* _linkType; - Wt::WContainerWidget* _container; + std::vector> getArtists(std::optional range, bool& moreResults); + std::vector> getRandomArtists(std::optional range, bool& moreResults); + + static constexpr Mode defaultMode {Mode::Random}; + static constexpr std::size_t batchSize {30}; + static inline std::unordered_map> maxItemsPerMode + { + {Mode::Random, batchSize * 4}, + {Mode::RecentlyPlayed, batchSize * 4}, + {Mode::RecentlyAdded, batchSize * 2}, + {Mode::MostPlayed, batchSize * 2}, + {Mode::All, std::nullopt}, + }; + + Mode _mode {defaultMode}; + std::vector _randomArtists; + Filters* _filters {}; + Wt::WPushButton* _showMore {}; + Wt::WContainerWidget* _container {}; + Wt::WComboBox* _linkType {}; }; } // namespace UserInterface diff --git a/src/lms/ui/explore/Explore.cpp b/src/lms/ui/explore/Explore.cpp index 860230d0..72c7ca1d 100644 --- a/src/lms/ui/explore/Explore.cpp +++ b/src/lms/ui/explore/Explore.cpp @@ -30,16 +30,11 @@ #include "LmsApplication.hpp" -#include "ArtistInfoView.hpp" -#include "ArtistsInfoView.hpp" #include "ArtistsView.hpp" #include "ArtistView.hpp" #include "Filters.hpp" -#include "ReleaseInfoView.hpp" -#include "ReleasesInfoView.hpp" #include "ReleasesView.hpp" #include "ReleaseView.hpp" -#include "TracksInfoView.hpp" #include "TracksView.hpp" namespace UserInterface { @@ -77,53 +72,19 @@ handleContentsPathChange(Wt::WStackedWidget* stack) } } -void -handleInfoPathChange(Wt::WStackedWidget* stack) -{ - enum Idx - { - IdxArtist = 0, - IdxArtists, - IdxRelease, - IdxReleases, - IdxTracks, - }; - - static const std::map indexes = - { - { "/artists", IdxArtists }, - { "/artist", IdxArtist }, - { "/releases", IdxReleases }, - { "/release", IdxRelease }, - { "/tracks", IdxTracks }, - }; - - for (auto index : indexes) - { - if (wApp->internalPathMatches(index.first)) - { - stack->setCurrentIndex(index.second); - return; - } - } -} - } // namespace -Explore::Explore() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.template")) +Explore::Explore(Filters* filters) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.template")} +, _filters {filters} { addFunction("tr", &Functions::tr); - _filters = bindNew("filters"); - // Contents Wt::WStackedWidget* contentsStack = bindNew("contents"); contentsStack->setAttributeValue("style", "overflow-x:visible;overflow-y:visible;"); auto artists = std::make_unique(_filters); - artists->artistsAdd.connect(this, &Explore::handleArtistsAdd); - artists->artistsPlay.connect(this, &Explore::handleArtistsPlay); contentsStack->addWidget(std::move(artists)); auto artist = std::make_unique(_filters); @@ -150,32 +111,12 @@ Explore::Explore() tracks->tracksPlay.connect(this, &Explore::handleTracksPlay); contentsStack->addWidget(std::move(tracks)); - // Info - Wt::WStackedWidget* infoStack = bindNew("info"); - - auto artistInfo = std::make_unique(); - infoStack->addWidget(std::move(artistInfo)); - - auto artistsInfo = std::make_unique(); - infoStack->addWidget(std::move(artistsInfo)); - - auto releaseInfo = std::make_unique(); - infoStack->addWidget(std::move(releaseInfo)); - - auto releasesInfo = std::make_unique(); - infoStack->addWidget(std::move(releasesInfo)); - - auto tracksInfo = std::make_unique(); - infoStack->addWidget(std::move(tracksInfo)); - - wApp->internalPathChanged().connect(std::bind([=] + wApp->internalPathChanged().connect([=] { handleContentsPathChange(contentsStack); - handleInfoPathChange(infoStack); - })); + }); handleContentsPathChange(contentsStack); - handleInfoPathChange(infoStack); } static diff --git a/src/lms/ui/explore/Explore.hpp b/src/lms/ui/explore/Explore.hpp index d6cf934e..676269f3 100644 --- a/src/lms/ui/explore/Explore.hpp +++ b/src/lms/ui/explore/Explore.hpp @@ -30,7 +30,7 @@ class Filters; class Explore : public Wt::WTemplate { public: - Explore(); + Explore(Filters* filters); Wt::Signal> tracksAdd; Wt::Signal> tracksPlay; @@ -44,7 +44,7 @@ class Explore : public Wt::WTemplate void handleTracksAdd(const std::vector& tracksId); void handleTracksPlay(const std::vector& tracksId); - Filters* _filters; + Filters* _filters {}; }; } // namespace UserInterface diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp index 231ee305..62a08100 100644 --- a/src/lms/ui/explore/Filters.cpp +++ b/src/lms/ui/explore/Filters.cpp @@ -41,7 +41,7 @@ Filters::showDialog() Wt::WComboBox* typeCombo = container->bindNew("type"); Wt::WComboBox* valueCombo = container->bindNew("value"); - Wt::WPushButton* addBtn = container->bindNew("add-btn", Wt::WString::tr("Lms.add")); + Wt::WPushButton* addBtn = container->bindNew("add-btn", Wt::WString::tr("Lms.Explore.add-filter")); addBtn->clicked().connect(dialog.get(), &Wt::WDialog::accept); Wt::WPushButton* cancelBtn = container->bindNew("cancel-btn", Wt::WString::tr("Lms.cancel")); @@ -155,12 +155,12 @@ Filters::add(Database::IdType clusterId) } Filters::Filters() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.template.filters")) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.template.filters")} { addFunction("tr", &Functions::tr); // Filters - Wt::WPushButton *addFilterBtn = bindNew("add-filter", Wt::WText::tr("Lms.add")); + Wt::WPushButton *addFilterBtn = bindNew("add-filter", Wt::WText::tr("Lms.Explore.add-filter")); addFilterBtn->clicked().connect(this, &Filters::showDialog); _filters = bindNew("clusters"); diff --git a/src/lms/ui/explore/ReleaseInfoView.cpp b/src/lms/ui/explore/ReleaseInfoView.cpp deleted file mode 100644 index 759b20de..00000000 --- a/src/lms/ui/explore/ReleaseInfoView.cpp +++ /dev/null @@ -1,116 +0,0 @@ -/* - * 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 . - */ - -#include "ReleaseInfoView.hpp" - -#include - -#include "database/Release.hpp" -#include "recommendation/IEngine.hpp" -#include "utils/Service.hpp" -#include "utils/String.hpp" - -#include "ReleaseLink.hpp" -#include "LmsApplication.hpp" - -using namespace Database; - -namespace UserInterface { - -ReleaseInfo::ReleaseInfo() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ReleaseInfo.template")) -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _similarReleasesContainer = bindNew("similar-releases"); - - wApp->internalPathChanged().connect(std::bind([=] - { - refresh(); - })); - - LmsApp->getEvents().dbScanned.connect([=] - { - refresh(); - }); - - refresh(); -} - -void -ReleaseInfo::refresh() -{ - _similarReleasesContainer->clear(); - setCondition("if-has-copyright-or-copyright-url", false); - setCondition("if-has-copyright-url", false); - setCondition("if-has-copyright", false); - - if (!wApp->internalPathMatches("/release/")) - return; - - auto releaseId {StringUtils::readAs(wApp->internalPathNextPart("/release/"))}; - if (!releaseId) - return; - - const std::vector releasesIds {ServiceProvider::get()->getSimilarReleases(LmsApp->getDbSession(), *releaseId, 5)}; - - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - Database::Release::pointer release {Database::Release::getById(LmsApp->getDbSession(), *releaseId)}; - if (!release) - return; - - std::optional copyright {release->getCopyright()}; - std::optional copyrightURL {release->getCopyrightURL()}; - - setCondition("if-has-copyright-or-copyright-url", copyright || copyrightURL); - - if (copyrightURL) - { - setCondition("if-has-copyright-url", true); - - Wt::WLink link {*copyrightURL}; - link.setTarget(Wt::LinkTarget::NewWindow); - - Wt::WAnchor* anchor {bindNew("copyright-url", link)}; - anchor->setTextFormat(Wt::TextFormat::XHTML); - anchor->setText(Wt::WString::tr("Lms.Explore.Release.template.link-btn")); - } - - if (copyright) - { - setCondition("if-has-copyright", true); - bindString("copyright", Wt::WString::fromUTF8(*copyright), Wt::TextFormat::Plain); - } - - std::vector similarReleases; - for (Database::IdType id : releasesIds) - { - Database::Release::pointer similarRelease {Database::Release::getById(LmsApp->getDbSession(), id)}; - - if (similarRelease) - similarReleases.emplace_back(similarRelease); - } - - for (const Database::Release::pointer& similarRelease : similarReleases) - _similarReleasesContainer->addNew(similarRelease); -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ReleaseInfoView.hpp b/src/lms/ui/explore/ReleaseInfoView.hpp deleted file mode 100644 index a8eb7365..00000000 --- a/src/lms/ui/explore/ReleaseInfoView.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include -#include - -namespace UserInterface { - -class ReleaseInfo : public Wt::WTemplate -{ - public: - ReleaseInfo(); - - private: - void refresh(); - - Wt::WContainerWidget* _similarReleasesContainer; -}; - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ReleaseLink.cpp b/src/lms/ui/explore/ReleaseLink.cpp deleted file mode 100644 index 5f45e2e4..00000000 --- a/src/lms/ui/explore/ReleaseLink.cpp +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2019 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 . - */ - -#include "ReleaseLink.hpp" - -#include -#include -#include - -#include "database/Release.hpp" -#include "resource/ImageResource.hpp" - -#include "LmsApplication.hpp" - -using namespace Database; - -namespace UserInterface { - -ReleaseLink::ReleaseLink(Database::Release::pointer release) -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ReleaseLink.template")) -{ - bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); - - Wt::WAnchor* anchor = bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 64)); - cover->setStyleClass("Lms-cover-smaller"); - anchor->setImage(std::move(cover)); - - auto artists = release->getReleaseArtists(); - if (artists.empty()) - artists = release->getArtists(); - - if (artists.size() > 1) - { - setCondition("if-has-artist", true); - bindNew("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); - } - else if (artists.size() == 1) - { - setCondition("if-has-artist", true); - bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); - } -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp new file mode 100644 index 00000000..a1948d31 --- /dev/null +++ b/src/lms/ui/explore/ReleaseListHelpers.cpp @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2019 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 . + */ + +#include "ReleaseListHelpers.hpp" + +#include +#include +#include + +#include "database/Release.hpp" +#include "resource/ImageResource.hpp" + +#include "LmsApplication.hpp" + +using namespace Database; + +namespace UserInterface::ReleaseListHelpers +{ + + std::unique_ptr + createEntrySmall(const Database::Release::pointer& release) + { + auto entry {std::make_unique(Wt::WString::tr("Lms.Explore.Releases.template.entry-small"))}; + + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); + + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 64)); + cover->setStyleClass("Lms-cover-smaller"); + anchor->setImage(std::move(cover)); + + auto artists = release->getReleaseArtists(); + if (artists.empty()) + artists = release->getArtists(); + + if (artists.size() > 1) + { + entry->setCondition("if-has-artist", true); + entry->bindNew("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); + } + else if (artists.size() == 1) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); + } + + return entry; + } + +} // namespace UserInterface + diff --git a/src/lms/ui/explore/ReleaseLink.hpp b/src/lms/ui/explore/ReleaseListHelpers.hpp similarity index 77% rename from src/lms/ui/explore/ReleaseLink.hpp rename to src/lms/ui/explore/ReleaseListHelpers.hpp index 9dc4a50c..81cb266f 100644 --- a/src/lms/ui/explore/ReleaseLink.hpp +++ b/src/lms/ui/explore/ReleaseListHelpers.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Emeric Poupon + * Copyright (C) 2020 Emeric Poupon * * This file is part of LMS. * @@ -19,19 +19,19 @@ #pragma once +#include + #include -namespace Database { +namespace Database +{ class Release; } -namespace UserInterface { - -class ReleaseLink : public Wt::WTemplate +namespace UserInterface::ReleaseListHelpers { - public: - ReleaseLink(Wt::Dbo::ptr); -}; + + std::unique_ptr createEntrySmall(const Wt::Dbo::ptr& release); } // namespace UserInterface diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 3604b266..6dc7d81e 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -28,16 +28,16 @@ #include "database/Release.hpp" #include "database/ScanSettings.hpp" #include "database/Track.hpp" - +#include "recommendation/IEngine.hpp" #include "utils/Logger.hpp" #include "utils/String.hpp" #include "resource/ImageResource.hpp" - #include "Filters.hpp" #include "LmsApplication.hpp" #include "LmsApplicationException.hpp" #include "MediaPlayer.hpp" +#include "ReleaseListHelpers.hpp" #include "TrackStringUtils.hpp" using namespace Database; @@ -45,53 +45,60 @@ using namespace Database; namespace UserInterface { Release::Release(Filters* filters) -: _filters(filters) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Release.template")} +, _filters(filters) { + addFunction("tr", &Wt::WTemplate::Functions::tr); + wApp->internalPathChanged().connect([=]() { - refresh(); + refreshView(); }); - refresh(); - filters->updated().connect([=] { - refresh(); + refreshView(); }); + + refreshView(); } void -Release::refresh() +Release::refreshView() { if (!wApp->internalPathMatches("/release/")) return; clear(); - auto releaseId {StringUtils::readAs(wApp->internalPathNextPart("/release/"))}; + + const auto releaseId {StringUtils::readAs(wApp->internalPathNextPart("/release/"))}; if (!releaseId) return; - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + const std::vector similarReleasesIds {ServiceProvider::get()->getSimilarReleases(LmsApp->getDbSession(), *releaseId, 5)}; + + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; const Database::Release::pointer release {Database::Release::getById(LmsApp->getDbSession(), *releaseId)}; if (!release) throw ReleaseNotFoundException {*releaseId}; - Wt::WTemplate* t {addNew(Wt::WString::tr("Lms.Explore.Release.template"))}; + refreshCopyright(release); + refreshSimilarReleases(similarReleasesIds); - t->bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain); + bindString("name", Wt::WString::fromUTF8(release->getName()), Wt::TextFormat::Plain); std::optional year {release->getReleaseYear()}; if (year) { - t->setCondition("if-has-year", true); - t->bindInt("year", *year); + setCondition("if-has-year", true); + bindInt("year", *year); std::optional originalYear {release->getReleaseYear(true)}; if (originalYear && *originalYear != *year) { - t->setCondition("if-has-orig-year", true); - t->bindInt("orig-year", *originalYear); + setCondition("if-has-orig-year", true); + bindInt("orig-year", *originalYear); } } @@ -104,22 +111,22 @@ Release::refresh() if (artists.size() > 1) { - t->setCondition("if-has-artist", true); - t->bindNew("artist", Wt::WString::tr("Lms.Explore.various-artists")); + setCondition("if-has-artist", true); + bindNew("artist", Wt::WString::tr("Lms.Explore.various-artists")); } else if (artists.size() == 1) { - t->setCondition("if-has-artist", true); - t->bindWidget("artist", LmsApplication::createArtistAnchor(artists.front())); + setCondition("if-has-artist", true); + bindWidget("artist", LmsApplication::createArtistAnchor(artists.front())); } } { - Wt::WImage* cover {t->bindNew("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512)))}; + Wt::WImage* cover {bindNew("cover", Wt::WLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 512)))}; cover->setStyleClass("Lms-cover-large"); } - Wt::WContainerWidget* clusterContainers {t->bindNew("clusters")}; + Wt::WContainerWidget* clusterContainers {bindNew("clusters")}; { const auto clusterTypes {ScanSettings::get(LmsApp->getDbSession())->getClusterTypes()}; const auto clusterGroups {release->getClusterGroups(clusterTypes, 3)}; @@ -139,7 +146,7 @@ Release::refresh() } { - Wt::WText* playBtn {t->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)}; + Wt::WText* playBtn {bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)}; playBtn->clicked().connect([=] { releasesPlay.emit({*releaseId}); @@ -147,14 +154,14 @@ Release::refresh() } { - Wt::WText* addBtn {t->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)}; + Wt::WText* addBtn {bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)}; addBtn->clicked().connect([=] { releasesAdd.emit({*releaseId}); }); } - Wt::WContainerWidget* rootContainer {t->bindNew("container")}; + Wt::WContainerWidget* rootContainer {bindNew("container")}; const bool variousArtists {release->hasVariousArtists()}; const auto totalDisc {release->getTotalDisc()}; @@ -244,5 +251,47 @@ Release::refresh() } } +void +Release::refreshCopyright(const Database::Release::pointer& release) +{ + std::optional copyright {release->getCopyright()}; + std::optional copyrightURL {release->getCopyrightURL()}; + + setCondition("if-has-copyright-or-copyright-url", copyright || copyrightURL); + + if (copyrightURL) + { + setCondition("if-has-copyright-url", true); + + Wt::WLink link {*copyrightURL}; + link.setTarget(Wt::LinkTarget::NewWindow); + + Wt::WAnchor* anchor {bindNew("copyright-url", link)}; + anchor->setTextFormat(Wt::TextFormat::XHTML); + anchor->setText(Wt::WString::tr("Lms.Explore.Release.template.link-btn")); + } + + if (copyright) + { + setCondition("if-has-copyright", true); + bindString("copyright", Wt::WString::fromUTF8(*copyright), Wt::TextFormat::Plain); + } +} + +void +Release::refreshSimilarReleases(const std::vector& similarReleasesId) +{ + auto* similarReleasesContainer {bindNew("similar-releases")}; + + for (Database::IdType id : similarReleasesId) + { + Database::Release::pointer similarRelease{Database::Release::getById(LmsApp->getDbSession(), id)}; + if (!similarRelease) + continue; + + similarReleasesContainer->addWidget(ReleaseListHelpers::createEntrySmall(similarRelease)); + } +} + } // namespace UserInterface diff --git a/src/lms/ui/explore/ReleaseView.hpp b/src/lms/ui/explore/ReleaseView.hpp index 0b5da712..3d84ee14 100644 --- a/src/lms/ui/explore/ReleaseView.hpp +++ b/src/lms/ui/explore/ReleaseView.hpp @@ -20,29 +20,37 @@ #pragma once #include -#include +#include #include "database/Types.hpp" -namespace UserInterface { - -class Filters; -class Release : public Wt::WContainerWidget +namespace Database { - public: - Release(Filters* filters); + class Release; +} - Wt::Signal&> releasesAdd; - Wt::Signal&> releasesPlay; +namespace UserInterface +{ - Wt::Signal&> tracksAdd; - Wt::Signal&> tracksPlay; + class Filters; + class Release : public Wt::WTemplate + { + public: + Release(Filters* filters); - private: - void refresh(); + Wt::Signal&> releasesAdd; + Wt::Signal&> releasesPlay; - Filters* _filters; -}; + Wt::Signal&> tracksAdd; + Wt::Signal&> tracksPlay; + + private: + void refreshView(); + void refreshCopyright(const Wt::Dbo::ptr& release); + void refreshSimilarReleases(const std::vector& similarReleasesId); + + Filters* _filters {}; + }; } // namespace UserInterface diff --git a/src/lms/ui/explore/ReleasesInfoView.cpp b/src/lms/ui/explore/ReleasesInfoView.cpp deleted file mode 100644 index f5690ec8..00000000 --- a/src/lms/ui/explore/ReleasesInfoView.cpp +++ /dev/null @@ -1,85 +0,0 @@ -/* - * 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 . - */ - -#include "ReleasesInfoView.hpp" - -#include - -#include "database/Release.hpp" -#include "database/TrackList.hpp" -#include "database/User.hpp" -#include "resource/ImageResource.hpp" -#include "ReleaseLink.hpp" -#include "LmsApplication.hpp" -#include "MediaPlayer.hpp" - -using namespace Database; - -namespace UserInterface { - -ReleasesInfo::ReleasesInfo() -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.ReleasesInfo.template")) -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _mostPlayedContainer = bindNew("most-played"); - _recentlyAddedContainer = bindNew("recently-added"); - - LmsApp->getEvents().dbScanned.connect([=] - { - refreshRecentlyAdded(); - }); - - LmsApp->getMediaPlayer()->trackLoaded.connect([=] - { - refreshMostPlayed(); - }); - - refreshRecentlyAdded(); - refreshMostPlayed(); -} - -void -ReleasesInfo::refreshRecentlyAdded() -{ - auto after = Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6); - - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const auto releases {Release::getLastWritten(LmsApp->getDbSession(), after, 0, 5)}; - - _recentlyAddedContainer->clear(); - for (const Database::Release::pointer& release : releases) - _recentlyAddedContainer->addNew(release); -} - -void -ReleasesInfo::refreshMostPlayed() -{ - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const auto releases {LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTopReleases(5)}; - - _mostPlayedContainer->clear(); - for (const Database::Release::pointer& release : releases) - _mostPlayedContainer->addNew(release); -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ReleasesInfoView.hpp b/src/lms/ui/explore/ReleasesInfoView.hpp deleted file mode 100644 index a74edf84..00000000 --- a/src/lms/ui/explore/ReleasesInfoView.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include -#include - -namespace UserInterface { - -class ReleasesInfo : public Wt::WTemplate -{ - public: - ReleasesInfo(); - - private: - void refreshRecentlyAdded(); - void refreshMostPlayed(); - - Wt::WContainerWidget* _mostPlayedContainer; - Wt::WContainerWidget* _recentlyAddedContainer; -}; - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/ReleasesView.cpp b/src/lms/ui/explore/ReleasesView.cpp index 55b27721..ddc5977c 100644 --- a/src/lms/ui/explore/ReleasesView.cpp +++ b/src/lms/ui/explore/ReleasesView.cpp @@ -19,44 +19,63 @@ #include "ReleasesView.hpp" +#include + #include #include +#include #include -#include #include "database/Release.hpp" +#include "database/User.hpp" +#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/String.hpp" #include "resource/ImageResource.hpp" -#include "LmsApplication.hpp" #include "Filters.hpp" +#include "LmsApplication.hpp" using namespace Database; namespace UserInterface { Releases::Releases(Filters* filters) -: Wt::WTemplate(Wt::WString::tr("Lms.Explore.Releases.template")), -_filters(filters) +: Wt::WTemplate {Wt::WString::tr("Lms.Explore.Releases.template")}, +_filters {filters} { addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = bindNew("search"); - _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); - _search->textInput().connect(this, &Releases::refresh); + { + auto* menu {bindNew("mode")}; + + auto addItem = [this](Wt::WMenu& menu,const Wt::WString& str, Mode mode) + { + auto* item {menu.addItem(str)}; + item->clicked().connect([this, mode] { refreshView(mode); }); + + if (mode == defaultMode) + item->renderSelected(true); + }; + + addItem(*menu, Wt::WString::tr("Lms.Explore.random"), Mode::Random); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-played"), Mode::RecentlyPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.most-played"), Mode::MostPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-added"), Mode::RecentlyAdded); + addItem(*menu, Wt::WString::tr("Lms.Explore.all"), Mode::All); + } Wt::WText* playBtn {bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML)}; playBtn->clicked().connect([this] { - releasesPlay.emit(getReleases()); + releasesPlay.emit(getAllReleases()); }); Wt::WText* addBtn {bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML)}; addBtn->clicked().connect([this] { - releasesAdd.emit(getReleases()); + releasesAdd.emit(getAllReleases()); }); _container = bindNew("releases"); @@ -67,95 +86,169 @@ _filters(filters) addSome(); }); - refresh(); + refreshView(defaultMode); - filters->updated().connect(this, &Releases::refresh); + filters->updated().connect([this] { refreshView(); }); } void -Releases::refresh() +Releases::refreshView() { _container->clear(); + _randomReleases.clear(); addSome(); } +void +Releases::refreshView(Mode mode) +{ + _mode = mode; + refreshView(); +} + +std::unique_ptr +Releases::createEntry(const Release::pointer& release) +{ + const IdType releaseId {release.id()}; + + auto entry = std::make_unique(Wt::WString::tr("Lms.Explore.Releases.template.entry")); + entry->addFunction("tr", Wt::WTemplate::Functions::tr); + + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); + cover->setStyleClass("Lms-cover-medium"); + anchor->setImage(std::move(cover)); + + entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); + + auto artists = release->getReleaseArtists(); + if (artists.empty()) + artists = release->getArtists(); + + if (artists.size() > 1) + { + entry->setCondition("if-has-artist", true); + entry->bindNew("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); + } + else if (artists.size() == 1) + { + entry->setCondition("if-has-artist", true); + entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); + } + + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); + playBtn->clicked().connect([=] + { + releasesPlay.emit({releaseId}); + }); + + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); + addBtn->clicked().connect([=] + { + releasesAdd.emit({releaseId}); + }); + + return entry; +} + void Releases::addSome() { bool moreResults {}; - const auto releasesId {getReleases(_container->count(), 20, moreResults)}; - for (const Database::IdType releaseId : releasesId ) + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + + for (const Release::pointer& release : getReleases(Range {static_cast(_container->count()), batchSize}, moreResults)) { - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const Database::Release::pointer release {Database::Release::getById(LmsApp->getDbSession(), releaseId)}; - - Wt::WTemplate* entry = _container->addNew(Wt::WString::tr("Lms.Explore.Releases.template.entry")); - entry->addFunction("tr", Wt::WTemplate::Functions::tr); - - Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 128)); - // Some images may not be square - cover->setStyleClass("Lms-cover-medium"); - anchor->setImage(std::move(cover)); - - entry->bindWidget("release-name", LmsApplication::createReleaseAnchor(release)); - - auto artists = release->getReleaseArtists(); - if (artists.empty()) - artists = release->getArtists(); - - if (artists.size() > 1) - { - entry->setCondition("if-has-artist", true); - entry->bindNew("artist-name", Wt::WString::tr("Lms.Explore.various-artists")); - } - else if (artists.size() == 1) - { - entry->setCondition("if-has-artist", true); - entry->bindWidget("artist-name", LmsApplication::createArtistAnchor(artists.front())); - } - - Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); - playBtn->clicked().connect([=] - { - releasesPlay.emit({releaseId}); - }); - - Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); - addBtn->clicked().connect([=] - { - releasesAdd.emit({releaseId}); - }); + _container->addWidget(createEntry(release)); } _showMore->setHidden(!moreResults); } -std::vector -Releases::getReleases(std::optional offset, std::optional limit, bool& moreResults) const +std::vector +Releases::getRandomReleases(std::optional range, bool& moreResults) { - const auto searchKeywords {StringUtils::splitString(_search->text().toUTF8(), " ")}; + std::vector releases; + if (_randomReleases.empty()) + _randomReleases = Release::getAllIdsRandom(LmsApp->getDbSession(), _filters->getClusterIds(), maxItemsPerMode[Mode::Random]); + + { + auto itBegin {std::cbegin(_randomReleases) + std::min(range ? range->offset : 0, _randomReleases.size())}; + auto itEnd {std::cbegin(_randomReleases) + std::min(range ? range->offset + range->limit : _randomReleases.size(), _randomReleases.size())}; + + for (auto it {itBegin}; it != itEnd; ++it) + { + Release::pointer release {Release::getById(LmsApp->getDbSession(), *it)}; + if (release) + releases.push_back(release); + } + + moreResults = (itEnd != std::cend(_randomReleases)); + } + + return releases; +} + +std::vector +Releases::getReleases(std::optional range, bool& moreResults) +{ + std::vector releases; + + const std::optional modeLimit{maxItemsPerMode[_mode]}; + if (modeLimit) + { + if (range) + range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit); + else + range = Range {0, *modeLimit}; + } + + switch (_mode) + { + case Mode::Random: + releases = getRandomReleases(range, moreResults); + break; + + case Mode::RecentlyPlayed: + releases = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getReleasesReverse(_filters->getClusterIds(), range, moreResults); + break; + + case Mode::MostPlayed: + releases = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTopReleases(_filters->getClusterIds(), range, moreResults); + break; + + case Mode::RecentlyAdded: + releases = Release::getLastWritten(LmsApp->getDbSession(), std::nullopt, _filters->getClusterIds(), range, moreResults); + break; + + case Mode::All: + releases = Release::getByFilter(LmsApp->getDbSession(), _filters->getClusterIds(), {}, range, moreResults); + break; + } + + if (range && modeLimit && (range->offset + range->limit == *modeLimit)) + moreResults = false; + + return releases; +} + +std::vector +Releases::getAllReleases() +{ auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto releases {Release::getByFilter(LmsApp->getDbSession(), _filters->getClusterIds(), searchKeywords, offset, limit, moreResults)}; + bool moreResults; + const auto releases {getReleases(std::nullopt, moreResults)}; - std::vector res; - for (const Database::Release::pointer& release : releases) - res.push_back(release.id()); + std::vector res; + res.reserve(releases.size()); + std::transform(std::cbegin(releases), std::cend(releases), std::back_inserter(res), [](const Release::pointer& release) { return release.id(); }); return res; } -std::vector -Releases::getReleases() const -{ - bool moreResults; - return getReleases({}, {}, moreResults); -} - } // namespace UserInterface diff --git a/src/lms/ui/explore/ReleasesView.hpp b/src/lms/ui/explore/ReleasesView.hpp index 4e6d095c..2ae8fa9d 100644 --- a/src/lms/ui/explore/ReleasesView.hpp +++ b/src/lms/ui/explore/ReleasesView.hpp @@ -22,12 +22,16 @@ #include #include -#include #include #include #include "database/Types.hpp" +namespace Database +{ + class Release; +} + namespace UserInterface { class Filters; @@ -41,16 +45,40 @@ class Releases : public Wt::WTemplate Wt::Signal&> releasesPlay; private: - void refresh(); + + enum class Mode + { + Random, + RecentlyPlayed, + RecentlyAdded, + MostPlayed, + All + }; + + void refreshView(); + void refreshView(Mode mode); void addSome(); + std::vector> getReleases(std::optional range, bool& moreResults); + std::vector> getRandomReleases(std::optional range, bool& moreResults); + std::vector getAllReleases(); + std::unique_ptr createEntry(const Wt::Dbo::ptr& release); - std::vector getReleases(std::optional offset, std::optional limit, bool& moreResults) const; - std::vector getReleases() const; + static constexpr Mode defaultMode {Mode::Random}; + static constexpr std::size_t batchSize {20}; + static inline std::unordered_map> maxItemsPerMode + { + {Mode::Random, batchSize * 6}, + {Mode::RecentlyPlayed, batchSize * 3}, + {Mode::RecentlyAdded, batchSize * 2}, + {Mode::MostPlayed, batchSize * 2}, + {Mode::All, std::nullopt}, + }; - Filters* _filters; - Wt::WPushButton* _showMore; - Wt::WLineEdit* _search; - Wt::WContainerWidget* _container; + Mode _mode {defaultMode}; + Filters* _filters {}; + std::vector _randomReleases; + Wt::WContainerWidget* _container {}; + Wt::WPushButton* _showMore {}; }; } // namespace UserInterface diff --git a/src/lms/ui/explore/SearchView.cpp b/src/lms/ui/explore/SearchView.cpp new file mode 100644 index 00000000..afda3440 --- /dev/null +++ b/src/lms/ui/explore/SearchView.cpp @@ -0,0 +1,183 @@ +/* + * Copyright (C) 2020 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 . + */ + +#include "SearchView.hpp" + +#include +#include + +#include "database/Artist.hpp" +#include "database/Release.hpp" +#include "database/Track.hpp" + +#include "resource/ImageResource.hpp" +#include "ArtistListHelpers.hpp" +#include "Filters.hpp" +#include "ReleaseListHelpers.hpp" +#include "LmsApplication.hpp" + +static constexpr std::size_t maxEntries {5}; + +namespace UserInterface +{ + + static + std::unique_ptr + createTrack(const Database::Track::pointer& track) + { + auto entry {std::make_unique(Wt::WString::tr("Lms.Explore.Search.template.track-entry"))}; + + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); + + auto artists {track->getArtists()}; + auto release {track->getRelease()}; + const auto trackId {track.id()}; + + if (!artists.empty() || release) + entry->setCondition("if-has-artists-or-release", true); + + if (!artists.empty()) + { + entry->setCondition("if-has-artists", true); + + Wt::WContainerWidget* artistContainer {entry->bindNew("artists")}; + for (const auto& artist : artists) + { + Wt::WTemplate* a {artistContainer->addNew(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))}; + a->bindWidget("artist", LmsApplication::createArtistAnchor(artist)); + } + } + + if (track->getRelease()) + { + entry->setCondition("if-has-release", true); + entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease())); + { + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); + cover->setStyleClass("Lms-cover-small"); + anchor->setImage(std::move(cover)); + } + } + else + { + auto cover = entry->bindNew("cover"); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); + cover->setStyleClass("Lms-cover-small"); + } + + return entry; + } + + SearchView::SearchView(Filters* filters) + : Wt::WTemplate {Wt::WString::tr("Lms.Explore.Search.template")} + , _filters {filters} + { + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _filters->updated().connect([=] + { + refreshView(); + }); + } + + void + SearchView::refreshView(const std::string& searchText) + { + _keywords = StringUtils::splitString(searchText, " "); + refreshView(); + } + + void + SearchView::refreshView() + { + clear(); + + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + + searchArtists(); + searchReleases(); + searchTracks(); + } + + void + SearchView::searchArtists() + { + bool more; + const auto artists {Database::Artist::getByFilter(LmsApp->getDbSession(), + _filters->getClusterIds(), + _keywords, + std::nullopt, + Database::Artist::SortMethod::BySortName, + Database::Range {0, maxEntries}, more)}; + + if (!artists.empty()) + { + setCondition("if-artists", true); + + auto* container {bindNew("artists")}; + + for (const Database::Artist::pointer& artist : artists) + container->addWidget(ArtistListHelpers::createEntrySmall(artist)); + } + } + + void + SearchView::searchReleases() + { + bool more; + const auto releases {Database::Release::getByFilter(LmsApp->getDbSession(), + _filters->getClusterIds(), + _keywords, + Database::Range {0, maxEntries}, more)}; + + if (!releases.empty()) + { + setCondition("if-releases", true); + + auto* container {bindNew("releases")}; + + for (const Database::Release::pointer& release : releases) + container->addWidget(ReleaseListHelpers::createEntrySmall(release)); + } + } + + void + SearchView::searchTracks() + { + bool more; + const auto tracks {Database::Track::getByFilter(LmsApp->getDbSession(), + _filters->getClusterIds(), + _keywords, + Database::Range {0, maxEntries}, more)}; + + if (!tracks.empty()) + { + setCondition("if-tracks", true); + + auto* container {bindNew("tracks")}; + + for (const Database::Track::pointer& track : tracks) + container->addWidget(createTrack(track)); + } + } + +} // namespace UserInterface + diff --git a/src/lms/ui/PlayHistoryView.hpp b/src/lms/ui/explore/SearchView.hpp similarity index 68% rename from src/lms/ui/PlayHistoryView.hpp rename to src/lms/ui/explore/SearchView.hpp index d29503b5..a7b2460a 100644 --- a/src/lms/ui/PlayHistoryView.hpp +++ b/src/lms/ui/explore/SearchView.hpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018 Emeric Poupon + * Copyright (C) 2020 Emeric Poupon * * This file is part of LMS. * @@ -19,23 +19,30 @@ #pragma once -#include -#include +#include +#include + #include namespace UserInterface { -class PlayHistory : public Wt::WTemplate +class Filters; + +class SearchView : public Wt::WTemplate { public: - PlayHistory(); + SearchView(Filters* filters); + + void refreshView(const std::string& searchText); private: + void refreshView(); + void searchArtists(); + void searchReleases(); + void searchTracks(); - void addSome(); - - Wt::WContainerWidget* _entriesContainer; - Wt::WPushButton* _showMore; + Filters* _filters {}; + std::vector _keywords; }; } // namespace UserInterface diff --git a/src/lms/ui/explore/TracksInfoView.cpp b/src/lms/ui/explore/TracksInfoView.cpp deleted file mode 100644 index b4907003..00000000 --- a/src/lms/ui/explore/TracksInfoView.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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 . - */ - -#include "TracksInfoView.hpp" - -#include -#include - -#include "database/Track.hpp" -#include "database/TrackList.hpp" -#include "database/User.hpp" - -#include "LmsApplication.hpp" -#include "MediaPlayer.hpp" - -using namespace Database; - -namespace { - -using namespace UserInterface; - -void addEntries(Wt::WContainerWidget *container, const std::vector& tracks) -{ - for (auto track : tracks) - { - Wt::WTemplate* entry = container->addNew(Wt::WString::tr("Lms.Explore.TracksInfo.template.entry")); - - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); - } -} - -} - -namespace UserInterface { - -TracksInfo::TracksInfo() -: Wt::WTemplate {Wt::WString::tr("Lms.Explore.TracksInfo.template")} -{ - addFunction("tr", &Wt::WTemplate::Functions::tr); - - _mostPlayedContainer = bindNew("most-played"); - _recentlyAddedContainer = bindNew("recently-added"); - - LmsApp->getEvents().dbScanned.connect([=] - { - refreshRecentlyAdded(); - }); - - LmsApp->getMediaPlayer()->trackLoaded.connect([=] - { - refreshMostPlayed(); - }); - - refreshMostPlayed(); - refreshRecentlyAdded(); -} - -void -TracksInfo::refreshRecentlyAdded() -{ - const auto after {Wt::WLocalDateTime::currentServerDateTime().toUTC().addMonths(-6)}; - - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto tracks {Track::getLastWritten(LmsApp->getDbSession(), after, 5)}; - - _recentlyAddedContainer->clear(); - addEntries(_recentlyAddedContainer, tracks); -} - -void -TracksInfo::refreshMostPlayed() -{ - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto tracks {LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTopTracks(5)}; - - _mostPlayedContainer->clear(); - addEntries(_mostPlayedContainer, tracks); -} - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/TracksInfoView.hpp b/src/lms/ui/explore/TracksInfoView.hpp deleted file mode 100644 index 76d9ca78..00000000 --- a/src/lms/ui/explore/TracksInfoView.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * 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 . - */ - -#pragma once - -#include -#include - -namespace UserInterface { - -class TracksInfo : public Wt::WTemplate -{ - public: - TracksInfo(); - - void refreshRecentlyAdded(); - void refreshMostPlayed(); - - private: - Wt::WContainerWidget* _mostPlayedContainer; - Wt::WContainerWidget* _recentlyAddedContainer; -}; - -} // namespace UserInterface - diff --git a/src/lms/ui/explore/TracksView.cpp b/src/lms/ui/explore/TracksView.cpp index 5ccf0252..581769e2 100644 --- a/src/lms/ui/explore/TracksView.cpp +++ b/src/lms/ui/explore/TracksView.cpp @@ -20,12 +20,14 @@ #include "TracksView.hpp" #include +#include #include #include #include "database/Artist.hpp" #include "database/Release.hpp" #include "database/Track.hpp" +#include "database/TrackList.hpp" #include "utils/Logger.hpp" #include "utils/String.hpp" @@ -47,144 +49,234 @@ _filters {filters} { addFunction("tr", &Wt::WTemplate::Functions::tr); - _search = bindNew("search"); - _search->setPlaceholderText(Wt::WString::tr("Lms.Explore.search-placeholder")); - _search->textInput().connect(this, &Tracks::refresh); + { + auto* menu {bindNew("mode")}; + + auto addItem = [this](Wt::WMenu& menu,const Wt::WString& str, Mode mode) + { + auto* item {menu.addItem(str)}; + item->clicked().connect([this, mode] { refreshView(mode); }); + + if (mode == defaultMode) + item->renderSelected(true); + }; + + addItem(*menu, Wt::WString::tr("Lms.Explore.random"), Mode::Random); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-played"), Mode::RecentlyPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.most-played"), Mode::MostPlayed); + addItem(*menu, Wt::WString::tr("Lms.Explore.recently-added"), Mode::RecentlyAdded); + addItem(*menu, Wt::WString::tr("Lms.Explore.all"), Mode::All); + } Wt::WText* playBtn = bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); playBtn->clicked().connect([=] { - tracksPlay.emit(getTracks()); + tracksPlay.emit(getAllTracks()); }); Wt::WText* addBtn = bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); addBtn->clicked().connect([=] { - tracksAdd.emit(getTracks()); + tracksAdd.emit(getAllTracks()); }); _tracksContainer = bindNew("tracks"); _showMore = bindNew("show-more", Wt::WString::tr("Lms.Explore.show-more")); - _showMore->clicked().connect([=] + _showMore->clicked().connect([this] { addSome(); }); - refresh(); + filters->updated().connect([this] + { + refreshView(); + }); - filters->updated().connect(this, &Tracks::refresh); + refreshView(); +} + +void +Tracks::refreshView() +{ + _tracksContainer->clear(); + _randomTracks.clear(); + addSome(); +} + +void +Tracks::refreshView(Mode mode) +{ + _mode = mode; + refreshView(); +} + +std::vector +Tracks::getRandomTracks(std::optional range, bool& moreResults) +{ + std::vector tracks; + + if (_randomTracks.empty()) + _randomTracks = Track::getAllIdsRandom(LmsApp->getDbSession(), _filters->getClusterIds(), maxItemsPerMode[Mode::Random]); + + { + auto itBegin {std::cbegin(_randomTracks) + std::min(range ? range->offset : 0, _randomTracks.size())}; + auto itEnd {std::cbegin(_randomTracks) + std::min(range ? range->offset + range->limit : _randomTracks.size(), _randomTracks.size())}; + + for (auto it {itBegin}; it != itEnd; ++it) + { + const Track::pointer track {Track::getById(LmsApp->getDbSession(), *it)}; + if (track) + tracks.push_back(track); + } + + moreResults = (itEnd != std::cend(_randomTracks)); + } + + return tracks; +} + +std::vector +Tracks::getTracks(std::optional range, bool& moreResults) +{ + std::vector tracks; + + const std::optional modeLimit{maxItemsPerMode[_mode]}; + if (modeLimit) + { + if (range) + range->limit = std::min(*modeLimit - range->offset, range->offset + range->limit); + else + range = Range {0, *modeLimit}; + } + + switch (_mode) + { + case Mode::Random: + tracks = getRandomTracks(range, moreResults); + break; + + case Mode::RecentlyPlayed: + tracks = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTracksReverse(_filters->getClusterIds(), range, moreResults); + break; + + case Mode::MostPlayed: + tracks = LmsApp->getUser()->getPlayedTrackList(LmsApp->getDbSession())->getTopTracks(_filters->getClusterIds(), range, moreResults); + break; + + case Mode::RecentlyAdded: + tracks = Track::getLastWritten(LmsApp->getDbSession(), std::nullopt, _filters->getClusterIds(), range, moreResults); + break; + + case Mode::All: + tracks = Track::getByFilter(LmsApp->getDbSession(), _filters->getClusterIds(), {}, range, moreResults); + break; + } + + if (range && modeLimit && (range->offset + range->limit == *modeLimit)) + moreResults = false; + + return tracks; } std::vector -Tracks::getTracks(std::optional offset, std::optional size, bool& moreResults) +Tracks::getAllTracks() { - const auto searchKeywords {StringUtils::splitString(_search->text().toUTF8(), " ")}; - const auto clusterIds {_filters->getClusterIds()}; - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - const auto tracks {Track::getByFilter(LmsApp->getDbSession(), clusterIds, searchKeywords, offset, size, moreResults)}; + bool moreResults; + const auto tracks {getTracks(std::nullopt, moreResults)}; + std::vector res; res.reserve(tracks.size()); std::transform(std::cbegin(tracks), std::cend(tracks), std::back_inserter(res), [](const Database::Track::pointer& track) { return track.id(); }); return res; - } -std::vector -Tracks::getTracks() +std::unique_ptr +Tracks::createEntry(const Track::pointer& track) { - bool moreResults; - return getTracks({}, {}, moreResults); -} + auto entry {std::make_unique(Wt::WString::tr("Lms.Explore.Tracks.template.entry"))}; + auto* entryPtr {entry.get()}; -void -Tracks::refresh() -{ - _tracksContainer->clear(); - addSome(); + entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); + + auto artists {track->getArtists()}; + auto release {track->getRelease()}; + const auto trackId {track.id()}; + + if (!artists.empty() || release) + entry->setCondition("if-has-artists-or-release", true); + + if (!artists.empty()) + { + entry->setCondition("if-has-artists", true); + + Wt::WContainerWidget* artistContainer {entry->bindNew("artists")}; + for (const auto& artist : artists) + { + Wt::WTemplate* a {artistContainer->addNew(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))}; + a->bindWidget("artist", LmsApplication::createArtistAnchor(artist)); + } + } + + if (track->getRelease()) + { + entry->setCondition("if-has-release", true); + entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease())); + { + Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); + auto cover = std::make_unique(); + cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); + cover->setStyleClass("Lms-cover-small"); + anchor->setImage(std::move(cover)); + } + } + else + { + auto cover = entry->bindNew("cover"); + cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); + cover->setStyleClass("Lms-cover-small"); + } + + entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); + + Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); + playBtn->clicked().connect([=] + { + tracksPlay.emit({trackId}); + }); + + Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); + addBtn->clicked().connect([=] + { + tracksAdd.emit({trackId}); + }); + + LmsApp->getMediaPlayer()->trackLoaded.connect(entryPtr, [=] (Database::IdType loadedTrackId) + { + entryPtr->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : ""); + }); + + if (auto trackIdLoaded {LmsApp->getMediaPlayer()->getTrackLoaded()}) + { + if (*trackIdLoaded == trackId) + entry->bindString("is-playing", "Lms-entry-playing"); + } + + return entry; } void Tracks::addSome() { + auto transaction {LmsApp->getDbSession().createSharedTransaction()}; + bool moreResults; - const std::vector trackIds {getTracks(_tracksContainer->count(), 20, moreResults)}; - - for (const Database::IdType trackId : trackIds) + for (const Track::pointer& track : getTracks(Range {static_cast(_tracksContainer->count()), batchSize}, moreResults)) { - auto transaction {LmsApp->getDbSession().createSharedTransaction()}; - - const Database::Track::pointer track {Database::Track::getById(LmsApp->getDbSession(), trackId)}; - - Wt::WTemplate* entry {_tracksContainer->addNew(Wt::WString::tr("Lms.Explore.Tracks.template.entry"))}; - - entry->bindString("name", Wt::WString::fromUTF8(track->getName()), Wt::TextFormat::Plain); - - auto artists {track->getArtists()}; - auto release {track->getRelease()}; - - if (!artists.empty() || release) - entry->setCondition("if-has-artists-or-release", true); - - if (!artists.empty()) - { - entry->setCondition("if-has-artists", true); - - Wt::WContainerWidget* artistContainer {entry->bindNew("artists")}; - for (const auto& artist : artists) - { - Wt::WTemplate* a {artistContainer->addNew(Wt::WString::tr("Lms.Explore.Tracks.template.entry-artist"))}; - a->bindWidget("artist", LmsApplication::createArtistAnchor(artist)); - } - } - - if (track->getRelease()) - { - entry->setCondition("if-has-release", true); - entry->bindWidget("release", LmsApplication::createReleaseAnchor(track->getRelease())); - { - Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); - auto cover = std::make_unique(); - cover->setImageLink(LmsApp->getImageResource()->getReleaseUrl(release.id(), 96)); - cover->setStyleClass("Lms-cover-small"); - anchor->setImage(std::move(cover)); - } - } - else - { - auto cover = entry->bindNew("cover"); - cover->setImageLink(LmsApp->getImageResource()->getTrackUrl(trackId, 96)); - cover->setStyleClass("Lms-cover-small"); - } - - entry->bindString("duration", trackDurationToString(track->getDuration()), Wt::TextFormat::Plain); - - Wt::WText* playBtn = entry->bindNew("play-btn", Wt::WString::tr("Lms.Explore.template.play-btn"), Wt::TextFormat::XHTML); - playBtn->clicked().connect(std::bind([=] - { - tracksPlay.emit({trackId}); - })); - - Wt::WText* addBtn = entry->bindNew("add-btn", Wt::WString::tr("Lms.Explore.template.add-btn"), Wt::TextFormat::XHTML); - addBtn->clicked().connect(std::bind([=] - { - tracksAdd.emit({trackId}); - })); - - - LmsApp->getMediaPlayer()->trackLoaded.connect(entry, [=] (Database::IdType loadedTrackId) - { - entry->bindString("is-playing", loadedTrackId == trackId ? "Lms-entry-playing" : ""); - }); - - if (auto trackIdLoaded {LmsApp->getMediaPlayer()->getTrackLoaded()}) - { - if (*trackIdLoaded == trackId) - entry->bindString("is-playing", "Lms-entry-playing"); - } + _tracksContainer->addWidget(createEntry(track)); } _showMore->setHidden(!moreResults); diff --git a/src/lms/ui/explore/TracksView.hpp b/src/lms/ui/explore/TracksView.hpp index 95b6d994..75b69fb2 100644 --- a/src/lms/ui/explore/TracksView.hpp +++ b/src/lms/ui/explore/TracksView.hpp @@ -28,6 +28,11 @@ #include "database/Types.hpp" +namespace Database +{ + class Track; +} + namespace UserInterface { class Filters; @@ -40,16 +45,42 @@ class Tracks : public Wt::WTemplate Wt::Signal&> tracksPlay; private: - void refresh(); + + enum class Mode + { + Random, + RecentlyPlayed, + RecentlyAdded, + MostPlayed, + All + }; + + void refreshView(); + void refreshView(Mode mode); void addSome(); - std::vector getTracks(std::optional offset, std::optional size, bool& moreResults); - std::vector getTracks(); + std::unique_ptr createEntry(const Wt::Dbo::ptr& track); + std::vector> getRandomTracks(std::optional range, bool& moreResults); + std::vector> getTracks(std::optional range, bool& moreResults); + std::vector getAllTracks(); - Wt::WContainerWidget* _tracksContainer; - Wt::WPushButton* _showMore; - Wt::WLineEdit* _search; - Filters* _filters; + static constexpr Mode defaultMode {Mode::Random}; + static constexpr std::size_t batchSize {20}; + static inline std::unordered_map> maxItemsPerMode + { + {Mode::Random, batchSize * 20}, + {Mode::RecentlyPlayed, batchSize * 10}, + {Mode::RecentlyAdded, batchSize * 10}, + {Mode::MostPlayed, batchSize * 10}, + {Mode::All, std::nullopt}, + }; + + Mode _mode {defaultMode}; + Filters* _filters {}; + std::vector _randomTracks; + Wt::WContainerWidget* _tracksContainer {}; + Wt::WPushButton* _showMore {}; + Wt::WLineEdit* _search {}; }; } // namespace UserInterface diff --git a/src/test/database/DatabaseTest.cpp b/src/test/database/DatabaseTest.cpp index 6b57df85..b23a19a1 100644 --- a/src/test/database/DatabaseTest.cpp +++ b/src/test/database/DatabaseTest.cpp @@ -48,6 +48,11 @@ using namespace Database; throw std::runtime_error {error}; \ } \ } \ + catch (Wt::Dbo::Exception& e) \ + { \ + std::cerr << "Caught DBO exception: " <setSortName("ZZZ"); + TrackArtistLink::create(session, track.get(), artist.get(), TrackArtistLink::Type::Artist); } { auto transaction {session.createSharedTransaction()}; bool more {}; - CHECK(Artist::getByFilter(session, {}, {"N"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, std::nullopt, more).empty()); + CHECK(Artist::getByFilter(session, {}, {"N"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, more).empty()); - const auto artistsByAAA {Artist::Artist::getByFilter(session, {}, {"A"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, std::nullopt, more)}; + const auto artistsByAAA {Artist::Artist::getByFilter(session, {}, {"A"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, more)}; CHECK(artistsByAAA.size() == 1); CHECK(artistsByAAA.front().id() == artist.getId()); - const auto artistsByZZZ {Artist::Artist::getByFilter(session, {}, {"Z"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, std::nullopt, more)}; + const auto artistsByZZZ {Artist::Artist::getByFilter(session, {}, {"Z"}, std::nullopt, Artist::SortMethod::ByName, std::nullopt, more)}; CHECK(artistsByZZZ.size() == 1); CHECK(artistsByZZZ.front().id() == artist.getId()); @@ -660,7 +667,7 @@ testMultipleTracksSingleCluster(Session& session) { std::list tracks; ScopedClusterType clusterType {session, "MyClusterType"}; - ScopedCluster cluster {session, clusterType.lockAndGet(), "MyClusterType"}; + ScopedCluster cluster {session, clusterType.lockAndGet(), "MyCluster"}; for (std::size_t i {}; i < 10; ++i) { @@ -686,6 +693,99 @@ testMultipleTracksSingleCluster(Session& session) } } +static +void +testMultipleTracksMultipleClustersTopRelease(Session& session) +{ + ScopedClusterType clusterType {session, "ClusterType"}; + ScopedCluster cluster1 {session, clusterType.lockAndGet(), "Cluster1"}; + ScopedCluster cluster2 {session, clusterType.lockAndGet(), "Cluster2"}; + ScopedCluster cluster3 {session, clusterType.lockAndGet(), "Cluster3"}; + ScopedTrack trackA {session, "TrackA"}; + ScopedTrack trackB {session, "TrackB"}; + ScopedTrack trackC {session, "TrackC"}; + ScopedRelease releaseA {session, "ReleaseA"}; + ScopedRelease releaseB {session, "ReleaseB"}; + ScopedRelease releaseC {session, "ReleaseC"}; + + ScopedUser user {session, "MyUser", User::PasswordHash {}}; + ScopedTrackList trackList {session, "TrackList", TrackList::Type::Playlist, false, user.lockAndGet()}; + + { + auto transaction {session.createUniqueTransaction()}; + + cluster1.get().modify()->addTrack(trackA.get()); + cluster2.get().modify()->addTrack(trackB.get()); + cluster2.get().modify()->addTrack(trackC.get()); + cluster3.get().modify()->addTrack(trackC.get()); + + trackA.get().modify()->setRelease(releaseA.get()); + trackB.get().modify()->setRelease(releaseB.get()); + trackC.get().modify()->setRelease(releaseC.get()); + } + + { + auto transaction {session.createUniqueTransaction()}; + + TrackListEntry::create(session, trackA.get(), trackList.get()); + TrackListEntry::create(session, trackB.get(), trackList.get()); + TrackListEntry::create(session, trackB.get(), trackList.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool hasMore; + const auto releases{trackList->getTopReleases({}, std::nullopt, hasMore)}; + CHECK(releases.size() == 2); + CHECK(releases[0].id() == releaseB.getId()); + CHECK(releases[1].id() == releaseA.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool hasMore; + auto releases{trackList->getTopReleases({cluster1.getId()}, std::nullopt, hasMore)}; + CHECK(releases.size() == 1); + CHECK(releases[0].id() == releaseA.getId()); + + releases = trackList->getTopReleases({cluster2.getId()}, std::nullopt, hasMore); + CHECK(releases.size() == 1); + CHECK(releases[0].id() == releaseB.getId()); + + releases = trackList->getTopReleases({cluster2.getId(), cluster1.getId()}, std::nullopt, hasMore); + CHECK(releases.empty()); + + releases = trackList->getTopReleases({cluster2.getId(), cluster3.getId()}, std::nullopt, hasMore); + CHECK(releases.empty()); + } + + + { + auto transaction {session.createUniqueTransaction()}; + + TrackListEntry::create(session, trackC.get(), trackList.get()); + TrackListEntry::create(session, trackC.get(), trackList.get()); + TrackListEntry::create(session, trackC.get(), trackList.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool hasMore; + auto releases {trackList->getTopReleases({cluster2.getId(), cluster3.getId()}, std::nullopt, hasMore)}; + CHECK(releases.size() == 1); + CHECK(releases[0].id() == releaseC.getId()); + + releases = trackList->getTopReleases({cluster2.getId()}, std::nullopt, hasMore); + CHECK(releases.size() == 2); + CHECK(releases[0].id() == releaseC.getId()); + CHECK(releases[1].id() == releaseB.getId()); + } + + +} static void @@ -1120,10 +1220,11 @@ testSingleUser(Session& session) { auto transaction {session.createSharedTransaction()}; + bool hasMore {}; CHECK(user->getPlayedTrackList(session)->getCount() == 0); - CHECK(user->getPlayedTrackList(session)->getTopTracks(1).empty()); - CHECK(user->getPlayedTrackList(session)->getTopArtists(1).empty()); - CHECK(user->getPlayedTrackList(session)->getTopReleases(1).empty()); + CHECK(user->getPlayedTrackList(session)->getTopTracks({}, Range {0, 1}, hasMore).empty()); + CHECK(user->getPlayedTrackList(session)->getTopArtists({}, std::nullopt, Range {0, 1}, hasMore).empty()); + CHECK(user->getPlayedTrackList(session)->getTopReleases({}, Range {0, 1}, hasMore).empty()); CHECK(user->getQueuedTrackList(session)->getCount() == 0); } } @@ -1332,6 +1433,261 @@ testSingleTrackListMultipleTrackMultiClusters(Session& session) } } +static +void +testSingleTrackListMultipleTrackMultiClustersRecentlyPlayed(Session& session) +{ + ScopedUser user {session, "MyUser", User::PasswordHash {}}; + ScopedTrackList trackList {session, "MyTrackList", TrackList::Type::Playlist, false, user.lockAndGet()}; + ScopedClusterType clusterType {session, "MyClusterType"}; + ScopedCluster cluster1 {session, clusterType.lockAndGet(), "MyCluster1"}; + ScopedCluster cluster2 {session, clusterType.lockAndGet(), "MyCluster2"}; + ScopedCluster cluster3 {session, clusterType.lockAndGet(), "MyCluster3"}; + ScopedTrack track1 {session, "MyTrack1"}; + ScopedTrack track2 {session, "MyTrack1"}; + ScopedArtist artist1 {session, "MyArtist1"}; + ScopedArtist artist2 {session, "MyArtist2"}; + ScopedRelease release1 {session, "MyRelease1"}; + ScopedRelease release2 {session, "MyRelease2"}; + + { + auto transaction {session.createUniqueTransaction()}; + + track1.get().modify()->setRelease(release1.get()); + track2.get().modify()->setRelease(release2.get()); + TrackArtistLink::create(session, track1.get(), artist1.get(), TrackArtistLink::Type::Artist); + TrackArtistLink::create(session, track2.get(), artist2.get(), TrackArtistLink::Type::Artist); + + cluster1.get().modify()->addTrack(track1.get()); + cluster2.get().modify()->addTrack(track2.get()); + cluster3.get().modify()->addTrack(track1.get()); + cluster3.get().modify()->addTrack(track2.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + CHECK(trackList->getArtistsReverse({}, std::nullopt, std::nullopt, moreResults).empty()); + CHECK(trackList->getReleasesReverse({}, std::nullopt, moreResults).empty()); + CHECK(trackList->getTracksReverse({}, std::nullopt, moreResults).empty()); + } + + { + auto transaction {session.createUniqueTransaction()}; + + TrackListEntry::create(session, track1.get(), trackList.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({}, std::nullopt, moreResults)}; + CHECK(releases.size() == 1); + CHECK(releases.front().id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 1); + CHECK(tracks.front().id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster1.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({cluster1.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 1); + CHECK(releases.front().id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({cluster1.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 1); + CHECK(tracks.front().id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster3.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 1); + CHECK(releases.front().id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 1); + CHECK(tracks.front().id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster1.getId()}, TrackArtistLink::Type::Artist, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({}, TrackArtistLink::Type::Artist, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + CHECK(trackList->getArtistsReverse({cluster2.getId()}, std::nullopt, std::nullopt, moreResults).empty()); + CHECK(trackList->getReleasesReverse({cluster2.getId()}, std::nullopt, moreResults).empty()); + CHECK(trackList->getTracksReverse({cluster2.getId()}, std::nullopt, moreResults).empty()); + + CHECK(trackList->getArtistsReverse({}, TrackArtistLink::Type::ReleaseArtist, std::nullopt, moreResults).empty()); + } + + { + auto transaction {session.createUniqueTransaction()}; + + TrackListEntry::create(session, track2.get(), trackList.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 2); + CHECK(artists[0].id() == artist2.getId()); + CHECK(artists[1].id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({}, std::nullopt, moreResults)}; + CHECK(releases.size() == 2); + CHECK(releases[0].id() == release2.getId()); + CHECK(releases[1].id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 2); + CHECK(tracks[0].id() == track2.getId()); + CHECK(tracks[1].id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster3.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 2); + CHECK(artists[0].id() == artist2.getId()); + CHECK(artists[1].id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 2); + CHECK(releases[0].id() == release2.getId()); + CHECK(releases[1].id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 2); + CHECK(tracks[0].id() == track2.getId()); + CHECK(tracks[1].id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster1.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist1.getId()); + + const auto releases {trackList->getReleasesReverse({cluster1.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 1); + CHECK(releases.front().id() == release1.getId()); + + const auto tracks {trackList->getTracksReverse({cluster1.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 1); + CHECK(tracks.front().id() == track1.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster2.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 1); + CHECK(artists.front().id() == artist2.getId()); + + const auto releases {trackList->getReleasesReverse({cluster2.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 1); + CHECK(releases.front().id() == release2.getId()); + + const auto tracks {trackList->getTracksReverse({cluster2.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 1); + CHECK(tracks.front().id() == track2.getId()); + } + + { + auto transaction {session.createUniqueTransaction()}; + + TrackListEntry::create(session, track1.get(), trackList.get()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 2); + CHECK(artists[0].id() == artist1.getId()); + CHECK(artists[1].id() == artist2.getId()); + + const auto releases {trackList->getReleasesReverse({}, std::nullopt, moreResults)}; + CHECK(releases.size() == 2); + CHECK(releases[0].id() == release1.getId()); + CHECK(releases[1].id() == release2.getId()); + + const auto tracks {trackList->getTracksReverse({}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 2); + CHECK(tracks[0].id() == track1.getId()); + CHECK(tracks[1].id() == track2.getId()); + } + + { + auto transaction {session.createSharedTransaction()}; + + bool moreResults {}; + const auto artists {trackList->getArtistsReverse({cluster3.getId()}, std::nullopt, std::nullopt, moreResults)}; + CHECK(artists.size() == 2); + // TODO investigate + // CHECK(artists[0].id() == artist1.getId()); + // CHECK(artists[1].id() == artist2.getId()); + + const auto releases {trackList->getReleasesReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(releases.size() == 2); + CHECK(releases[0].id() == release1.getId()); + CHECK(releases[1].id() == release2.getId()); + + const auto tracks {trackList->getTracksReverse({cluster3.getId()}, std::nullopt, moreResults)}; + CHECK(tracks.size() == 2); + CHECK(tracks[0].id() == track1.getId()); + CHECK(tracks[1].id() == track2.getId()); + } +} + + static void testMultipleTracksMultipleArtistsMultiClusters(Session& session) @@ -1519,72 +1875,72 @@ int main() std::cout << "Database test file: '" << tmpFile.string() << "'" << std::endl; - for (std::size_t i = 0; i < 2; ++i) - { - Database::Db db {tmpFile}; - Database::Session session {db}; - session.prepareTables(); + Database::Db db {tmpFile}; + Database::Session session {db}; + session.prepareTables(); - auto runTest = [&session](const std::string& name, std::function testFunc) - { - std::cout << "Running test '" << name << "'..." << std::endl; - testFunc(session); - testDatabaseEmpty(session); - std::cout << "Running test '" << name << "': SUCCESS" << std::endl; - }; + auto runTest = [&session](const std::string& name, std::function testFunc) + { + std::cout << "Running test '" << name << "'..." << std::endl; + testFunc(session); + testDatabaseEmpty(session); + std::cout << "Running test '" << name << "': SUCCESS" << std::endl; + }; #define RUN_TEST(test) runTest(#test, test) - // Special test to remove any default created entries - RUN_TEST(testRemoveDefaultEntries); + // Special test to remove any default created entries + RUN_TEST(testRemoveDefaultEntries); - RUN_TEST(testSingleTrack); - RUN_TEST(testSingleArtist); - RUN_TEST(testSingleRelease); - RUN_TEST(testSingleCluster); + RUN_TEST(testSingleTrack); + RUN_TEST(testSingleArtist); + RUN_TEST(testSingleRelease); + RUN_TEST(testSingleCluster); - RUN_TEST(testSingleTrackSingleArtist); - RUN_TEST(testSingleTrackSingleArtistMultiRoles); - RUN_TEST(testSingleTrackMultiArtists); + RUN_TEST(testSingleTrackSingleArtist); + RUN_TEST(testSingleTrackSingleArtistMultiRoles); + RUN_TEST(testSingleTrackMultiArtists); - RUN_TEST(testSingleArtistSearchByName); - RUN_TEST(testMultiArtistsSortMethod); + RUN_TEST(testSingleArtistSearchByName); + RUN_TEST(testMultiArtistsSortMethod); - RUN_TEST(testSingleTrackSingleRelease); - RUN_TEST(testMultiTracksSingleReleaseTotalDiscTrack); + RUN_TEST(testSingleTrackSingleRelease); + RUN_TEST(testMultiTracksSingleReleaseTotalDiscTrack); - RUN_TEST(testSingleTrackSingleCluster); - RUN_TEST(testMultipleTracksSingleCluster); + RUN_TEST(testSingleTrackSingleCluster); + RUN_TEST(testMultipleTracksSingleCluster); - RUN_TEST(testMultipleTracksSingleClusterSimilarity); - RUN_TEST(testMultipleTracksMultipleClustersSimilarity); + RUN_TEST(testMultipleTracksMultipleClustersTopRelease); - RUN_TEST(testSingleTrackSingleReleaseSingleCluster); - RUN_TEST(testSingleTrackSingleArtistMultiClusters); - RUN_TEST(testSingleTrackSingleArtistMultiRolesMultiClusters); - RUN_TEST(testMultiTracksSingleArtistMultiClusters); - RUN_TEST(testMultiTracksSingleArtistSingleRelease); + RUN_TEST(testMultipleTracksSingleClusterSimilarity); + RUN_TEST(testMultipleTracksMultipleClustersSimilarity); - RUN_TEST(testSingleTrackSingleReleaseSingleArtist); + RUN_TEST(testSingleTrackSingleReleaseSingleCluster); + RUN_TEST(testSingleTrackSingleArtistMultiClusters); + RUN_TEST(testSingleTrackSingleArtistMultiRolesMultiClusters); + RUN_TEST(testMultiTracksSingleArtistMultiClusters); + RUN_TEST(testMultiTracksSingleArtistSingleRelease); - RUN_TEST(testSingleTrackSingleReleaseSingleArtistSingleCluster); - RUN_TEST(testSingleTrackSingleReleaseSingleArtistMultiClusters); + RUN_TEST(testSingleTrackSingleReleaseSingleArtist); - RUN_TEST(testSingleUser); + RUN_TEST(testSingleTrackSingleReleaseSingleArtistSingleCluster); + RUN_TEST(testSingleTrackSingleReleaseSingleArtistMultiClusters); - RUN_TEST(testSingleStarredArtist); - RUN_TEST(testSingleStarredRelease); - RUN_TEST(testSingleStarredTrack); + RUN_TEST(testSingleUser); - RUN_TEST(testSingleTrackList); - RUN_TEST(testSingleTrackListMultipleTrack); - RUN_TEST(testSingleTrackListMultipleTrackSingleCluster); - RUN_TEST(testSingleTrackListMultipleTrackMultiClusters); - RUN_TEST(testMultipleTracksMultipleArtistsMultiClusters); - RUN_TEST(testMultipleTracksMultipleReleasesMultiClusters); + RUN_TEST(testSingleStarredArtist); + RUN_TEST(testSingleStarredRelease); + RUN_TEST(testSingleStarredTrack); - RUN_TEST(testSingleTrackSingleUserSingleBookmark); - } + RUN_TEST(testSingleTrackList); + RUN_TEST(testSingleTrackListMultipleTrack); + RUN_TEST(testSingleTrackListMultipleTrackSingleCluster); + RUN_TEST(testSingleTrackListMultipleTrackMultiClusters); + RUN_TEST(testSingleTrackListMultipleTrackMultiClustersRecentlyPlayed); + RUN_TEST(testMultipleTracksMultipleArtistsMultiClusters); + RUN_TEST(testMultipleTracksMultipleReleasesMultiClusters); + + RUN_TEST(testSingleTrackSingleUserSingleBookmark); } catch (std::exception& e) { diff --git a/src/tools/metadata/LmsMetadata.cpp b/src/tools/metadata/LmsMetadata.cpp index 7cbfd29b..3d299bc3 100644 --- a/src/tools/metadata/LmsMetadata.cpp +++ b/src/tools/metadata/LmsMetadata.cpp @@ -58,7 +58,7 @@ void parse(MetaData::IParser& parser, const std::filesystem::path& file) { using namespace MetaData; - parser.setClusterTypeNames( {"MOOD", "GENRE"} ); + parser.setClusterTypeNames( {"ALBUMMOOD", "MOOD", "ALBUMGROUPING", "ALBUMGENRE", "GENRE"} ); const auto start {std::chrono::steady_clock::now()}; std::optional track {parser.parse(file, true)}; From 633395cc6076852fb554c9982549cf4e20dc3f2b Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 10 May 2020 13:37:48 +0200 Subject: [PATCH 8/8] Updated README --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e293642b..e9600508 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,11 @@ _LMS_ provides several ways to help you find the music you like: * Recommendations for similar artists and albums * Radio mode, based on what is in the current playqueue * Searches in album, artist and track names (including sort names) -* Most played/Recently added music +* Random/Most played/Recently played/Recently added for Artist/Albums/Tracks, allowing you to search for things like: + * Recently added _Electronic_ artists + * Random _Metal_ and _Aggressive_ albums + * Most played _Relaxed_ tracks + * ... The recommendation engine uses two different sources: 1. Tags that are present in the audio files