From acea515de5ab0031a5330e2b95cb596ba356c809 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 25 Nov 2023 16:11:35 +0100 Subject: [PATCH] Added playcount in track/release info windows ref #349 --- approot/messages.xml | 1 + approot/messages_fr.xml | 1 + approot/messages_it.xml | 1 + approot/messages_zh.xml | 1 + approot/release.xml | 8 ++++++++ approot/tracks.xml | 8 ++++++++ src/lms/ui/explore/ReleaseView.cpp | 5 +++++ src/lms/ui/explore/TrackListHelpers.cpp | 5 +++++ 8 files changed, 30 insertions(+) diff --git a/approot/messages.xml b/approot/messages.xml index bedb9a47..cc8ba74c 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -137,6 +137,7 @@ Play last Play next Play shuffled +Play count Random Recently added Recently modified diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 9358a0a9..aca2df14 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -137,6 +137,7 @@ Jouer en dernier Jouer ensuite Jouer aléatoirement +Nombre d'écoutes Aléatoire Ajoutés récemment Modifiés récemment diff --git a/approot/messages_it.xml b/approot/messages_it.xml index da41aa51..7baa5358 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -137,6 +137,7 @@ Aggiungi alla coda di riproduzione Aggiungi alla coda di riproduzione mischiando + Casuali Aggiunti di recente diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 9c718905..f3e20cea 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -137,6 +137,7 @@ 最后播放 随机播放 + 随机 最近添加 最近更改 diff --git a/approot/release.xml b/approot/release.xml index 992f97eb..c2f9dcfc 100644 --- a/approot/release.xml +++ b/approot/release.xml @@ -137,6 +137,14 @@ ${} +
+
+ ${tr:Lms.Explore.playcount} +
+
+ ${playcount} +
+
diff --git a/approot/tracks.xml b/approot/tracks.xml index b71ffa71..e18aa162 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -133,6 +133,14 @@
${} +
+
+ ${tr:Lms.Explore.playcount} +
+
+ ${playcount} +
+
diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index aeb25063..edfa77f3 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -27,11 +27,13 @@ #include "av/IAudioFile.hpp" #include "services/database/Artist.hpp" #include "services/database/Cluster.hpp" +#include "services/database/Listen.hpp" #include "services/database/Release.hpp" #include "services/database/ScanSettings.hpp" #include "services/database/Session.hpp" #include "services/database/Track.hpp" #include "services/database/TrackArtistLink.hpp" +#include "services/database/User.hpp" #include "services/feedback/IFeedbackService.hpp" #include "services/recommendation/IRecommendationService.hpp" #include "utils/ILogger.hpp" @@ -158,6 +160,9 @@ namespace UserInterface releaseInfo->bindString("bitrate", std::to_string(meanBitrate / 1000) + " kbps"); } + const auto user{ LmsApp->getUser() }; + releaseInfo->bindInt("playcount", Database::Listen::getCount(LmsApp->getDbSession(), user->getId(), user->getScrobblingBackend(), release->getId())); + Wt::WPushButton* okBtn{ releaseInfo->bindNew("ok-btn", Wt::WString::tr("Lms.ok")) }; okBtn->clicked().connect([=] { diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index 5e2e0fe0..882f23f2 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -26,10 +26,12 @@ #include "av/IAudioFile.hpp" #include "services/database/Artist.hpp" +#include "services/database/Listen.hpp" #include "services/database/Release.hpp" #include "services/database/Session.hpp" #include "services/database/Track.hpp" #include "services/database/TrackArtistLink.hpp" +#include "services/database/User.hpp" #include "services/feedback/IFeedbackService.hpp" #include "utils/ILogger.hpp" #include "utils/Service.hpp" @@ -141,6 +143,9 @@ namespace UserInterface::TrackListHelpers trackInfo->bindString("bitrate", std::to_string(track->getBitrate() / 1000) + " kbps"); } + const auto user{ LmsApp->getUser() }; + trackInfo->bindInt("playcount", Database::Listen::getCount(LmsApp->getDbSession(), user->getId(), user->getScrobblingBackend(), track->getId())); + Wt::WContainerWidget* clusterContainer{ trackInfo->bindWidget("clusters", Utils::createClustersForTrack(track, filters)) }; if (clusterContainer->count() > 0) trackInfo->setCondition("if-has-clusters", true);