From 322362b3b978c0e81f9298c1a22f2b728941fb67 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 7 Jun 2026 10:08:39 +0200 Subject: [PATCH 01/38] Fake DB generator: added a way to generate fake musicnn embeddings --- src/tools/db-generator/CMakeLists.txt | 1 + src/tools/db-generator/LmsDbGenerator.cpp | 25 ++++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/tools/db-generator/CMakeLists.txt b/src/tools/db-generator/CMakeLists.txt index f5e49489..257af67c 100644 --- a/src/tools/db-generator/CMakeLists.txt +++ b/src/tools/db-generator/CMakeLists.txt @@ -4,6 +4,7 @@ add_executable(lms-db-generator ) target_link_libraries(lms-db-generator PRIVATE + lmsaudio lmsdatabase lmscore Boost::program_options diff --git a/src/tools/db-generator/LmsDbGenerator.cpp b/src/tools/db-generator/LmsDbGenerator.cpp index 06b3de29..f1c0a5bf 100644 --- a/src/tools/db-generator/LmsDbGenerator.cpp +++ b/src/tools/db-generator/LmsDbGenerator.cpp @@ -32,6 +32,8 @@ #include "core/Random.hpp" #include "core/Service.hpp" #include "core/SystemPaths.hpp" + +#include "audio/MusicNNEmbeddings.hpp" #include "database/IDb.hpp" #include "database/Session.hpp" #include "database/objects/Artist.hpp" @@ -44,6 +46,7 @@ #include "database/objects/TrackArtistLink.hpp" #include "database/objects/TrackEmbeddedImage.hpp" #include "database/objects/TrackEmbeddedImageLink.hpp" +#include "database/objects/TrackMusicNNEmbeddings.hpp" namespace lms { @@ -59,6 +62,7 @@ namespace lms std::size_t trackEmbeddedImagePerRelease{ 1 }; // usual case: one same image saved on each track std::size_t genreCount{ 50 }; std::size_t moodCount{ 25 }; + bool generateMusicNNEmbeddings{ false }; std::filesystem::path trackPath; }; @@ -131,6 +135,18 @@ namespace lms if (!context.moods.empty()) clusters.push_back(*core::random::pickRandom(context.moods)); track.modify()->setClusters(clusters); + + if (params.generateMusicNNEmbeddings) + { + audio::TrackMusicNNEmbeddings embeddings; + std::normal_distribution embeddingDist{ 0.0F, 1.0F }; + for (auto& v : embeddings.mean.values) + v = embeddingDist(core::random::getRandGenerator()); + std::vector blob(sizeof(audio::TrackMusicNNEmbeddings)); + audio::trackMusicNNEmbeddingsToBlob(embeddings, blob); + TrackMusicNNEmbeddings::pointer entry{ context.session.create(track) }; + entry.modify()->setData(blob); + } } } @@ -204,7 +220,9 @@ int main(int argc, char* argv[]) ("genre-count", program_options::value()->default_value(defaultParams.genreCount), "Number of genres to generate") ("genre-count-per-track", program_options::value()->default_value(defaultParams.genreCountPerTrack), "Number of genres to assign to each track") ("mood-count", program_options::value()->default_value(defaultParams.moodCount), "Number of moods to generate") - ("mood-count-per-track", program_options::value()->default_value(defaultParams.moodCountPerTrack), "Number of moods to assign to each track")("help,h", "produce help message"); + ("mood-count-per-track", program_options::value()->default_value(defaultParams.moodCountPerTrack), "Number of moods to assign to each track") + ("musicnn-embeddings", program_options::bool_switch()->default_value(false), "Generate fake MusicNN embeddings for each track") + ("help,h", "produce help message"); // clang-format on program_options::variables_map vm; @@ -226,6 +244,7 @@ int main(int argc, char* argv[]) genParams.trackCountPerRelease = vm["track-count-per-release"].as(); genParams.compilationRatio = vm["compilation-ratio"].as(); genParams.trackEmbeddedImagePerRelease = vm["track-embedded-image-count"].as(); + genParams.generateMusicNNEmbeddings = vm["musicnn-embeddings"].as(); genParams.trackPath = std::filesystem::path{ vm["track-path"].as() }; if (!std::filesystem::exists(genParams.trackPath)) @@ -234,6 +253,10 @@ int main(int argc, char* argv[]) core::Service config{ core::createConfig(vm["conf"].as()) }; auto db{ db::createDb(config->getPath("working-dir", "/var/lms") / "lms.db") }; db::Session session{ *db }; + session.prepareTablesIfNeeded(); + session.migrateSchemaIfNeeded(); + session.createIndexesIfNeeded(); + std::cout << "Starting generation..." << std::endl; GenerationContext genContext{ session }; From 17ca0390870220ae20cc2e709a99c175af9e09f7 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 7 Jun 2026 10:21:57 +0200 Subject: [PATCH 02/38] Speed up audio similarity engine startup for big collections --- .../AudioSimilarityEngine.impl.hpp | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp index bba489df..80960b9f 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp +++ b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp @@ -31,7 +31,6 @@ #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" -#include "core/Random.hpp" #include "database/IDb.hpp" #include "database/Session.hpp" @@ -682,20 +681,26 @@ namespace lms::recommendation LMS_SCOPED_TRACE_DETAILED("AudioSimilarityEngine", "computeTrackDistanceThreshold"); constexpr std::size_t maxSampleCount{ 500 }; + constexpr std::size_t maxCandidateCount{ 10'000 }; constexpr float stdDevMultiplier{ 2.F }; - const std::size_t sampleCount{ std::min(_trackVectors.size(), maxSampleCount) }; - - LOG(INFO, "computing track distance threshold using " << sampleCount << " samples..."); - - // Collect all vector pointers and shuffle for an unbiased random sample. std::vector allVectors; allVectors.reserve(_trackVectors.size()); for (const auto& [id, vec] : _trackVectors) allVectors.push_back(vec); + // move maxCandidateCount random elements to the front + const std::size_t candidateCount{ std::min(allVectors.size(), maxCandidateCount) }; std::minstd_rand randomEngine{ 42 }; - core::random::shuffleContainer(randomEngine, allVectors); + for (std::size_t i{}; i < candidateCount; ++i) + { + std::uniform_int_distribution dist{ i, allVectors.size() - 1 }; + std::swap(allVectors[i], allVectors[dist(randomEngine)]); + } + allVectors.resize(candidateCount); + + const std::size_t sampleCount{ std::min(candidateCount, maxSampleCount) }; + LOG(INFO, "computing track distance threshold using " << sampleCount << " samples on " << candidateCount << " candidates..."); math::StatsAccumulator stats; for (std::size_t i{}; i < sampleCount; ++i) @@ -714,7 +719,8 @@ namespace lms::recommendation minDist = d; } - stats.add(minDist); + if (minDist < std::numeric_limits::max()) + stats.add(minDist); } if (stats.getCount() >= 2) @@ -731,7 +737,7 @@ namespace lms::recommendation LMS_SCOPED_TRACE_DETAILED("AudioSimilarityEngine", "ComputeReleaseDistanceThreshold"); constexpr std::size_t maxSampleCount{ 200 }; - constexpr std::size_t maxCandidateCount{ 1'000 }; + constexpr std::size_t maxCandidateCount{ 2'000 }; constexpr float stdDevMultiplier{ 2.F }; using CosineDistance = math::NormalizedCosineDistance; @@ -784,7 +790,7 @@ namespace lms::recommendation LMS_SCOPED_TRACE_DETAILED("AudioSimilarityEngine", "ComputeArtistDistanceThreshold"); constexpr std::size_t maxSampleCount{ 200 }; - constexpr std::size_t maxCandidateCount{ 1'000 }; + constexpr std::size_t maxCandidateCount{ 2'000 }; constexpr float stdDevMultiplier{ 2.F }; using CosineDistance = math::NormalizedCosineDistance; From 709a1509b6239f09e9e22f660b4ec420e353fafb Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 7 Jun 2026 17:37:38 +0200 Subject: [PATCH 03/38] Use local time, if available, in the web interface, fixes #427 --- approot/messages.xml | 4 +-- approot/messages_es.xml | 4 +-- approot/messages_fr.xml | 4 +-- approot/messages_it.xml | 4 +-- approot/messages_pl.xml | 4 +-- approot/messages_zh.xml | 4 +-- src/libs/core/impl/Logger.cpp | 43 ++++++++++++++++++++---- src/lms/ui/LmsApplication.cpp | 21 ++++++++++-- src/lms/ui/admin/ScannerController.cpp | 46 ++++++++++++++++++++++---- src/lms/ui/admin/UserView.cpp | 6 +++- 10 files changed, 111 insertions(+), 29 deletions(-) diff --git a/approot/messages.xml b/approot/messages.xml index 000dfef9..8a8ccaca 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -129,7 +129,7 @@ Get report Last scan Not available -{1} files were scanned in {2} at {4} on {3} (UTC) - {5} errors, {6} duplicates +{1} files were scanned in {2} at {4} on {3} - {5} errors, {6} duplicates Missing artist name Unable to find track paths Unable to find the path "{1}" @@ -141,7 +141,7 @@ Scanner Status Not scheduled -Scheduled at {2} on {1} (UTC) +Scheduled at {2} on {1} Scanning: step {1}/{2} Associating artist images: {1}%... Associating external lyrics: {1}%... diff --git a/approot/messages_es.xml b/approot/messages_es.xml index bc9b0183..67068d3f 100644 --- a/approot/messages_es.xml +++ b/approot/messages_es.xml @@ -129,7 +129,7 @@ Informe Último escaneo No disponible -{1} ficheros analizados en {2} el {3} a las {4} (UTC) - {5} errores, {6} duplicados +{1} ficheros analizados en {2} el {3} a las {4} - {5} errores, {6} duplicados Falta el nombre del artista No se pudieron encontrar las rutas de las pistas No se pudo encontrar la ruta "{1}" @@ -141,7 +141,7 @@ Escanear Estado No progamado -Programado el {1} a las {2} (UTC) +Programado el {1} a las {2} Escaneando: etapa {1}/{2} Association des images des artistes: {1}%... Association des paroles externes: {1}%... diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 65d2a543..20544b6e 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -129,7 +129,7 @@ Rapport Dernier scan Non disponible -{1} fichiers analysés en {2} à {4} le {3} (UTC) - {5} erreurs, {6} duplicatas +{1} fichiers analysés en {2} à {4} le {3} - {5} erreurs, {6} duplicatas Nom de l'artiste manquant Impossible de trouver les chemins des pistes Impossible de trouver le chemin "{1}" @@ -141,7 +141,7 @@ Scanner Statut Non planifié -Planifié à {2} le {1} (UTC) +Planifié à {2} le {1} En cours de scan : étape {1}/{2} Association des images des artistes: {1}%... Association des paroles externes: {1}%... diff --git a/approot/messages_it.xml b/approot/messages_it.xml index 39051ccb..c677a12d 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -129,7 +129,7 @@ Scarica un resoconto Ultima scansione Non disponibile -{1} file scansionati in {2} alle {3} il {4} (UTC) - {5} errori, {6} duplicati +{1} file scansionati in {2} alle {3} il {4} - {5} errori, {6} duplicati Nome dell'artista mancante Impossibile trovare i percorsi delle tracce Impossibile trovare il percorso "{1}" @@ -141,7 +141,7 @@ Scanner Stato Non pianificato -Programmato alle {2} del {1} (UTC) +Programmato alle {2} del {1} Scansione: passo {1}/{2} Associando immagini degli artisti: {1}%... Associazione dei testi esterni: {1}%... diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml index 25eba67e..144875ea 100644 --- a/approot/messages_pl.xml +++ b/approot/messages_pl.xml @@ -138,7 +138,7 @@ Pokaż raport Ostatnie skanowanie Niedostępne -Przeskanowano {1} plików w {2} o {4} dnia {3} (UTC) - {5} błędów, {6} duplikatów +Przeskanowano {1} plików w {2} o {4} dnia {3} - {5} błędów, {6} duplikatów Brakuje nazwy artysty Nie można znaleźć ścieżek utworów Nie można znaleźć ścieżki „{1}” @@ -150,7 +150,7 @@ Skaner Status Nie zaplanowano -Zaplanowano o {2} dnia {1} (UTC) +Zaplanowano o {2} dnia {1} Skanowanie: krok {1}/{2} Kojarzenie obrazów artystów: {1}%... Kojarzenie zewnętrznych tekstów: {1}%... diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 8c4146d3..cd558e34 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -127,7 +127,7 @@ 生成报告 最后扫描 不可用 -已扫描 {1} 个文件，用时 {2}，在 {3} 的 {4} (UTC) - {5} 个错误，{6} 个重复项 +已扫描 {1} 个文件，用时 {2}，在 {3} 的 {4} - {5} 个错误，{6} 个重复项 缺少艺术家名称 无法找到曲目路径 无法找到路径 "{1}" @@ -139,7 +139,7 @@ 扫描器 状态 无计划 -计划于 {2} 在 {1} (UTC) +计划于 {2} 在 {1} 扫描中: 阶段 {1}/{2} 关联艺术家图片：{1}%... 关联外部歌词：{1}%... diff --git a/src/libs/core/impl/Logger.cpp b/src/libs/core/impl/Logger.cpp index acffea76..0ae6b682 100644 --- a/src/libs/core/impl/Logger.cpp +++ b/src/libs/core/impl/Logger.cpp @@ -19,15 +19,47 @@ #include "Logger.hpp" -#include - #include +#include +#include +#include #include #include +#include #include #include "core/Exception.hpp" -#include "core/String.hpp" + +namespace +{ + std::string localISO8601TimeString() + { + using Clock = std::chrono::system_clock; + const auto now{ Clock::now() }; + const int ms{ static_cast(std::chrono::duration_cast(now.time_since_epoch()).count() % 1000) }; + const std::time_t tt{ Clock::to_time_t(now) }; + std::tm tm{}; + ::localtime_r(&tt, &tm); + + std::array datetime{}; + std::array offset{}; + std::strftime(datetime.data(), datetime.size(), "%Y-%m-%dT%H:%M:%S", &tm); + std::strftime(offset.data(), offset.size(), "%z", &tm); // "+HHMM" or "-HHMM" + + // Append msecs and offset + const std::string_view offsetView{ offset.data() }; + std::string result{ datetime.data() }; + result += '.'; + result += static_cast('0' + ms / 100); + result += static_cast('0' + (ms / 10) % 10); + result += static_cast('0' + ms % 10); + result += offsetView.substr(0, 3); // sign + HH + result += ':'; + result += offsetView.substr(3); // MM + + return result; + } +} // namespace namespace lms::core::logging { @@ -205,9 +237,8 @@ namespace lms::core::logging { assert(isSeverityActive(severity)); // should have been filtered out by a isSeverityActive call OutputStream* outputStream{ _severityToOutputStreamMap.at(severity) }; - const Wt::WDateTime now{ Wt::WDateTime::currentDateTime() }; std::unique_lock lock{ outputStream->mutex }; - outputStream->stream << stringUtils::toISO8601String(now) << " " << std::this_thread::get_id() << " [" << getSeverityName(severity) << "] [" << getModuleName(module) << "] " << message << std::endl; + outputStream->stream << localISO8601TimeString() << " " << std::this_thread::get_id() << " [" << getSeverityName(severity) << "] [" << getModuleName(module) << "] " << message << std::endl; } -} // namespace lms::core::logging \ No newline at end of file +} // namespace lms::core::logging diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 5d1a1b58..58790df4 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -19,6 +19,8 @@ #include "LmsApplication.hpp" +#include + #include #include #include @@ -117,7 +119,7 @@ namespace lms::ui return res; } - Wt::WLocale createLocale(const std::string& name) + Wt::WLocale createLocale(const std::string& name, [[maybe_unused]] const std::string& timeZoneName) { Wt::WLocale locale{ name }; locale.setDecimalPoint(Wt::WString::tr("Lms.locale.decimal-point").toUTF8()); @@ -126,6 +128,19 @@ namespace lms::ui locale.setTimeFormat(Wt::WString::tr("Lms.locale.time-format").toUTF8()); locale.setDateTimeFormat(Wt::WString::tr("Lms.locale.date-time-format").toUTF8()); +#ifdef WT_DATE_TZ_USE_STD + if (!timeZoneName.empty()) + { + try + { + locale.setTimeZone(std::chrono::locate_zone(timeZoneName)); + } + catch (const std::runtime_error&) + { + // unknown zone, display stays UTC + } + } +#endif return locale; } @@ -224,7 +239,7 @@ namespace lms::ui setTitle(); setLocalizedStrings(getOrCreateMessageBundle()); - setLocale(createLocale(Wt::WLocale::currentLocale().name())); + setLocale(createLocale(Wt::WLocale::currentLocale().name(), environment().timeZoneName())); // Handle Media Scanner events and other session events enableUpdates(true); @@ -325,7 +340,7 @@ namespace lms::ui setUserInfo(userId, strongAuth); - LMS_LOG(UI, INFO, "User '" << getUserLoginName() << "' logged in from '" << environment().clientAddress() << "', user agent = " << environment().userAgent() << ", locale = '" << locale().name() << "'"); + LMS_LOG(UI, INFO, "User '" << getUserLoginName() << "' logged in from '" << environment().clientAddress() << "', user agent = " << environment().userAgent() << ", locale = '" << locale().name() << "', timezone = '" << environment().timeZoneName() << "'"); _appManager.registerApplication(*this); _appManager.applicationRegistered.connect(this, [this](LmsApplication& otherApplication) { diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index 103b8dd0..ad87ae72 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -114,11 +115,26 @@ namespace lms::ui { if (status.lastCompleteScanStats) { + const auto& locale{ Wt::WLocale::currentLocale() }; + const Wt::WDateTime& stopTime{ status.lastCompleteScanStats->stopTime }; + Wt::WString stopDateStr; + Wt::WString stopTimeStr; + if (locale.timeZone()) + { + const Wt::WLocalDateTime local{ stopTime.toLocalTime() }; + stopDateStr = local.date().toString(locale.dateFormat()); + stopTimeStr = local.time().toString(locale.timeFormat()); + } + else + { + stopDateStr = stopTime.date().toString(locale.dateFormat()); + stopTimeStr = stopTime.time().toString(locale.timeFormat()) + " (UTC)"; + } _lastScanStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.last-scan-status") .arg(status.lastCompleteScanStats->getTotalFileCount()) .arg(durationToString(status.lastCompleteScanStats->startTime, status.lastCompleteScanStats->stopTime)) - .arg(status.lastCompleteScanStats->stopTime.date().toString(Wt::WLocale::currentLocale().dateFormat())) - .arg(status.lastCompleteScanStats->stopTime.time().toString(Wt::WLocale::currentLocale().timeFormat())) + .arg(stopDateStr) + .arg(stopTimeStr) .arg(status.lastCompleteScanStats->errorsCount) .arg(status.lastCompleteScanStats->duplicates.size())); @@ -144,11 +160,27 @@ namespace lms::ui break; case IScannerService::State::Scheduled: - _status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-scheduled") - .arg(status.nextScheduledScan.date().toString(Wt::WLocale::currentLocale().dateFormat())) - .arg(status.nextScheduledScan.time().toString(Wt::WLocale::currentLocale().timeFormat()))); - _stepStatus->setText(""); - break; + { + const auto& locale{ Wt::WLocale::currentLocale() }; + Wt::WString nextDateStr; + Wt::WString nextTimeStr; + if (locale.timeZone()) + { + const Wt::WLocalDateTime local{ status.nextScheduledScan.toLocalTime() }; + nextDateStr = local.date().toString(locale.dateFormat()); + nextTimeStr = local.time().toString(locale.timeFormat()); + } + else + { + nextDateStr = status.nextScheduledScan.date().toString(locale.dateFormat()); + nextTimeStr = status.nextScheduledScan.time().toString(locale.timeFormat()) + " (UTC)"; + } + _status->setText(Wt::WString::tr("Lms.Admin.ScannerController.status-scheduled") + .arg(nextDateStr) + .arg(nextTimeStr)); + _stepStatus->setText(""); + break; + } case IScannerService::State::InProgress: assert(status.currentScanStepStats); diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp index 85a0505d..9af91ce6 100644 --- a/src/lms/ui/admin/UserView.cpp +++ b/src/lms/ui/admin/UserView.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -229,7 +230,10 @@ namespace lms::ui t->bindString("title", title, Wt::TextFormat::Plain); t->setCondition("if-has-last-login", true); - t->bindString("last-login", user->getLastLogin().toString(), Wt::TextFormat::Plain); + const auto& locale{ Wt::WLocale::currentLocale() }; + const Wt::WDateTime lastLogin{ user->getLastLogin() }; + const Wt::WString lastLoginStr{ locale.timeZone() ? lastLogin.toLocalTime().toString() : lastLogin.toString(locale.dateTimeFormat()) + " (UTC)" }; + t->bindString("last-login", lastLoginStr, Wt::TextFormat::Plain); } else { From f8aa2ed17db35d9cf86d8cae2e2df249266f5a66 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 9 Jun 2026 22:56:59 +0200 Subject: [PATCH 04/38] Added last.fm support to scrobble data, fixes #138 --- approot/messages.xml | 16 + approot/messages_es.xml | 16 + approot/messages_fr.xml | 28 +- approot/messages_it.xml | 16 + approot/messages_pl.xml | 16 + approot/messages_zh.xml | 16 + approot/settings-services.xml | 60 ++++ conf/lms.conf | 6 + src/libs/core/CMakeLists.txt | 1 + src/libs/core/impl/Md5.cpp | 35 ++ src/libs/core/impl/String.cpp | 16 + src/libs/core/impl/http/SendQueue.cpp | 8 +- src/libs/core/include/core/Md5.hpp | 29 ++ src/libs/core/include/core/String.hpp | 2 + src/libs/database/impl/Migration.cpp | 10 +- .../include/database/objects/Types.hpp | 1 + .../include/database/objects/User.hpp | 14 +- src/libs/services/scrobbling/CMakeLists.txt | 3 + .../scrobbling/impl/ScrobblingService.cpp | 28 ++ .../scrobbling/impl/ScrobblingService.hpp | 14 + .../scrobbling/impl/lastfm/LastFmBackend.cpp | 191 +++++++++++ .../scrobbling/impl/lastfm/LastFmBackend.hpp | 83 +++++ .../impl/lastfm/ScrobblingsSynchronizer.cpp | 322 ++++++++++++++++++ .../impl/lastfm/ScrobblingsSynchronizer.hpp | 77 +++++ .../services/scrobbling/impl/lastfm/Utils.cpp | 124 +++++++ .../services/scrobbling/impl/lastfm/Utils.hpp | 52 +++ .../scrobbling/IScrobblingService.hpp | 14 + .../services/scrobbling/test/CMakeLists.txt | 1 + .../services/scrobbling/test/LastFmUtils.cpp | 147 ++++++++ src/lms/ui/LmsApplication.cpp | 9 +- src/lms/ui/LmsApplication.hpp | 3 +- src/lms/ui/settings/ServicesSettingsView.cpp | 232 +++++++++++-- src/lms/ui/settings/ServicesSettingsView.hpp | 3 + 33 files changed, 1548 insertions(+), 45 deletions(-) create mode 100644 src/libs/core/impl/Md5.cpp create mode 100644 src/libs/core/include/core/Md5.hpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/LastFmBackend.hpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.hpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/Utils.cpp create mode 100644 src/libs/services/scrobbling/impl/lastfm/Utils.hpp create mode 100644 src/libs/services/scrobbling/test/LastFmUtils.cpp diff --git a/approot/messages.xml b/approot/messages.xml index 8a8ccaca..4163ae7b 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -343,8 +343,24 @@ Audio These audio settings are local to your browser Internal +Last.fm +Last.fm API key +Last.fm API secret ListenBrainz ListenBrainz API token +Last.fm account +Linked +Link account +Unlink account +Link Last.fm account +Enter your Last.fm API key and shared secret (get them at last.fm/api/account/create), then click Authorize. +Authorize on Last.fm +Done, I've authorized +Didn't open? Click here to authorize on Last.fm +Unlink Last.fm account +Are you sure you want to unlink your Last.fm account? Scrobbling will stop until you link again. +Please enter your Last.fm API key and secret. +Last.fm authentication failed. Check your API key and secret. Change password Release Date (Ascending) Release Date (Descending) diff --git a/approot/messages_es.xml b/approot/messages_es.xml index 67068d3f..7d67101f 100644 --- a/approot/messages_es.xml +++ b/approot/messages_es.xml @@ -345,6 +345,22 @@ Interno ListenBrainz Token de la API de ListenBrainz +Last.fm +Clave API de Last.fm +Secreto de API de Last.fm +Cuenta de Last.fm +Vinculado +Vincular cuenta +Desvincular cuenta +Vincular cuenta de Last.fm +Introduce tu clave API y secreto compartido de Last.fm (obténlos en last.fm/api/account/create), luego haz clic en Autorizar. +Autorizar en Last.fm +Hecho, he autorizado +¿No se abrió? Haz clic aquí para autorizar en Last.fm +Desvincular cuenta de Last.fm +¿Estás seguro de que deseas desvincular tu cuenta de Last.fm? El scrobbling se detendrá hasta que vuelvas a vincularla. +Por favor, introduce tu clave API y secreto de Last.fm. +Error de autenticación de Last.fm. Comprueba tu clave API y secreto. Cambiar contraseña Fecha de publicación (Ascendiente) Fecha de publicación (Descendiente) diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 20544b6e..6f9a6166 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -345,6 +345,22 @@ Interne ListenBrainz Jeton d'API ListenBrainz +Last.fm +Clef API Last.fm +Secret API Last.fm +Compte Last.fm +Lié +Lier le compte +Délier le compte +Lier le compte Last.fm +Entrez votre clef API et votre secret partagé Last.fm (obtenez-les sur last.fm/api/account/create), puis cliquez sur Autoriser. +Autoriser sur Last.fm +Terminé, j'ai autorisé +Pas ouvert ? Cliquez ici pour autoriser sur Last.fm +Délier le compte Last.fm +Êtes-vous sûr de vouloir délier votre compte Last.fm ? Le scrobbling s'arrêtera jusqu'à ce que vous le reliiez. +Veuillez entrer votre clef API et votre secret Last.fm. +Échec de l'authentification Last.fm. Vérifiez votre clef API et votre secret. Changement de mot de passe Date de sortie (Croissant) Date de sortie (Décroissant) @@ -366,13 +382,13 @@ Mauvais mot de passe L'ancien mot de passe doit être renseigné Regénérer -Clé API copiée dans le presse-papiers ! +Clef API copiée dans le presse-papiers ! Supprimer -Supprimer la clé déconnectera tous les clients qui l'utilisent actuellement. -Supprimer la clé API ? +Supprimer la clef déconnectera tous les clients qui l'utilisent actuellement. +Supprimer la clef API ? Regénérer -Générer une nouvelle clé invalidera tous les clients utilisant actuellement la clé existante. -Regénérer la clé API ? +Générer une nouvelle clef invalidera tous les clients utilisant actuellement la clef existante. +Regénérer la clef API ? Mode ReplayGain Pas de ReplayGain Automatique @@ -390,7 +406,7 @@ Tous les artistes de piste API Subsonic Clef pour l'API OpenSubsonic -Utilisez cette clé d'API comme mot de passe pour les clients qui ne prennent pas en charge l'extension 'API Key Authentication' +Utilisez cette clef d'API comme mot de passe pour les clients qui ne prennent pas en charge l'extension 'API Key Authentication' Transcodage Appliquer le transcodage Toujours diff --git a/approot/messages_it.xml b/approot/messages_it.xml index c677a12d..06baee9c 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -345,6 +345,22 @@ Interno ListenBrainz Token API ListenBrainz +Last.fm +Chiave API Last.fm +Segreto API Last.fm +Account Last.fm +Collegato +Collega account +Scollega account +Collega account Last.fm +Inserisci la chiave API e il segreto condiviso di Last.fm (ottenili su last.fm/api/account/create), poi clicca su Autorizza. +Autorizza su Last.fm +Fatto, ho autorizzato +Non si è aperto? Clicca qui per autorizzare su Last.fm +Scollega account Last.fm +Sei sicuro di voler scollegare il tuo account Last.fm? Lo scrobbling si interromperà finché non lo ricolleghi. +Inserisci la chiave API e il segreto Last.fm. +Autenticazione Last.fm fallita. Controlla la chiave API e il segreto. Cambia password Data di uscita (Crescente) Data di uscita (Decrescente) diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml index 144875ea..d89687d5 100644 --- a/approot/messages_pl.xml +++ b/approot/messages_pl.xml @@ -371,6 +371,22 @@ Wewnętrzny ListenBrainz ListenBrainz API token +Last.fm +Klucz API Last.fm +Sekret API Last.fm +Konto Last.fm +Połączono +Połącz konto +Odłącz konto +Połącz konto Last.fm +Wprowadź klucz API i współdzielony sekret Last.fm (uzyskaj je na last.fm/api/account/create), następnie kliknij Autoryzuj. +Autoryzuj na Last.fm +Gotowe, autoryzowałem +Nie otworzyło się? Kliknij tutaj, aby autoryzować na Last.fm +Odłącz konto Last.fm +Czy na pewno chcesz odłączyć swoje konto Last.fm? Scrobbling zostanie zatrzymany do czasu ponownego połączenia. +Wprowadź klucz API i sekret Last.fm. +Uwierzytelnianie Last.fm nie powiodło się. Sprawdź klucz API i sekret. Zmień hasło Data wydania (Rosnąco) Data wydania (Malejąco) diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index cd558e34..9c525cc4 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -316,6 +316,22 @@ 内部 ListenBrainz ListenBrainz API 令牌 +Last.fm +Last.fm API 密钥 +Last.fm API 共享密钥 +Last.fm 账户 +已关联 +关联账户 +取消关联账户 +关联 Last.fm 账户 +输入您的 Last.fm API 密钥和共享密钥（从 last.fm/api/account/create 获取），然后点击授权。 +在 Last.fm 上授权 +完成，我已授权 +未打开？点击此处在 Last.fm 上授权 +取消关联 Last.fm 账户 +您确定要取消关联 Last.fm 账户吗？在重新关联之前，scrobbling 将停止。 +请输入您的 Last.fm API 密钥和共享密钥。 +Last.fm 认证失败。请检查您的 API 密钥和共享密钥。 更改密码 发行日期（升序） 发行日期（降序） diff --git a/approot/settings-services.xml b/approot/settings-services.xml index 62598371..9d31f847 100644 --- a/approot/settings-services.xml +++ b/approot/settings-services.xml @@ -39,4 +39,64 @@ ${save-btn class="btn btn-primary me-1"}${discard-btn class="btn btn-secondary"} + +
+
+ ${tr:Lms.Settings.services.lastfm-card-title} + ${card-header-badge} +
+
+ ${card-content} +
+
+ + + +
+
+
+
+
${tr:Lms.Settings.services.lastfm-link-modal-title}
+
+
+

${tr:Lms.Settings.services.lastfm-link-modal-help}

+
+ + ${api-key class="form-control"} +
+
+ +
+ ${api-secret class="form-control"} + ${api-secret-visibility-btn class="btn btn-outline-secondary"} +
+
+ ${auth-anchor-container} +
+
+ ${authorize-btn class="btn btn-primary me-1"}${done-btn class="btn btn-success me-1"}${cancel-btn class="btn btn-secondary"} +
+
+
+
+ + + +
+
+
+
+
${tr:Lms.Settings.services.lastfm-unlink-confirm-title}
+
+
+ ${tr:Lms.Settings.services.lastfm-unlink-confirm-body} +
+
+ ${confirm-btn class="btn btn-danger me-1"}${cancel-btn class="btn btn-secondary"} +
+
+
+
+ + diff --git a/conf/lms.conf b/conf/lms.conf index a4329c4e..e53559b8 100644 --- a/conf/lms.conf +++ b/conf/lms.conf @@ -61,6 +61,12 @@ listenbrainz-max-sync-feedback-count = 1000; # How often to resync feedbacks (0 to disable sync) listenbrainz-sync-feedbacks-period-hours = 1; +# Last.fm API and authorization URLs +lastfm-api-base-url = "https://ws.audioscrobbler.com"; +lastfm-auth-base-url = "https://www.last.fm"; +# How often to submit pending scrobbles (0 to disable) +lastfm-submit-period-hours = 1; + # Acousticbrainz root API acousticbrainz-api-base-url = "https://acousticbrainz.org"; diff --git a/src/libs/core/CMakeLists.txt b/src/libs/core/CMakeLists.txt index 5049c270..65c8826d 100644 --- a/src/libs/core/CMakeLists.txt +++ b/src/libs/core/CMakeLists.txt @@ -34,6 +34,7 @@ add_library(lmscore STATIC impl/String.cpp impl/TraceLogger.cpp impl/UUID.cpp + impl/Md5.cpp impl/XxHash3.cpp ${CMAKE_CURRENT_BINARY_DIR}/impl/Version.cpp ) diff --git a/src/libs/core/impl/Md5.cpp b/src/libs/core/impl/Md5.cpp new file mode 100644 index 00000000..d9305767 --- /dev/null +++ b/src/libs/core/impl/Md5.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2025 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 "core/Md5.hpp" + +#include + +namespace lms::core +{ + std::array md5(std::string_view data) + { + const std::string raw{ Wt::Utils::md5(std::string{ data }) }; + + std::array result; + for (std::size_t i{}; i < 16; ++i) + result[i] = static_cast(static_cast(raw[i])); + return result; + } +} // namespace lms::core diff --git a/src/libs/core/impl/String.cpp b/src/libs/core/impl/String.cpp index 99db1e12..8fec0efb 100644 --- a/src/libs/core/impl/String.cpp +++ b/src/libs/core/impl/String.cpp @@ -462,6 +462,22 @@ namespace lms::core::stringUtils detail::writeEscapedString(os, str, detail::xmlEscapeChars); } + std::string urlEncode(std::string_view str) + { + std::ostringstream encoded; + encoded << std::hex << std::uppercase; + + for (const unsigned char c : str) + { + if (std::isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~') + encoded << c; + else + encoded << '%' << std::setw(2) << std::setfill('0') << static_cast(c); + } + + return encoded.str(); + } + std::string escapeString(std::string_view str, std::string_view charsToEscape, char escapeChar) { std::string res; diff --git a/src/libs/core/impl/http/SendQueue.cpp b/src/libs/core/impl/http/SendQueue.cpp index b2b1a35a..e4c819ec 100644 --- a/src/libs/core/impl/http/SendQueue.cpp +++ b/src/libs/core/impl/http/SendQueue.cpp @@ -284,8 +284,12 @@ namespace lms::core::http LOG(DEBUG, "Remaining messages = " << (remainingCount ? *remainingCount : 0)); if (mustThrottle || (remainingCount && *remainingCount == 0)) { - const auto waitDuration{ headerReadAs(msg, "X-RateLimit-Reset-In") }; - throttle(waitDuration.value_or(_defaultRetryWaitDuration)); + const std::chrono::seconds waitDuration{ + headerReadAs(msg, "X-RateLimit-Reset-In") + .value_or(headerReadAs(msg, "Retry-After") + .value_or(_defaultRetryWaitDuration)) + }; + throttle(waitDuration); } if (!mustThrottle) diff --git a/src/libs/core/include/core/Md5.hpp b/src/libs/core/include/core/Md5.hpp new file mode 100644 index 00000000..721ed1e4 --- /dev/null +++ b/src/libs/core/include/core/Md5.hpp @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2025 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 +#include + +namespace lms::core +{ + std::array md5(std::string_view data); +} // namespace lms::core diff --git a/src/libs/core/include/core/String.hpp b/src/libs/core/include/core/String.hpp index 3021cb54..2dd2652c 100644 --- a/src/libs/core/include/core/String.hpp +++ b/src/libs/core/include/core/String.hpp @@ -108,6 +108,8 @@ namespace lms::core::stringUtils [[nodiscard]] std::string xmlEscape(std::string_view str); void writeXmlEscapedString(std::ostream& os, std::string_view str); + [[nodiscard]] std::string urlEncode(std::string_view str); + [[nodiscard]] std::string escapeString(std::string_view str, std::string_view charsToEscape, char escapeChar); [[nodiscard]] std::string unescapeString(std::string_view str, char escapeChar); diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index aadab808..e7b2e54a 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -35,7 +35,7 @@ namespace lms::db { namespace { - static constexpr Version LMS_DATABASE_VERSION{ 105 }; + static constexpr Version LMS_DATABASE_VERSION{ 106 }; } VersionInfo::VersionInfo() @@ -1729,6 +1729,13 @@ FROM track)"); utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE "playlist_file" ADD COLUMN "cover_image_file" text NOT NULL DEFAULT '')"); } + void migrateFromV105(Session& session) + { + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE "user" ADD COLUMN "lastfm_api_key" TEXT NOT NULL DEFAULT '')"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE "user" ADD COLUMN "lastfm_api_secret" TEXT NOT NULL DEFAULT '')"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE "user" ADD COLUMN "lastfm_session_key" TEXT NOT NULL DEFAULT '')"); + } + bool doDbMigration(Session& session) { constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" }; @@ -1810,6 +1817,7 @@ FROM track)"); { 102, migrateFromV102 }, { 103, migrateFromV103 }, { 104, migrateFromV104 }, + { 105, migrateFromV105 }, }; bool migrationPerformed{}; diff --git a/src/libs/database/include/database/objects/Types.hpp b/src/libs/database/include/database/objects/Types.hpp index 77fbea2d..f470d9e6 100644 --- a/src/libs/database/include/database/objects/Types.hpp +++ b/src/libs/database/include/database/objects/Types.hpp @@ -198,6 +198,7 @@ namespace lms::db { Internal = 0, ListenBrainz = 1, + LastFm = 2, }; enum class FeedbackBackend diff --git a/src/libs/database/include/database/objects/User.hpp b/src/libs/database/include/database/objects/User.hpp index 29618a7f..79244d51 100644 --- a/src/libs/database/include/database/objects/User.hpp +++ b/src/libs/database/include/database/objects/User.hpp @@ -118,6 +118,9 @@ namespace lms::db void setFeedbackBackend(FeedbackBackend feedbackBackend) { _feedbackBackend = feedbackBackend; } void setScrobblingBackend(ScrobblingBackend scrobblingBackend) { _scrobblingBackend = scrobblingBackend; } void setListenBrainzToken(std::string_view token) { _listenbrainzToken = token; } + void setLastFmApiKey(std::string_view key) { _lastFmApiKey = key; } + void setLastFmApiSecret(std::string_view secret) { _lastFmApiSecret = secret; } + void setLastFmSessionKey(std::string_view key) { _lastFmSessionKey = key; } // read bool isAdmin() const { return _type == UserType::ADMIN; } @@ -134,6 +137,9 @@ namespace lms::db FeedbackBackend getFeedbackBackend() const { return _feedbackBackend; } ScrobblingBackend getScrobblingBackend() const { return _scrobblingBackend; } std::string_view getListenBrainzToken() const { return _listenbrainzToken; } + std::string_view getLastFmApiKey() const { return _lastFmApiKey; } + std::string_view getLastFmApiSecret() const { return _lastFmApiSecret; } + std::string_view getLastFmSessionKey() const { return _lastFmSessionKey; } template void persist(Action& a) @@ -155,6 +161,9 @@ namespace lms::db Wt::Dbo::field(a, _feedbackBackend, "feedback_backend"); Wt::Dbo::field(a, _scrobblingBackend, "scrobbling_backend"); Wt::Dbo::field(a, _listenbrainzToken, "listenbrainz_token"); + Wt::Dbo::field(a, _lastFmApiKey, "lastfm_api_key"); + Wt::Dbo::field(a, _lastFmApiSecret, "lastfm_api_secret"); + Wt::Dbo::field(a, _lastFmSessionKey, "lastfm_session_key"); Wt::Dbo::hasMany(a, _authTokens, Wt::Dbo::ManyToOne, "user"); Wt::Dbo::hasMany(a, _uiStates, Wt::Dbo::ManyToOne, "user"); @@ -176,7 +185,10 @@ namespace lms::db core::EnumSet _uiInlineArtistRelationships{ TrackArtistLinkType::Composer, TrackArtistLinkType::Performer }; FeedbackBackend _feedbackBackend{ defaultFeedbackBackend }; ScrobblingBackend _scrobblingBackend{ defaultScrobblingBackend }; - std::string _listenbrainzToken; // Musicbrainz Identifier + std::string _listenbrainzToken; + std::string _lastFmApiKey; + std::string _lastFmApiSecret; + std::string _lastFmSessionKey; // Admin defined settings UserType _type{ UserType::REGULAR }; diff --git a/src/libs/services/scrobbling/CMakeLists.txt b/src/libs/services/scrobbling/CMakeLists.txt index 55b5e825..b99037fb 100644 --- a/src/libs/services/scrobbling/CMakeLists.txt +++ b/src/libs/services/scrobbling/CMakeLists.txt @@ -1,6 +1,9 @@ add_library(lmsscrobbling STATIC impl/internal/InternalBackend.cpp + impl/lastfm/LastFmBackend.cpp + impl/lastfm/ScrobblingsSynchronizer.cpp + impl/lastfm/Utils.cpp impl/listenbrainz/ListenBrainzBackend.cpp impl/listenbrainz/ListenTypes.cpp impl/listenbrainz/ListensParser.cpp diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp index f40ac462..af528d38 100644 --- a/src/libs/services/scrobbling/impl/ScrobblingService.cpp +++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp @@ -29,6 +29,7 @@ #include "database/objects/User.hpp" #include "internal/InternalBackend.hpp" +#include "lastfm/LastFmBackend.hpp" #include "listenbrainz/ListenBrainzBackend.hpp" namespace lms::scrobbling @@ -67,6 +68,11 @@ namespace lms::scrobbling LMS_LOG(SCROBBLING, INFO, "Starting service..."); _scrobblingBackends.emplace(ScrobblingBackend::Internal, std::make_unique(_db)); _scrobblingBackends.emplace(ScrobblingBackend::ListenBrainz, std::make_unique(ioContext, _db)); + { + auto backend{ std::make_unique(ioContext, _db) }; + _lastFmBackend = backend.get(); + _scrobblingBackends.emplace(ScrobblingBackend::LastFm, std::move(backend)); + } LMS_LOG(SCROBBLING, INFO, "Service started!"); } @@ -95,6 +101,28 @@ namespace lms::scrobbling _scrobblingBackends[*backend]->addTimedListen(listen); } + void ScrobblingService::initiateLastFmLink(db::UserId userId, + std::string_view apiKey, + std::string_view apiSecret, + std::function onSuccess, + std::function onFailure) + { + if (_lastFmBackend) + _lastFmBackend->initiateLastFmLink(userId, apiKey, apiSecret, std::move(onSuccess), std::move(onFailure)); + else + onFailure(); + } + + void ScrobblingService::continueLastFmLink(db::UserId userId, + std::function onSuccess, + std::function onFailure) + { + if (_lastFmBackend) + _lastFmBackend->continueLastFmLink(userId, std::move(onSuccess), std::move(onFailure)); + else + onFailure(); + } + void ScrobblingService::visitNowPlayingListens(const std::function& visitor, db::UserId userId) { const Clock::time_point now{ Clock::now() }; diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.hpp b/src/libs/services/scrobbling/impl/ScrobblingService.hpp index 96ae5cfe..7202c7c0 100644 --- a/src/libs/services/scrobbling/impl/ScrobblingService.hpp +++ b/src/libs/services/scrobbling/impl/ScrobblingService.hpp @@ -28,6 +28,11 @@ #include "IScrobblingBackend.hpp" +namespace lms::scrobbling::lastFm +{ + class LastFmBackend; +} + namespace lms::scrobbling { class ScrobblingService : public IScrobblingService @@ -59,12 +64,21 @@ namespace lms::scrobbling ReleaseContainer getTopReleases(const FindParameters& params) override; TrackContainer getTopTracks(const FindParameters& params) override; + void initiateLastFmLink(db::UserId userId, std::string_view apiKey, std::string_view apiSecret, + std::function onSuccess, + std::function onFailure) override; + + void continueLastFmLink(db::UserId userId, + std::function onSuccess, + std::function onFailure) override; + std::optional getUserBackend(db::UserId userId); void insertNowPlayingEntry(const Listen& listen); db::IDb& _db; std::unordered_map> _scrobblingBackends; + lastFm::LastFmBackend* _lastFmBackend{}; // non-owning, owned via _scrobblingBackends std::shared_mutex _nowPlayingEntriesMutex; struct NowPlayingEntry diff --git a/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp new file mode 100644 index 00000000..665ffaa8 --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp @@ -0,0 +1,191 @@ +/* + * Copyright (C) 2025 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 "LastFmBackend.hpp" + +#include + +#include "core/IConfig.hpp" +#include "core/Service.hpp" +#include "core/http/IClient.hpp" +#include "database/IDb.hpp" +#include "database/Session.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/User.hpp" + +#include "Utils.hpp" + +namespace lms::scrobbling::lastFm +{ + namespace + { + bool canBeScrobbled(db::Session& session, db::TrackId trackId, std::chrono::seconds playedDuration) + { + auto transaction{ session.createReadTransaction() }; + + const db::Track::pointer track{ db::Track::find(session, trackId) }; + if (!track) + return false; + + const bool res{ track->getDuration() >= std::chrono::seconds{ 30 } && (playedDuration >= std::chrono::minutes{ 4 } || playedDuration >= track->getDuration() / 2) }; + if (!res) + LOG(DEBUG, "Track cannot be scrobbled: played duration too short (" << playedDuration.count() << "s, total = " << std::chrono::duration_cast(track->getDuration()).count() << "s)"); + + return res; + } + } // namespace + + LastFmBackend::LastFmBackend(boost::asio::io_context& ioContext, db::IDb& db) + : _db{ db } + , _authBaseUrl{ core::Service::get()->getString("lastfm-auth-base-url", "https://www.last.fm") } + , _client{ core::http::createClient(ioContext, core::Service::get()->getString("lastfm-api-base-url", "https://ws.audioscrobbler.com")) } + , _synchronizer{ ioContext, db, *_client } + { + LOG(INFO, "Starting Last.fm backend"); + } + + LastFmBackend::~LastFmBackend() + { + LOG(INFO, "Stopped Last.fm backend"); + } + + void LastFmBackend::listenStarted(const Listen& listen) + { + _synchronizer.enqueListenNow(listen); + } + + void LastFmBackend::listenFinished(const Listen& listen, std::optional playedDuration) + { + if (playedDuration && !canBeScrobbled(_db.getTLSSession(), listen.trackId, *playedDuration)) + return; + + const TimedListen timedListen{ listen, Wt::WDateTime::currentDateTime() }; + _synchronizer.enqueListen(timedListen); + } + + void LastFmBackend::addTimedListen(const TimedListen& timedListen) + { + _synchronizer.enqueListen(timedListen); + } + + void LastFmBackend::initiateLastFmLink(db::UserId userId, + std::string_view apiKey, + std::string_view apiSecret, + std::function onSuccess, + std::function onFailure) + { + const std::string apiKeyStr{ apiKey }; + const std::string apiSecretStr{ apiSecret }; + + const std::map params{ + { "api_key", apiKeyStr }, + { "format", "json" }, + { "method", "auth.getToken" }, + }; + const std::string sig{ utils::computeApiSig(params, apiSecretStr) }; + + core::http::ClientGETRequestParameters request; + request.relativeUrl = "/2.0/?method=auth.getToken&api_key=" + apiKeyStr + "&api_sig=" + sig + "&format=json"; + request.onSuccessFunc = [this, userId, apiKeyStr, apiSecretStr, onSuccess = std::move(onSuccess), onFailure](const Wt::Http::Message& msg) { + const std::string token{ utils::parseAuthToken(msg.body()) }; + if (token.empty()) + { + LOG(WARNING, "auth.getToken: failed to parse token"); + onFailure(); + return; + } + + { + std::scoped_lock lock{ _pendingAuthsMutex }; + _pendingAuths[userId] = PendingAuth{ .apiKey = apiKeyStr, .apiSecret = apiSecretStr, .token = token }; + } + + const std::string authUrl{ _authBaseUrl + "/api/auth/?api_key=" + apiKeyStr + "&token=" + token }; + onSuccess(authUrl); + }; + request.onFailureFunc = [onFailure = std::move(onFailure)] { + LOG(WARNING, "auth.getToken: HTTP request failed"); + onFailure(); + }; + _client->sendGETRequest(std::move(request)); + } + + void LastFmBackend::continueLastFmLink(db::UserId userId, + std::function onSuccess, + std::function onFailure) + { + PendingAuth pending; + { + std::scoped_lock lock{ _pendingAuthsMutex }; + auto it{ _pendingAuths.find(userId) }; + if (it == _pendingAuths.end()) + { + LOG(WARNING, "continueLastFmLink: no pending auth for user"); + onFailure(); + return; + } + pending = it->second; + } + + const std::map params{ + { "api_key", pending.apiKey }, + { "format", "json" }, + { "method", "auth.getSession" }, + { "token", pending.token }, + }; + const std::string sig{ utils::computeApiSig(params, pending.apiSecret) }; + + core::http::ClientGETRequestParameters request; + request.relativeUrl = "/2.0/?method=auth.getSession&api_key=" + pending.apiKey + "&token=" + pending.token + "&api_sig=" + sig + "&format=json"; + request.onSuccessFunc = [this, userId, pending, onSuccess = std::move(onSuccess), onFailure](const Wt::Http::Message& msg) { + const std::string sessionKey{ utils::parseSessionKey(msg.body()) }; + if (sessionKey.empty()) + { + LOG(WARNING, "auth.getSession: failed to parse session key"); + onFailure(); + return; + } + + { + db::Session& session{ _db.getTLSSession() }; + auto transaction{ session.createWriteTransaction() }; + if (db::User::pointer user{ db::User::find(session, userId) }) + { + user.modify()->setLastFmApiKey(pending.apiKey); + user.modify()->setLastFmApiSecret(pending.apiSecret); + user.modify()->setLastFmSessionKey(sessionKey); + } + } + + { + std::scoped_lock lock{ _pendingAuthsMutex }; + _pendingAuths.erase(userId); + } + + LOG(INFO, "Last.fm account linked for user " << userId.toString()); + onSuccess(); + }; + request.onFailureFunc = [onFailure = std::move(onFailure)] { + LOG(WARNING, "auth.getSession: HTTP request failed"); + onFailure(); + }; + + _client->sendGETRequest(std::move(request)); + } +} // namespace lms::scrobbling::lastFm diff --git a/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.hpp b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.hpp new file mode 100644 index 00000000..ea4cfe49 --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.hpp @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2025 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 +#include +#include +#include +#include +#include + +#include + +#include "database/objects/UserId.hpp" + +#include "IScrobblingBackend.hpp" +#include "ScrobblingsSynchronizer.hpp" + +namespace lms::db +{ + class IDb; +} + +namespace lms::scrobbling::lastFm +{ + class LastFmBackend final : public IScrobblingBackend + { + public: + LastFmBackend(boost::asio::io_context& ioContext, db::IDb& db); + ~LastFmBackend() override; + + void initiateLastFmLink(db::UserId userId, + std::string_view apiKey, + std::string_view apiSecret, + std::function onSuccess, + std::function onFailure); + + void continueLastFmLink(db::UserId userId, + std::function onSuccess, + std::function onFailure); + + private: + LastFmBackend(const LastFmBackend&) = delete; + LastFmBackend& operator=(const LastFmBackend&) = delete; + + void listenStarted(const Listen& listen) override; + void listenFinished(const Listen& listen, std::optional playedDuration) override; + void addTimedListen(const TimedListen& listen) override; + + struct PendingAuth + { + std::string apiKey; + std::string apiSecret; + std::string token; + }; + + db::IDb& _db; + const std::string _authBaseUrl; + std::unique_ptr _client; + ScrobblingsSynchronizer _synchronizer; + + std::mutex _pendingAuthsMutex; + std::unordered_map _pendingAuths; + }; +} // namespace lms::scrobbling::lastFm diff --git a/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp new file mode 100644 index 00000000..e13d7060 --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp @@ -0,0 +1,322 @@ +/* + * Copyright (C) 2025 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 "ScrobblingsSynchronizer.hpp" + +#include +#include + +#include "core/IConfig.hpp" +#include "core/Service.hpp" +#include "core/http/IClient.hpp" +#include "database/IDb.hpp" +#include "database/Session.hpp" +#include "database/objects/Artist.hpp" +#include "database/objects/Listen.hpp" +#include "database/objects/Release.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/TrackArtistLink.hpp" +#include "database/objects/User.hpp" +#include "services/scrobbling/Exception.hpp" + +#include "Utils.hpp" + +namespace lms::scrobbling::lastFm +{ + namespace + { + constexpr std::size_t maxBatchSize{ 50 }; + + struct TrackInfo + { + std::string artistName; + std::string trackName; + std::optional albumName; + std::optional duration; + }; + + std::optional getTrackInfo(db::Session& session, const scrobbling::Listen& listen) + { + auto transaction{ session.createReadTransaction() }; + + const db::Track::pointer track{ db::Track::find(session, listen.trackId) }; + if (!track) + return std::nullopt; + + const std::string artistName{ track->getArtistDisplayName() }; + if (artistName.empty()) + { + LOG(DEBUG, "Track '" << track->getAbsoluteFilePath() << "' cannot be scrobbled: no artist name"); + return std::nullopt; + } + + TrackInfo info; + info.artistName = artistName; + info.trackName = track->getName(); + + if (const auto release{ track->getRelease() }) + info.albumName = release->getName(); + + const auto secs{ std::chrono::duration_cast(track->getDuration()) }; + if (secs.count() > 0) + info.duration = secs; + + return info; + } + + std::map buildScrobbleParams(const TrackInfo& info, const Wt::WDateTime& timePoint, std::size_t index) + { + const std::string indexStr{ "[" + std::to_string(index) + "]" }; + + std::map params; + params["method"] = "track.scrobble"; + params["artist" + indexStr] = info.artistName; + params["track" + indexStr] = info.trackName; + if (info.albumName) + params["album" + indexStr] = *info.albumName; + if (info.duration) + params["duration" + indexStr] = std::to_string(info.duration->count()); + params["timestamp" + indexStr] = std::to_string(timePoint.toTime_t()); + + return params; + } + + std::map buildNowPlayingParams(const TrackInfo& info) + { + std::map params; + params["method"] = "track.updateNowPlaying"; + params["artist"] = info.artistName; + params["track"] = info.trackName; + if (info.albumName) + params["album"] = *info.albumName; + if (info.duration) + params["duration"] = std::to_string(info.duration->count()); + + return params; + } + } // namespace + + ScrobblingsSynchronizer::ScrobblingsSynchronizer(boost::asio::io_context& ioContext, db::IDb& db, core::http::IClient& client) + : _ioContext{ ioContext } + , _db{ db } + , _submitPeriod{ core::Service::get()->getULong("lastfm-submit-period-hours", 1) } + , _client{ client } + { + LOG(INFO, "Starting Last.fm scrobblings synchronizer, submit period = " << _submitPeriod.count() << " hours"); + if (_submitPeriod.count() > 0) + scheduleSubmit(std::chrono::seconds{ 30 }); + } + + ScrobblingsSynchronizer::~ScrobblingsSynchronizer() = default; + + void ScrobblingsSynchronizer::enqueListen(const TimedListen& listen) + { + assert(listen.listenedAt.isValid()); + enqueListen(listen, listen.listenedAt); + } + + void ScrobblingsSynchronizer::enqueListenNow(const scrobbling::Listen& listen) + { + enqueListen(listen, {}); + } + + void ScrobblingsSynchronizer::enqueListen(const scrobbling::Listen& listen, const Wt::WDateTime& timePoint) + { + const utils::LastFmCredentials creds{ utils::getLastFmCredentials(_db.getTLSSession(), listen.userId) }; + if (creds.apiKey.empty() || creds.apiSecret.empty() || creds.sessionKey.empty()) + { + LOG(DEBUG, "Missing Last.fm credentials for user, skipping"); + return; + } + + const std::optional info{ getTrackInfo(_db.getTLSSession(), listen) }; + if (!info) + { + LOG(DEBUG, "Cannot build scrobble params: skipping"); + return; + } + + std::map params{ timePoint.isValid() ? buildScrobbleParams(*info, timePoint, 0) : buildNowPlayingParams(*info) }; + + params.emplace("api_key", creds.apiKey); + params.emplace("sk", creds.sessionKey); + params.emplace("format", "json"); + params["api_sig"] = utils::computeApiSig(params, creds.apiSecret); + + core::http::ClientPOSTRequestParameters request; + request.relativeUrl = "/2.0/"; + + if (timePoint.isValid()) + { + const TimedListen timedListen{ listen, timePoint }; + saveListen(timedListen, db::SyncState::PendingAdd); + + request.priority = core::http::ClientRequestParameters::Priority::Normal; + request.onSuccessFunc = [this, timedListen](const Wt::Http::Message&) { + boost::asio::post(boost::asio::bind_executor(_strand, [this, timedListen] { + saveListen(timedListen, db::SyncState::Synchronized); + })); + }; + } + else + { + request.priority = core::http::ClientRequestParameters::Priority::High; + // "now playing" is fire-and-forget, no retry + } + + request.message.addBodyText(utils::buildFormBody(params)); + request.message.addHeader("Content-Type", "application/x-www-form-urlencoded"); + _client.sendPOSTRequest(std::move(request)); + } + + bool ScrobblingsSynchronizer::saveListen(const TimedListen& listen, db::SyncState syncState) + { + db::Session& session{ _db.getTLSSession() }; + auto transaction{ session.createWriteTransaction() }; + + db::Listen::pointer dbListen{ db::Listen::find(session, listen.userId, listen.trackId, db::ScrobblingBackend::LastFm, listen.listenedAt) }; + if (!dbListen) + { + const db::User::pointer user{ db::User::find(session, listen.userId) }; + if (!user) + return false; + + const db::Track::pointer track{ db::Track::find(session, listen.trackId) }; + if (!track) + return false; + + dbListen = session.create(user, track, db::ScrobblingBackend::LastFm, listen.listenedAt); + dbListen.modify()->setSyncState(syncState); + return true; + } + + if (dbListen->getSyncState() == syncState) + return false; + + dbListen.modify()->setSyncState(syncState); + return true; + } + + void ScrobblingsSynchronizer::enquePendingListens() + { + std::map> pendingByUser; + + { + db::Session& session{ _db.getTLSSession() }; + auto transaction{ session.createReadTransaction() }; + + db::Listen::FindParameters params; + params.setScrobblingBackend(db::ScrobblingBackend::LastFm) + .setSyncState(db::SyncState::PendingAdd) + .setRange(db::Range{ 0, maxBatchSize * 10 }); + + const db::RangeResults results{ db::Listen::find(session, params) }; + for (const db::ListenId listenId : results.results) + { + const db::Listen::pointer dbListen{ db::Listen::find(session, listenId) }; + + TimedListen tl; + tl.listenedAt = dbListen->getDateTime(); + tl.userId = dbListen->getUser()->getId(); + tl.trackId = dbListen->getTrack()->getId(); + pendingByUser[tl.userId].push_back(tl); + } + } + + for (auto& [userId, listens] : pendingByUser) + { + const utils::LastFmCredentials creds{ utils::getLastFmCredentials(_db.getTLSSession(), userId) }; + if (creds.apiKey.empty() || creds.apiSecret.empty() || creds.sessionKey.empty()) + { + LOG(DEBUG, "Missing Last.fm credentials for user, skipping"); + continue; + } + + for (std::span remaining{ listens }; !remaining.empty();) + { + const std::size_t count{ std::min(maxBatchSize, remaining.size()) }; + sendScrobbleBatch(creds, remaining.first(count)); + remaining = remaining.subspan(count); + } + } + } + + void ScrobblingsSynchronizer::sendScrobbleBatch(const utils::LastFmCredentials& creds, std::span listens) + { + std::map params; + params["method"] = "track.scrobble"; + + std::vector validListens; + db::Session& session{ _db.getTLSSession() }; + + for (const TimedListen& listen : listens) + { + const std::optional info{ getTrackInfo(session, listen) }; + if (!info) + continue; + + auto trackParams{ buildScrobbleParams(*info, listen.listenedAt, validListens.size()) }; + trackParams.erase("method"); + params.merge(std::move(trackParams)); + validListens.push_back(listen); + } + + if (validListens.empty()) + return; + + LOG(DEBUG, "Sending scrobble batch of " << validListens.size() << " listens"); + + params["api_key"] = creds.apiKey; + params["sk"] = creds.sessionKey; + params["format"] = "json"; + params["api_sig"] = utils::computeApiSig(params, creds.apiSecret); + + core::http::ClientPOSTRequestParameters request; + request.relativeUrl = "/2.0/"; + request.priority = core::http::ClientRequestParameters::Priority::Normal; + request.message.addBodyText(utils::buildFormBody(params)); + request.message.addHeader("Content-Type", "application/x-www-form-urlencoded"); + request.onSuccessFunc = [this, validListens](const Wt::Http::Message&) { + boost::asio::post(boost::asio::bind_executor(_strand, [this, validListens] { + for (const TimedListen& listen : validListens) + saveListen(listen, db::SyncState::Synchronized); + })); + }; + + _client.sendPOSTRequest(std::move(request)); + } + + void ScrobblingsSynchronizer::scheduleSubmit(std::chrono::seconds fromNow) + { + LOG(DEBUG, "Scheduled pending retry in " << fromNow.count() << " seconds"); + _submitTimer.expires_after(fromNow); + _submitTimer.async_wait(boost::asio::bind_executor(_strand, [this](const boost::system::error_code& ec) { + if (ec == boost::asio::error::operation_aborted) + return; + if (ec) + throw Exception{ "Last.fm retry timer failure: " + std::string{ ec.message() } }; + + if (_submitPeriod.count() > 0) + { + enquePendingListens(); + scheduleSubmit(_submitPeriod); + } + })); + } +} // namespace lms::scrobbling::lastFm diff --git a/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.hpp b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.hpp new file mode 100644 index 00000000..69de993c --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.hpp @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2025 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 +#include +#include + +#include + +#include "database/objects/Types.hpp" + +#include "services/scrobbling/Listen.hpp" + +#include "Utils.hpp" + +namespace lms +{ + namespace core::http + { + class IClient; + } + namespace db + { + class IDb; + } +} // namespace lms + +namespace lms::scrobbling::lastFm +{ + class ScrobblingsSynchronizer + { + public: + ScrobblingsSynchronizer(boost::asio::io_context& ioContext, db::IDb& db, core::http::IClient& client); + ~ScrobblingsSynchronizer(); + + ScrobblingsSynchronizer(const ScrobblingsSynchronizer&) = delete; + ScrobblingsSynchronizer& operator=(const ScrobblingsSynchronizer&) = delete; + + void enqueListen(const TimedListen& listen); + void enqueListenNow(const Listen& listen); + + private: + void enqueListen(const Listen& listen, const Wt::WDateTime& timePoint); + bool saveListen(const TimedListen& listen, db::SyncState syncState); + + void enquePendingListens(); + void sendScrobbleBatch(const utils::LastFmCredentials& creds, std::span listens); + void scheduleSubmit(std::chrono::seconds fromNow); + + boost::asio::io_context& _ioContext; + boost::asio::io_context::strand _strand{ _ioContext }; + db::IDb& _db; + std::chrono::hours _submitPeriod; + boost::asio::steady_timer _submitTimer{ _ioContext }; + core::http::IClient& _client; + }; +} // namespace lms::scrobbling::lastFm diff --git a/src/libs/services/scrobbling/impl/lastfm/Utils.cpp b/src/libs/services/scrobbling/impl/lastfm/Utils.cpp new file mode 100644 index 00000000..746e7bb6 --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/Utils.cpp @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2025 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 "Utils.hpp" + +#include +#include + +#include +#include + +#include "core/Md5.hpp" +#include "core/String.hpp" +#include "database/Session.hpp" +#include "database/objects/User.hpp" + +namespace lms::scrobbling::lastFm::utils +{ + LastFmCredentials getLastFmCredentials(db::Session& session, db::UserId userId) + { + LastFmCredentials creds; + + auto transaction{ session.createReadTransaction() }; + if (const db::User::pointer user{ db::User::find(session, userId) }) + { + creds.apiKey = user->getLastFmApiKey(); + creds.apiSecret = user->getLastFmApiSecret(); + creds.sessionKey = user->getLastFmSessionKey(); + } + + return creds; + } + + std::string computeApiSig(const std::map& params, std::string_view secret) + { + std::string payload; + for (const auto& [key, value] : params) + { + if (key == "format" || key == "callback") + continue; + payload += key; + payload += value; + } + payload += secret; + + const auto digest{ core::md5(payload) }; + + std::ostringstream oss; + oss << std::hex << std::setfill('0'); + for (const std::byte b : digest) + oss << std::setw(2) << static_cast(b); + + return oss.str(); + } + + std::string buildFormBody(const std::map& params) + { + std::string body; + bool first{ true }; + + for (const auto& [key, value] : params) + { + if (!first) + body += '&'; + first = false; + body += core::stringUtils::urlEncode(key); + body += '='; + body += core::stringUtils::urlEncode(value); + } + + return body; + } + + std::string parseAuthToken(std::string_view msgBody) + { + Wt::Json::ParseError error; + Wt::Json::Object root; + if (!Wt::Json::parse(std::string{ msgBody }, root, error)) + { + LOG(ERROR, "Cannot parse auth.getToken response: " << error.what()); + return {}; + } + + return static_cast(root.get("token").orIfNull("")); + } + + std::string parseSessionKey(std::string_view msgBody) + { + Wt::Json::ParseError error; + Wt::Json::Object root; + if (!Wt::Json::parse(std::string{ msgBody }, root, error)) + { + LOG(ERROR, "Cannot parse auth.getSession response: " << error.what()); + return {}; + } + + try + { + const Wt::Json::Object& session{ static_cast(root.get("session")) }; + return static_cast(session.get("key").orIfNull("")); + } + catch (const Wt::WException& e) + { + LOG(ERROR, "Cannot extract session key: " << e.what()); + return {}; + } + } +} // namespace lms::scrobbling::lastFm::utils diff --git a/src/libs/services/scrobbling/impl/lastfm/Utils.hpp b/src/libs/services/scrobbling/impl/lastfm/Utils.hpp new file mode 100644 index 00000000..29eeca7d --- /dev/null +++ b/src/libs/services/scrobbling/impl/lastfm/Utils.hpp @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2025 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 +#include + +#include "core/ILogger.hpp" + +#include "database/objects/UserId.hpp" + +#define LOG(sev, message) LMS_LOG(SCROBBLING, sev, "[lastfm] " << message) + +namespace lms::db +{ + class Session; +} + +namespace lms::scrobbling::lastFm::utils +{ + struct LastFmCredentials + { + std::string apiKey; + std::string apiSecret; + std::string sessionKey; + }; + + LastFmCredentials getLastFmCredentials(db::Session& session, db::UserId userId); + + std::string computeApiSig(const std::map& params, std::string_view secret); + std::string buildFormBody(const std::map& params); + std::string parseAuthToken(std::string_view msgBody); + std::string parseSessionKey(std::string_view msgBody); +} // namespace lms::scrobbling::lastFm::utils diff --git a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp index 94a5f72b..f7af0d49 100644 --- a/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp +++ b/src/libs/services/scrobbling/include/services/scrobbling/IScrobblingService.hpp @@ -20,8 +20,10 @@ #pragma once #include +#include #include #include +#include #include #include @@ -142,6 +144,18 @@ namespace lms::scrobbling virtual ArtistContainer getTopArtists(const ArtistFindParameters& params) = 0; virtual ReleaseContainer getTopReleases(const FindParameters& params) = 0; virtual TrackContainer getTopTracks(const FindParameters& params) = 0; + + virtual void initiateLastFmLink(db::UserId userId, + std::string_view apiKey, + std::string_view apiSecret, + std::function onSuccess, + std::function onFailure) + = 0; + + virtual void continueLastFmLink(db::UserId userId, + std::function onSuccess, + std::function onFailure) + = 0; }; std::unique_ptr createScrobblingService(boost::asio::io_context& ioContext, db::IDb& db); diff --git a/src/libs/services/scrobbling/test/CMakeLists.txt b/src/libs/services/scrobbling/test/CMakeLists.txt index 3ba0023c..c701d79c 100644 --- a/src/libs/services/scrobbling/test/CMakeLists.txt +++ b/src/libs/services/scrobbling/test/CMakeLists.txt @@ -1,5 +1,6 @@ add_executable(test-scrobbling + LastFmUtils.cpp Listenbrainz.cpp Scrobbling.cpp ) diff --git a/src/libs/services/scrobbling/test/LastFmUtils.cpp b/src/libs/services/scrobbling/test/LastFmUtils.cpp new file mode 100644 index 00000000..98e51e7b --- /dev/null +++ b/src/libs/services/scrobbling/test/LastFmUtils.cpp @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2025 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 + +#include "lastfm/Utils.hpp" + +namespace lms::scrobbling::lastFm::utils::tests +{ + TEST(LastFmUtils, computeApiSig_empty_params) + { + // empty params: payload = secret only + EXPECT_EQ(computeApiSig({}, "mysecret"), "06c219e5bc8378f3a8a3f83b4b7e4649"); + } + + TEST(LastFmUtils, computeApiSig_basic) + { + const std::map params{ { "api_key", "testkey" } }; + // payload = "api_keytestkeymysecret" + EXPECT_EQ(computeApiSig(params, "mysecret"), "20e219ce486aa95fc1e3a72c09f1587c"); + } + + TEST(LastFmUtils, computeApiSig_format_excluded) + { + const std::map params{ + { "api_key", "testkey" }, + { "format", "json" }, + }; + // "format" is excluded, same result as without it + EXPECT_EQ(computeApiSig(params, "mysecret"), "20e219ce486aa95fc1e3a72c09f1587c"); + } + + TEST(LastFmUtils, computeApiSig_callback_excluded) + { + const std::map params{ + { "api_key", "testkey" }, + { "callback", "fn" }, + { "format", "json" }, + }; + // both "callback" and "format" excluded, same result + EXPECT_EQ(computeApiSig(params, "mysecret"), "20e219ce486aa95fc1e3a72c09f1587c"); + } + + TEST(LastFmUtils, computeApiSig_params_sorted_by_key) + { + const std::map params{ + { "api_key", "testkey" }, + { "method", "track.love" }, + { "track", "song title" }, + }; + // payload = "api_keytestkey" + "methodtrack.love" + "tracksong title" + "secret" + EXPECT_EQ(computeApiSig(params, "secret"), "6c6f4099790ab9e72d59fdd0632a8a81"); + } + + TEST(LastFmUtils, buildFormBody_empty) + { + EXPECT_EQ(buildFormBody({}), ""); + } + + TEST(LastFmUtils, buildFormBody_single_param) + { + const std::map params{ { "key", "value" } }; + EXPECT_EQ(buildFormBody(params), "key=value"); + } + + TEST(LastFmUtils, buildFormBody_multiple_params_sorted) + { + const std::map params{ + { "a", "1" }, + { "b", "2" }, + }; + EXPECT_EQ(buildFormBody(params), "a=1&b=2"); + } + + TEST(LastFmUtils, buildFormBody_encodes_space) + { + const std::map params{ { "track", "hello world" } }; + EXPECT_EQ(buildFormBody(params), "track=hello%20world"); + } + + TEST(LastFmUtils, buildFormBody_encodes_special_chars) + { + const std::map params{ { "q", "foo=bar&baz" } }; + EXPECT_EQ(buildFormBody(params), "q=foo%3Dbar%26baz"); + } + + TEST(LastFmUtils, parseAuthToken_valid) + { + EXPECT_EQ(parseAuthToken(R"({"token":"abc123"})"), "abc123"); + } + + TEST(LastFmUtils, parseAuthToken_empty_body) + { + EXPECT_EQ(parseAuthToken(""), ""); + } + + TEST(LastFmUtils, parseAuthToken_invalid_json) + { + EXPECT_EQ(parseAuthToken("not json"), ""); + } + + TEST(LastFmUtils, parseAuthToken_missing_key) + { + EXPECT_EQ(parseAuthToken(R"({"other":"value"})"), ""); + } + + TEST(LastFmUtils, parseSessionKey_valid) + { + EXPECT_EQ(parseSessionKey(R"({"session":{"key":"xyz789","name":"user"}})"), "xyz789"); + } + + TEST(LastFmUtils, parseSessionKey_empty_body) + { + EXPECT_EQ(parseSessionKey(""), ""); + } + + TEST(LastFmUtils, parseSessionKey_invalid_json) + { + EXPECT_EQ(parseSessionKey("not json"), ""); + } + + TEST(LastFmUtils, parseSessionKey_missing_session) + { + EXPECT_EQ(parseSessionKey(R"({"other":"value"})"), ""); + } + + TEST(LastFmUtils, parseSessionKey_missing_key_in_session) + { + EXPECT_EQ(parseSessionKey(R"({"session":{"name":"user"}})"), ""); + } +} // namespace lms::scrobbling::lastFm::utils::tests diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 58790df4..36a27d66 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -562,9 +562,14 @@ namespace lms::ui } } - void LmsApplication::post(std::function func) + void LmsApplication::post(const std::string& sessionId, const std::function& func) { - Wt::WServer::instance()->post(LmsApp->sessionId(), std::move(func)); + Wt::WServer::instance()->post(sessionId, func); + } + + void LmsApplication::post(const std::function& func) + { + post(sessionId(), func); } void LmsApplication::setTitle(const Wt::WString& title) diff --git a/src/lms/ui/LmsApplication.hpp b/src/lms/ui/LmsApplication.hpp index c54646c4..3294498c 100644 --- a/src/lms/ui/LmsApplication.hpp +++ b/src/lms/ui/LmsApplication.hpp @@ -78,7 +78,8 @@ namespace lms::ui AuthenticationBackend getAuthBackend() const { return _authBackend; } // Utils - void post(std::function func); + static void post(const std::string& sessionId, const std::function& func); + void post(const std::function& func); void setTitle(const Wt::WString& title = ""); // Used to classify the message sent to the user diff --git a/src/lms/ui/settings/ServicesSettingsView.cpp b/src/lms/ui/settings/ServicesSettingsView.cpp index 8fdd2f51..4fc043a0 100644 --- a/src/lms/ui/settings/ServicesSettingsView.cpp +++ b/src/lms/ui/settings/ServicesSettingsView.cpp @@ -19,17 +19,27 @@ #include "ServicesSettingsView.hpp" +#include +#include + +#include #include +#include #include #include #include #include +#include #include +#include +#include "core/Service.hpp" #include "database/Session.hpp" #include "database/objects/User.hpp" +#include "services/scrobbling/IScrobblingService.hpp" #include "LmsApplication.hpp" +#include "ModalManager.hpp" #include "common/MandatoryValidator.hpp" #include "common/ValueStringModel.hpp" @@ -58,6 +68,7 @@ namespace lms::ui _scrobblingBackendModel = std::make_shared(); _scrobblingBackendModel->add(Wt::WString::tr("Lms.Settings.backend.internal"), db::ScrobblingBackend::Internal); _scrobblingBackendModel->add(Wt::WString::tr("Lms.Settings.backend.listenbrainz"), db::ScrobblingBackend::ListenBrainz); + _scrobblingBackendModel->add(Wt::WString::tr("Lms.Settings.backend.lastfm"), db::ScrobblingBackend::LastFm); addField(FeedbackBackendField); addField(ScrobblingBackendField); @@ -76,11 +87,11 @@ namespace lms::ui auto transaction{ LmsApp->getDbSession().createWriteTransaction() }; db::User::pointer user{ LmsApp->getUser() }; - if (auto feedbackBackendRow{ _feedbackBackendModel->getRowFromString(valueText(FeedbackBackendField)) }) - user.modify()->setFeedbackBackend(_feedbackBackendModel->getValue(*feedbackBackendRow)); + if (auto row{ _feedbackBackendModel->getRowFromString(valueText(FeedbackBackendField)) }) + user.modify()->setFeedbackBackend(_feedbackBackendModel->getValue(*row)); - if (auto scrobblingBackendRow{ _scrobblingBackendModel->getRowFromString(valueText(ScrobblingBackendField)) }) - user.modify()->setScrobblingBackend(_scrobblingBackendModel->getValue(*scrobblingBackendRow)); + if (auto row{ _scrobblingBackendModel->getRowFromString(valueText(ScrobblingBackendField)) }) + user.modify()->setScrobblingBackend(_scrobblingBackendModel->getValue(*row)); user.modify()->setListenBrainzToken(Wt::asString(value(ListenBrainzTokenField)).toUTF8()); } @@ -90,20 +101,23 @@ namespace lms::ui auto transaction{ LmsApp->getDbSession().createReadTransaction() }; const db::User::pointer user{ LmsApp->getUser() }; - if (auto feedbackBackendRow{ _feedbackBackendModel->getRowFromValue(user->getFeedbackBackend()) }) - setValue(FeedbackBackendField, _feedbackBackendModel->getString(*feedbackBackendRow)); + if (auto row{ _feedbackBackendModel->getRowFromValue(user->getFeedbackBackend()) }) + setValue(FeedbackBackendField, _feedbackBackendModel->getString(*row)); - if (auto scrobblingBackendRow{ _scrobblingBackendModel->getRowFromValue(user->getScrobblingBackend()) }) - setValue(ScrobblingBackendField, _scrobblingBackendModel->getString(*scrobblingBackendRow)); + if (auto row{ _scrobblingBackendModel->getRowFromValue(user->getScrobblingBackend()) }) + setValue(ScrobblingBackendField, _scrobblingBackendModel->getString(*row)); - if (const auto listenBrainzToken{ user->getListenBrainzToken() }; !listenBrainzToken.empty()) - setValue(ListenBrainzTokenField, Wt::WString::fromUTF8(std::string{ listenBrainzToken })); + if (const auto token{ user->getListenBrainzToken() }; !token.empty()) + setValue(ListenBrainzTokenField, Wt::WString::fromUTF8(std::string{ token })); - { - const bool usesListenBrainz{ user->getScrobblingBackend() == db::ScrobblingBackend::ListenBrainz || user->getFeedbackBackend() == db::FeedbackBackend::ListenBrainz }; - setReadOnly(ServicesSettingsModel::ListenBrainzTokenField, !usesListenBrainz); - validator(ServicesSettingsModel::ListenBrainzTokenField)->setMandatory(usesListenBrainz); - } + updateFieldStates(user->getScrobblingBackend(), user->getFeedbackBackend()); + } + + void updateFieldStates(db::ScrobblingBackend scrobblingBackend, db::FeedbackBackend feedbackBackend) + { + const bool usesListenBrainz{ scrobblingBackend == db::ScrobblingBackend::ListenBrainz || feedbackBackend == db::FeedbackBackend::ListenBrainz }; + setReadOnly(ListenBrainzTokenField, !usesListenBrainz); + validator(ListenBrainzTokenField)->setMandatory(usesListenBrainz); } private: @@ -127,7 +141,12 @@ namespace lms::ui return; clear(); + refreshFormSection(); + refreshLastFmCardSection(); + } + void ServicesSettingsView::refreshFormSection() + { auto* t{ addNew(Wt::WString::tr("Lms.Settings.services.template")) }; auto model{ std::make_shared() }; @@ -147,30 +166,179 @@ namespace lms::ui t->setFormWidget(ServicesSettingsModel::ScrobblingBackendField, std::move(scrobblingBackend)); } - auto listenbrainzToken{ std::make_unique() }; - Wt::WLineEdit* listenbrainzTokenPtr{ listenbrainzToken.get() }; - listenbrainzTokenPtr->setEchoMode(Wt::EchoMode::Password); - t->setFormWidget(ServicesSettingsModel::ListenBrainzTokenField, std::move(listenbrainzToken)); + { + auto tokenEdit{ std::make_unique() }; + Wt::WLineEdit* tokenPtr{ tokenEdit.get() }; + tokenPtr->setEchoMode(Wt::EchoMode::Password); + t->setFormWidget(ServicesSettingsModel::ListenBrainzTokenField, std::move(tokenEdit)); - auto listenbrainzTokenVisibilityBtn{ std::make_unique(Wt::WString::tr("Lms.template.toggle-visibility-btn"), Wt::TextFormat::XHTML) }; - listenbrainzTokenVisibilityBtn->clicked().connect(this, [listenbrainzTokenPtr] { - listenbrainzTokenPtr->setEchoMode(listenbrainzTokenPtr->echoMode() == Wt::EchoMode::Password ? Wt::EchoMode::Normal : Wt::EchoMode::Password); - }); - t->bindWidget("listenbrainz-token-visibility-btn", std::move(listenbrainzTokenVisibilityBtn)); + auto visBtn{ std::make_unique(Wt::WString::tr("Lms.template.toggle-visibility-btn"), Wt::TextFormat::XHTML) }; + visBtn->clicked().connect(this, [tokenPtr] { + tokenPtr->setEchoMode(tokenPtr->echoMode() == Wt::EchoMode::Password ? Wt::EchoMode::Normal : Wt::EchoMode::Password); + }); + t->bindWidget("listenbrainz-token-visibility-btn", std::move(visBtn)); + } - auto updateListenBrainzTokenField{ [=] { - const bool enable{ model->getFeedbackBackendModel()->getValue(feedbackBackendRaw->currentIndex()) == db::FeedbackBackend::ListenBrainz - || model->getScrobblingBackendModel()->getValue(scrobblingBackendRaw->currentIndex()) == db::ScrobblingBackend::ListenBrainz }; - model->setReadOnly(ServicesSettingsModel::ListenBrainzTokenField, !enable); - model->validator(ServicesSettingsModel::ListenBrainzTokenField)->setMandatory(enable); + auto updateFieldStates{ [=] { + const db::ScrobblingBackend scrobBackend{ model->getScrobblingBackendModel()->getValue(scrobblingBackendRaw->currentIndex()) }; + const db::FeedbackBackend feedBackend{ model->getFeedbackBackendModel()->getValue(feedbackBackendRaw->currentIndex()) }; + model->updateFieldStates(scrobBackend, feedBackend); t->updateModel(model.get()); t->updateView(model.get()); } }; - feedbackBackendRaw->activated().connect([=] { updateListenBrainzTokenField(); }); - scrobblingBackendRaw->activated().connect([=] { updateListenBrainzTokenField(); }); + feedbackBackendRaw->activated().connect([=] { updateFieldStates(); }); + scrobblingBackendRaw->activated().connect([=] { updateFieldStates(); }); - utils::bindSaveDiscardButtons(t, model.get(), [model] { model->saveData(); }, [model] { model->loadData(); }); + utils::bindSaveDiscardButtons(t, model.get(), [model, this] { model->saveData(); refreshView(); }, [model] { model->loadData(); }); t->updateView(model.get()); } + + void ServicesSettingsView::refreshLastFmCardSection() + { + auto* lastFmCard{ addNew(Wt::WString::tr("Lms.Settings.services.lastfm.template.card")) }; + lastFmCard->addFunction("tr", &Wt::WTemplate::Functions::tr); + + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + lastFmCard->setHidden(LmsApp->getUser()->getScrobblingBackend() != db::ScrobblingBackend::LastFm); + } + + auto* cardContent{ lastFmCard->bindNew("card-content") }; + cardContent->addStyleClass("d-flex align-items-center gap-2"); + + const bool linked{ [&] { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + return !LmsApp->getUser()->getLastFmSessionKey().empty(); + }() }; + + if (linked) + { + lastFmCard->bindNew("card-header-badge", "" + Wt::WString::tr("Lms.Settings.services.lastfm-linked").toUTF8() + "", Wt::TextFormat::UnsafeXHTML); + auto* unlinkBtn{ cardContent->addNew(Wt::WString::tr("Lms.Settings.services.lastfm-unlink")) }; + unlinkBtn->addStyleClass("btn btn-secondary"); + unlinkBtn->clicked().connect(this, [this] { + auto modal{ std::make_unique(Wt::WString::tr("Lms.Settings.services.lastfm.template.unlink-confirm")) }; + modal->addFunction("tr", &Wt::WTemplate::Functions::tr); + Wt::WTemplate* modalPtr{ modal.get() }; + modal->bindNew("confirm-btn", Wt::WString::tr("Lms.Settings.services.lastfm-unlink")) + ->clicked() + .connect(this, [this, modalPtr] { + { + auto transaction{ LmsApp->getDbSession().createWriteTransaction() }; + LmsApp->getUser().modify()->setLastFmSessionKey(""); + } + LmsApp->getModalManager().dispose(modalPtr); + refreshView(); + }); + modal->bindNew("cancel-btn", Wt::WString::tr("Lms.cancel")) + ->clicked() + .connect([modalPtr] { LmsApp->getModalManager().dispose(modalPtr); }); + LmsApp->getModalManager().show(std::move(modal)); + }); + } + else + { + lastFmCard->bindNew("card-header-badge"); + auto* linkBtn{ cardContent->addNew(Wt::WString::tr("Lms.Settings.services.lastfm-link")) }; + linkBtn->addStyleClass("btn btn-secondary"); + linkBtn->clicked().connect(this, [this] { showLastFmLinkModal(); }); + } + } + + void ServicesSettingsView::showLastFmLinkModal() + { + auto modal{ std::make_unique(Wt::WString::tr("Lms.Settings.services.lastfm.template.link-modal")) }; + modal->addFunction("tr", &Wt::WTemplate::Functions::tr); + Wt::WTemplate* modalPtr{ modal.get() }; + + auto* apiKeyEdit{ modal->bindNew("api-key") }; + auto* apiSecretEdit{ modal->bindNew("api-secret") }; + apiSecretEdit->setEchoMode(Wt::EchoMode::Password); + + // pre-fill from DB if credentials already exist + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + const db::User::pointer user{ LmsApp->getUser() }; + if (const auto key{ user->getLastFmApiKey() }; !key.empty()) + apiKeyEdit->setValueText(Wt::WString::fromUTF8(std::string{ key })); + if (const auto secret{ user->getLastFmApiSecret() }; !secret.empty()) + apiSecretEdit->setValueText(Wt::WString::fromUTF8(std::string{ secret })); + } + + auto* visBtn{ modal->bindNew("api-secret-visibility-btn", Wt::WString::tr("Lms.template.toggle-visibility-btn"), Wt::TextFormat::XHTML) }; + visBtn->clicked().connect([apiSecretEdit] { + apiSecretEdit->setEchoMode(apiSecretEdit->echoMode() == Wt::EchoMode::Password ? Wt::EchoMode::Normal : Wt::EchoMode::Password); + }); + + auto* authAnchorContainer{ modal->bindNew("auth-anchor-container") }; + authAnchorContainer->hide(); + + auto* authorizeBtn{ modal->bindNew("authorize-btn", Wt::WString::tr("Lms.Settings.services.lastfm-authorize")) }; + auto* doneBtn{ modal->bindNew("done-btn", Wt::WString::tr("Lms.Settings.services.lastfm-done")) }; + doneBtn->hide(); + + auto* cancelBtn{ modal->bindNew("cancel-btn", Wt::WString::tr("Lms.cancel")) }; + cancelBtn->clicked().connect([modalPtr] { + LmsApp->getModalManager().dispose(modalPtr); + }); + + authorizeBtn->clicked().connect([=] { + const std::string apiKey{ apiKeyEdit->valueText().toUTF8() }; + const std::string apiSecret{ apiSecretEdit->valueText().toUTF8() }; + + if (apiKey.empty() || apiSecret.empty()) + { + LmsApp->notifyMsg(Notification::Type::Warning, Wt::WString::tr("Lms.Settings.services.lastfm-missing-credentials")); + return; + } + + const std::string sessionId{ wApp->sessionId() }; + const db::UserId userId{ LmsApp->getUserId() }; + + core::Service::get()->initiateLastFmLink( + userId, apiKey, apiSecret, + [sessionId, authAnchorContainer, authorizeBtn, doneBtn](std::string_view authUrl) { + LmsApplication::post(sessionId, [=, url = std::string{ authUrl }] { + wApp->doJavaScript("window.open('" + url + "', '_blank');"); + Wt::WLink link{ url }; + link.setTarget(Wt::LinkTarget::NewWindow); + authAnchorContainer->addNew(link, Wt::WString::tr("Lms.Settings.services.lastfm-auth-url")); + authAnchorContainer->show(); + authorizeBtn->hide(); + doneBtn->show(); + wApp->triggerUpdate(); + }); + }, + [sessionId] { + LmsApplication::post(sessionId, [] { + LmsApp->notifyMsg(Notification::Type::Warning, Wt::WString::tr("Lms.Settings.services.lastfm-auth-error")); + wApp->triggerUpdate(); + }); + }); + }); + + doneBtn->clicked().connect([=, this] { + const std::string sessionId{ wApp->sessionId() }; + const db::UserId userId{ LmsApp->getUserId() }; + + core::Service::get()->continueLastFmLink( + userId, + [sessionId, modalPtr, this] { + LmsApplication::post(sessionId, [sessionId, modalPtr, this] { + LmsApp->getModalManager().dispose(modalPtr); + refreshView(); + wApp->triggerUpdate(); + }); + }, + [sessionId] { + LmsApplication::post(sessionId, [] { + LmsApp->notifyMsg(Notification::Type::Warning, Wt::WString::tr("Lms.Settings.services.lastfm-auth-error")); + wApp->triggerUpdate(); + }); + }); + }); + + LmsApp->getModalManager().show(std::move(modal)); + } } // namespace lms::ui diff --git a/src/lms/ui/settings/ServicesSettingsView.hpp b/src/lms/ui/settings/ServicesSettingsView.hpp index 51e00503..b39e9e71 100644 --- a/src/lms/ui/settings/ServicesSettingsView.hpp +++ b/src/lms/ui/settings/ServicesSettingsView.hpp @@ -30,5 +30,8 @@ namespace lms::ui private: void refreshView(); + void refreshFormSection(); + void refreshLastFmCardSection(); + void showLastFmLinkModal(); }; } // namespace lms::ui From 9bbe5f53b5bf290ee3b4be3bae3d9516498d8e46 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 9 Jun 2026 22:59:34 +0200 Subject: [PATCH 05/38] Bumped version to v3.78.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2703d876..48432336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.12) -project(lms VERSION 3.76.0) +project(lms VERSION 3.78.0) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules/) From 1d75add3d86e7d969105bb44632f3d7cc0c233f0 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 9 Jun 2026 23:00:53 +0200 Subject: [PATCH 06/38] Added missing extension in documentation --- SUBSONIC.md | 1 + 1 file changed, 1 insertion(+) diff --git a/SUBSONIC.md b/SUBSONIC.md index 65f8b8ed..7fd8007f 100644 --- a/SUBSONIC.md +++ b/SUBSONIC.md @@ -75,6 +75,7 @@ The following extra fields are implemented: * [getPodcastEpisode](https://opensubsonic.netlify.app/docs/extensions/getpodcastepisode/) * [HTTP form POST](https://opensubsonic.netlify.app/docs/extensions/formpost/) * [Index based Queue](https://opensubsonic.netlify.app/docs/extensions/indexbasedqueue/) +* [Sonic similarity](https://opensubsonic.netlify.app/docs/extensions/sonicsimilarity/) * [Transcode offset](https://opensubsonic.netlify.app/docs/extensions/transcodeoffset/) * [Song Lyrics](https://opensubsonic.netlify.app/docs/extensions/songlyrics/) * [Transcoding](https://opensubsonic.netlify.app/docs/extensions/transcoding/) From a826a70c688e051794217b07f61e5311c6c8926a Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 10 Jun 2026 18:38:05 +0200 Subject: [PATCH 07/38] Added distance to previous in the recommendation outputs --- .../AudioSimilarityEngine.impl.hpp | 69 ++++++++++--------- .../impl/clusters/ClustersEngine.cpp | 10 +-- .../include/services/recommendation/Types.hpp | 3 +- src/libs/subsonic/impl/endpoints/Browsing.cpp | 4 +- .../recommendation/LmsRecommendation.cpp | 14 ++-- 5 files changed, 54 insertions(+), 46 deletions(-) diff --git a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp index 80960b9f..92a28801 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp +++ b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp @@ -64,21 +64,27 @@ namespace lms::recommendation { namespace detail { + struct TrackNeighbor + { + db::TrackId id; + float distance{}; + }; + template - TrackResults findNearestNeighbors( + std::vector findNearestNeighbors( const ReducedVector& queryVector, // expected to be normalized const std::unordered_map& trackVectors, std::size_t maxNeighbors, - db::TrackId excludeTrackId) + std::span excludeTrackIds) { const math::NormalizedCosineDistance distFunc{ queryVector }; - TrackResults neighbors; + std::vector neighbors; neighbors.reserve(trackVectors.size()); for (const auto& [trackId, trackVector] : trackVectors) { - if (trackId == excludeTrackId) + if (std::find(std::cbegin(excludeTrackIds), std::cend(excludeTrackIds), trackId) != std::cend(excludeTrackIds)) continue; neighbors.push_back({ .id = trackId, .distance = distFunc(*trackVector) }); @@ -186,27 +192,10 @@ namespace lms::recommendation return res; const ReducedVector& queryVector{ *medoidCalculator.finalize() }; - const math::NormalizedCosineDistance distFunc{ queryVector }; - - using Distance = float; - std::vector> rankedTracks; - rankedTracks.reserve(_trackVectors.size()); - - for (const auto& [trackId, vectors] : _trackVectors) - { - if (std::find(std::cbegin(tracksId), std::cend(tracksId), trackId) != std::cend(tracksId)) - continue; - - rankedTracks.emplace_back(trackId, distFunc(*vectors)); - } // Oversample to give the diversity selection enough candidates to work with static constexpr std::size_t oversamplingFactor{ 5 }; - const std::size_t candidateCount{ std::min(maxCount * oversamplingFactor, rankedTracks.size()) }; - std::partial_sort(std::begin(rankedTracks), std::next(std::begin(rankedTracks), static_cast(candidateCount)), std::end(rankedTracks), [](const auto& lhs, const auto& rhs) { - return lhs.second < rhs.second; - }); - rankedTracks.resize(candidateCount); + auto rankedTracks{ detail::findNearestNeighbors(queryVector, _trackVectors, maxCount * oversamplingFactor, tracksId) }; // Greedy selection: at each step pick the candidate with the lowest penalized score. // Pre-seed selectedTracks with the input tracks so that soft constraints (same release, @@ -216,6 +205,17 @@ namespace lms::recommendation selectedTracks.reserve(selectedTracks.size() + maxCount); res.reserve(maxCount); + const ReducedVector* prevVector{ nullptr }; + for (auto it{ tracksId.rbegin() }; it != tracksId.rend(); ++it) + { + const auto found{ _trackVectors.find(*it) }; + if (found != _trackVectors.cend()) + { + prevVector = found->second; + break; + } + } + while (res.size() < maxCount && !rankedTracks.empty()) { std::optional bestIdx; @@ -223,7 +223,7 @@ namespace lms::recommendation for (std::size_t i{}; i < rankedTracks.size(); ++i) { - const db::TrackId candidateId{ rankedTracks[i].first }; + const db::TrackId candidateId{ rankedTracks[i].id }; const TrackCandidateContext context{ .candidateTrackId = candidateId, @@ -246,8 +246,11 @@ namespace lms::recommendation break; const auto& [selectedId, distanceToQuery]{ rankedTracks[*bestIdx] }; - res.push_back({ .id = selectedId, .distance = distanceToQuery }); + const auto* selectedVector{ _trackVectors.at(selectedId) }; + const float distanceToPrev{ prevVector ? math::NormalizedCosineDistance{ *prevVector }(*selectedVector) : distanceToQuery }; + res.push_back({ .id = selectedId, .distanceToFirst = distanceToQuery, .distanceToPrevious = distanceToPrev }); selectedTracks.push_back(selectedId); + prevVector = selectedVector; rankedTracks.erase(std::begin(rankedTracks) + static_cast(*bestIdx)); } @@ -284,17 +287,17 @@ namespace lms::recommendation auto queryPoint{ startVector + direction * t }; queryPoint.normalizeL2(); - const auto neighbors{ detail::findNearestNeighbors(queryPoint, _trackVectors, NeighborCount, endTrackId) }; + const auto neighbors{ detail::findNearestNeighbors(queryPoint, _trackVectors, NeighborCount, std::span{ &endTrackId, 1 }) }; const db::TrackId stepSeedTrackId{ neighbors.empty() ? startTrackId : neighbors[0].id }; const std::array stepSeedTrackIds{ stepSeedTrackId }; std::optional best; float bestScore{ std::numeric_limits::max() }; - for (const auto& [candidateTrackId, candidateDistance] : neighbors) + for (const auto& neighbor : neighbors) { const TrackCandidateContext context{ - .candidateTrackId = candidateTrackId, + .candidateTrackId = neighbor.id, .selectedTracks = path, .seedTrackIds = stepSeedTrackIds, }; @@ -306,7 +309,7 @@ namespace lms::recommendation if (score < bestScore) { bestScore = score; - best = candidateTrackId; + best = neighbor.id; } } @@ -323,10 +326,14 @@ namespace lms::recommendation results.reserve(path.size()); const math::NormalizedCosineDistance startDistFunc{ startVector }; + const ReducedVector* prevVector{ &startVector }; for (const db::TrackId trackId : path) { const auto* trackVector{ _trackVectors.at(trackId) }; - results.push_back({ .id = trackId, .distance = startDistFunc(*trackVector) }); + const float distToFirst{ startDistFunc(*trackVector) }; + const float distToPrev{ math::NormalizedCosineDistance{ *prevVector }(*trackVector) }; + results.push_back({ .id = trackId, .distanceToFirst = distToFirst, .distanceToPrevious = distToPrev }); + prevVector = trackVector; } return results; @@ -384,7 +391,7 @@ namespace lms::recommendation res.reserve(resultCount); for (std::size_t i{}; i < resultCount; ++i) - res.push_back({ .id = rankedReleases[i].first, .distance = rankedReleases[i].second }); + res.push_back({ .id = rankedReleases[i].first, .distanceToFirst = rankedReleases[i].second }); return res; } @@ -444,7 +451,7 @@ namespace lms::recommendation res.reserve(resultCount); for (std::size_t i{}; i < resultCount; ++i) - res.push_back({ .id = rankedArtists[i].first, .distance = rankedArtists[i].second }); + res.push_back({ .id = rankedArtists[i].first, .distanceToFirst = rankedArtists[i].second }); return res; } diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp index 1efee5a5..86540518 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp +++ b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp @@ -86,7 +86,7 @@ namespace lms::recommendation ResultContainer res; res.reserve(resultCount); for (std::size_t i{}; i < resultCount; ++i) - res.push_back({ .id = overlapCounts[i].first, .distance = {} }); + res.push_back({ .id = overlapCounts[i].first, .distanceToFirst = {}, .distanceToPrevious = {} }); return res; } @@ -295,7 +295,7 @@ namespace lms::recommendation if (!bestIdx) break; - res.push_back({ .id = candidates[*bestIdx], .distance = {} }); + res.push_back({ .id = candidates[*bestIdx], .distanceToFirst = {}, .distanceToPrevious = {} }); selectedTracks.push_back(candidates[*bestIdx]); candidates.erase(std::begin(candidates) + static_cast(*bestIdx)); } @@ -364,7 +364,7 @@ namespace lms::recommendation return {}; if (startTrackId == endTrackId) - return { RecommendationResult{ .id = startTrackId, .distance = {} } }; + return { RecommendationResult{ .id = startTrackId, .distanceToFirst = {}, .distanceToPrevious = {} } }; db::Session& dbSession{ _db.getTLSSession() }; auto transaction{ dbSession.createReadTransaction() }; @@ -376,9 +376,9 @@ namespace lms::recommendation TrackResults res; res.reserve(std::min(maxCount, 2)); - res.push_back({ .id = startTrackId, .distance = {} }); + res.push_back({ .id = startTrackId, .distanceToFirst = {}, .distanceToPrevious = {} }); if (maxCount > 1) - res.push_back({ .id = endTrackId, .distance = {} }); + res.push_back({ .id = endTrackId, .distanceToFirst = {}, .distanceToPrevious = {} }); return res; } diff --git a/src/libs/services/recommendation/include/services/recommendation/Types.hpp b/src/libs/services/recommendation/include/services/recommendation/Types.hpp index bd08ec1e..169872e7 100644 --- a/src/libs/services/recommendation/include/services/recommendation/Types.hpp +++ b/src/libs/services/recommendation/include/services/recommendation/Types.hpp @@ -31,7 +31,8 @@ namespace lms::recommendation struct RecommendationResult { IdType id; - float distance{}; // normalized distance in [0, 1]: 0 = most similar, 1 = least similar + float distanceToFirst{}; // normalized [0, 1]: 0 = most similar, 1 = least similar (distance to seed/query) + float distanceToPrevious{}; // normalized [0, 1]: 0 = most similar, 1 = least similar (distance to preceding result) }; template diff --git a/src/libs/subsonic/impl/endpoints/Browsing.cpp b/src/libs/subsonic/impl/endpoints/Browsing.cpp index 0180043f..5092e535 100644 --- a/src/libs/subsonic/impl/endpoints/Browsing.cpp +++ b/src/libs/subsonic/impl/endpoints/Browsing.cpp @@ -696,7 +696,7 @@ namespace lms::api::subsonic if (track) { Response::Node& sonicMatchNode{ response.createArrayNode("sonicMatch") }; - sonicMatchNode.setAttribute("similarity", 1.0F - similarTrack.distance); + sonicMatchNode.setAttribute("similarity", 1.0F - similarTrack.distanceToFirst); sonicMatchNode.addChild("entry", createSongNode(context, track, context.getUser())); } } @@ -727,7 +727,7 @@ namespace lms::api::subsonic if (track) { Response::Node& sonicMatchNode{ response.createArrayNode("sonicMatch") }; - sonicMatchNode.setAttribute("similarity", 1.0F - pathTrack.distance); + sonicMatchNode.setAttribute("similarity", 1.0F - pathTrack.distanceToFirst); sonicMatchNode.addChild("entry", createSongNode(context, track, context.getUser())); } } diff --git a/src/tools/recommendation/LmsRecommendation.cpp b/src/tools/recommendation/LmsRecommendation.cpp index f24b7a42..825d8d34 100644 --- a/src/tools/recommendation/LmsRecommendation.cpp +++ b/src/tools/recommendation/LmsRecommendation.cpp @@ -86,7 +86,7 @@ namespace lms std::cout << "Processing track " << trackToString(trackId) << std::endl; for (const auto& similarTrack : recommendationService.findSimilarTracks(std::span{ &trackId, 1 }, maxCount)) - std::cout << "\t- " << similarTrack.distance << ", Similar track " << trackToString(similarTrack.id) << std::endl; + std::cout << "\t- " << "Similar track " << trackToString(similarTrack.id) << " (first: " << similarTrack.distanceToFirst << ", prev: " << similarTrack.distanceToPrevious << ")" << std::endl; } } @@ -128,7 +128,7 @@ namespace lms std::cout << "Processing release '" << releaseToString(releaseId) << "'" << std::endl; for (const auto& similarRelease : recommendationService.findSimilarReleases(releaseId, maxCount)) - std::cout << "\t- " << similarRelease.distance << ", Similar release " << releaseToString(similarRelease.id) << std::endl; + std::cout << "\t- " << "Similar release " << releaseToString(similarRelease.id) << " (first: " << similarRelease.distanceToFirst << ", prev: " << similarRelease.distanceToPrevious << ")" << std::endl; } } @@ -163,7 +163,7 @@ namespace lms std::cout << "Processing artist '" << artistToString(artistId) << "'" << std::endl; for (const auto& similarArtist : recommendationService.findSimilarArtists(artistId, { db::TrackArtistLinkType::Artist }, maxCount)) - std::cout << "\t- " << similarArtist.distance << ", Similar artist '" << artistToString(similarArtist.id) << "'" << std::endl; + std::cout << "\t- " << "Similar artist '" << artistToString(similarArtist.id) << "' (first: " << similarArtist.distanceToFirst << ", prev: " << similarArtist.distanceToPrevious << ")" << std::endl; } } @@ -229,7 +229,7 @@ namespace lms } for (const auto& similarTrack : similarTracks) - std::cout << "\t- " << similarTrack.distance << ", Similar track " << trackToString(similarTrack.id) << std::endl; + std::cout << "\t- " << "Similar track " << trackToString(similarTrack.id) << " (first: " << similarTrack.distanceToFirst << ", prev: " << similarTrack.distanceToPrevious << ")" << std::endl; } } @@ -290,7 +290,7 @@ namespace lms } for (const auto& similarRelease : similarReleases) - std::cout << "\t- " << similarRelease.distance << ", Similar release " << releaseToString(similarRelease.id) << std::endl; + std::cout << "\t- " << "Similar release " << releaseToString(similarRelease.id) << " (first: " << similarRelease.distanceToFirst << ", prev: " << similarRelease.distanceToPrevious << ")" << std::endl; } } @@ -345,7 +345,7 @@ namespace lms } for (const auto& similarArtist : similarArtists) - std::cout << "\t- " << similarArtist.distance << ", Similar artist '" << artistToString(similarArtist.id) << "'" << std::endl; + std::cout << "\t- " << "Similar artist '" << artistToString(similarArtist.id) << "' (first: " << similarArtist.distanceToFirst << ", prev: " << similarArtist.distanceToPrevious << ")" << std::endl; } } @@ -436,7 +436,7 @@ namespace lms for (std::size_t i{}; i < path.size(); ++i) { const auto& result{ path[i] }; - std::cout << "\t" << (i + 1) << ". " << trackToString(result.id) << " (distance: " << result.distance << ")" << std::endl; + std::cout << "\t" << (i + 1) << ". " << trackToString(result.id) << " (first: " << result.distanceToFirst << ", prev: " << result.distanceToPrevious << ")" << std::endl; } } } From 986a6e2580b3d53a86458a38800c0b66414b85fa Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 11 Jun 2026 20:58:52 +0200 Subject: [PATCH 08/38] Fixed release only artists not picked up during search3 calls, fixes #852 --- src/libs/database/impl/objects/Artist.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp index 781d17e0..6e7cf657 100644 --- a/src/libs/database/impl/objects/Artist.cpp +++ b/src/libs/database/impl/objects/Artist.cpp @@ -240,7 +240,11 @@ namespace lms::db if (library.isValid()) { // Faster than using joins - query.where("EXISTS (SELECT 1 FROM track_artist_link t_a_l JOIN track t ON t.id = t_a_l.track_id WHERE t_a_l.artist_id = a.id AND t.media_library_id = ?)").bind(library); + query.where( + "EXISTS (SELECT 1 FROM track_artist_link t_a_l JOIN track t ON t.id = t_a_l.track_id WHERE t_a_l.artist_id = a.id AND t.media_library_id = ?)" + " OR EXISTS (SELECT 1 FROM release_artist_link r_a_l JOIN release r ON r.id = r_a_l.release_id JOIN track t ON t.release_id = r.id WHERE r_a_l.artist_id = a.id AND t.media_library_id = ?)") + .bind(library) + .bind(library); } utils::forEachQueryResult(query, [&](const Artist::pointer& artist) { From 6825f6130de7812867b0ceaaa99f0dc3f8112fbe Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 11 Jun 2026 21:25:56 +0200 Subject: [PATCH 09/38] Fixed crash where too many symlinks are hit, fixes #853 --- .../scanner/impl/steps/ScanStepScanFiles.cpp | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp index 637fe694..7dd0837e 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp @@ -67,25 +67,35 @@ namespace lms::scanner { continueExploring = cb(ec, path, nullptr); } - else if (entry.is_regular_file()) + else { - if (shouldIgnore(path, IgnoreRules::IsDirectory{ false })) + const bool isFile{ entry.is_regular_file(ec) }; + const bool isDir{ !ec && !isFile && entry.is_directory(ec) }; + + if (ec) { - LMS_LOG(DBUPDATER, DEBUG, "Ignoring file " << path << " (matched .lmsignore rule)"); - itPath.increment(ec); - continue; + continueExploring = cb(ec, path, nullptr); } - continueExploring = cb(ec, path, &entry); - } - else if (entry.is_directory()) - { - if (shouldIgnore(path, IgnoreRules::IsDirectory{ true })) + else if (isFile) { - LMS_LOG(DBUPDATER, DEBUG, "Ignoring directory " << path << " (matched .lmsignore rule)"); - itPath.increment(ec); - continue; + if (shouldIgnore(path, IgnoreRules::IsDirectory{ false })) + { + LMS_LOG(DBUPDATER, DEBUG, "Ignoring file " << path << " (matched .lmsignore rule)"); + itPath.increment(ec); + continue; + } + continueExploring = cb(ec, path, &entry); + } + else if (isDir) + { + if (shouldIgnore(path, IgnoreRules::IsDirectory{ true })) + { + LMS_LOG(DBUPDATER, DEBUG, "Ignoring directory " << path << " (matched .lmsignore rule)"); + itPath.increment(ec); + continue; + } + continueExploring = exploreFilesRecursive(path, cb, shouldIgnore); } - continueExploring = exploreFilesRecursive(path, cb, shouldIgnore); } if (!continueExploring) From 309c39a572dbb83688a28c09a7e60961a2008891 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 11 Jun 2026 22:09:32 +0200 Subject: [PATCH 10/38] Audio similarity engine: do not treat silent songs as errors --- .../musicnn/MusicNNEmbeddingProvider.cpp | 6 ++-- .../musicnn/MusicNNEmbeddingProvider.hpp | 1 - .../ScanStepExtractMusicNNEmbeddings.cpp | 29 +++++++++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.cpp b/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.cpp index a817417f..6c846e71 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.cpp +++ b/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.cpp @@ -48,10 +48,10 @@ namespace lms::recommendation session.checkReadTransaction(); const db::TrackMusicNNEmbeddings::pointer embeddings{ db::TrackMusicNNEmbeddings::find(session, trackId) }; - if (embeddings) + if (embeddings && !embeddings->getData().empty()) readEmbeddings(embeddings, vec); - return embeddings; + return embeddings && !embeddings->getData().empty(); } void MusicNNEmbeddingProvider::visitVectors(db::Session& session, const std::function& visitor) @@ -60,6 +60,8 @@ namespace lms::recommendation Vector vec; db::TrackMusicNNEmbeddings::find(session, [&](const db::TrackMusicNNEmbeddings::pointer& embeddings) { + if (embeddings->getData().empty()) + return; readEmbeddings(embeddings, vec); visitor(embeddings->getTrackId(), vec); }); diff --git a/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.hpp b/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.hpp index 33d6d521..cc355603 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.hpp +++ b/src/libs/services/recommendation/impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.hpp @@ -40,7 +40,6 @@ namespace lms::recommendation static constexpr std::size_t DimCount{ 200 }; using Vector = math::Vector; - static std::size_t getCount(db::Session& session); static bool getVector(db::Session& session, db::TrackId trackId, Vector& vec); static void visitVectors(db::Session& session, const std::function& visitor); }; diff --git a/src/libs/services/scanner/impl/steps/ScanStepExtractMusicNNEmbeddings.cpp b/src/libs/services/scanner/impl/steps/ScanStepExtractMusicNNEmbeddings.cpp index e4499be4..1b55561d 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepExtractMusicNNEmbeddings.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepExtractMusicNNEmbeddings.cpp @@ -92,6 +92,7 @@ namespace lms::scanner ExtractMusicNNEmbeddingsJob& operator=(const ExtractMusicNNEmbeddingsJob&) = delete; const TrackLocation& getTrackLocation() const { return _trackLocation; } + bool isSuccess() const { return _success; } const audio::TrackMusicNNEmbeddings* getEmbeddings() const { return _embeddings ? &_embeddings.value() : nullptr; } std::string_view getErrorMessage() const { return _errorMessage; } @@ -107,6 +108,8 @@ namespace lms::scanner if (result.patchCount > 0) _embeddings.emplace(result.embeddings); LMS_LOG(DBUPDATER, DEBUG, "MusicNN extraction complete for " << _trackLocation.trackPath << " (" << result.patchCount << " patches)"); + + _success = true; } catch (const audio::Exception& e) { @@ -116,6 +119,7 @@ namespace lms::scanner const audio::IMusicNNEmbeddingExtractor& _extractor; const TrackLocation _trackLocation; + bool _success{}; std::optional _embeddings; std::string _errorMessage; }; @@ -125,10 +129,13 @@ namespace lms::scanner db::Track::pointer track{ db::Track::find(session, assoc.trackId) }; assert(track); - std::vector blob(sizeof(audio::TrackMusicNNEmbeddings)); - audio::trackMusicNNEmbeddingsToBlob(*assoc.embeddings, blob); db::TrackMusicNNEmbeddings::pointer entry{ session.create(track) }; - entry.modify()->setData(blob); + if (assoc.embeddings) + { + std::vector blob(sizeof(audio::TrackMusicNNEmbeddings)); + audio::trackMusicNNEmbeddingsToBlob(*assoc.embeddings, blob); + entry.modify()->setData(blob); + } } void writeEmbeddings(ScanContext& context, db::Session& session, TrackEmbeddingAssociationContainer& pendingAssocs, bool forceFullBatch) @@ -202,10 +209,22 @@ namespace lms::scanner { const auto& extractJob{ static_cast(*job) }; - if (const audio::TrackMusicNNEmbeddings * embeddings{ extractJob.getEmbeddings() }) - pendingAssocs.push_back(TrackEmbeddingAssociation{ .trackId = extractJob.getTrackLocation().track, .embeddings = *embeddings }); + if (extractJob.isSuccess()) + { + if (const audio::TrackMusicNNEmbeddings * embeddings{ extractJob.getEmbeddings() }) + { + pendingAssocs.push_back(TrackEmbeddingAssociation{ .trackId = extractJob.getTrackLocation().track, .embeddings = *embeddings }); + } + else + { + LMS_LOG(DBUPDATER, INFO, "No patch extracted from " << extractJob.getTrackLocation().trackPath); + pendingAssocs.push_back(TrackEmbeddingAssociation{ .trackId = extractJob.getTrackLocation().track, .embeddings = std::nullopt }); + } + } else + { addError(context, extractJob.getTrackLocation().trackPath, extractJob.getErrorMessage()); + } } context.currentStepStats.processedElems += jobs.size(); From af018a91667b5d0e42773dc0396245f33956a420 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 13 Jun 2026 16:54:21 +0200 Subject: [PATCH 11/38] Replaced UUID storage from str to array of bytes --- src/libs/core/bench/CMakeLists.txt | 1 + src/libs/core/bench/UUIDBench.cpp | 55 +++++++++++ src/libs/core/impl/UUID.cpp | 99 +++++++++++-------- src/libs/core/include/core/UUID.hpp | 22 +++-- src/libs/core/test/UUID.cpp | 65 +++++++++++- src/libs/database/impl/Migration.cpp | 41 +++++++- src/libs/database/impl/Session.cpp | 1 + src/libs/database/impl/objects/Artist.cpp | 16 +-- src/libs/database/impl/objects/ArtistInfo.cpp | 6 +- src/libs/database/impl/objects/Release.cpp | 7 +- .../impl/objects/ReleaseArtistLink.cpp | 6 +- src/libs/database/impl/objects/Track.cpp | 7 +- .../database/impl/objects/TrackArtistLink.cpp | 6 +- src/libs/database/impl/traits/UUIDTraits.hpp | 64 ++++++++++++ .../include/database/objects/Artist.hpp | 8 +- .../include/database/objects/Release.hpp | 12 +-- .../include/database/objects/Track.hpp | 12 +-- src/libs/database/test/Migration.cpp | 22 ++++- .../impl/listenbrainz/FeedbackTypes.cpp | 2 +- .../listenbrainz/FeedbacksSynchronizer.cpp | 2 +- .../services/podcast/impl/steps/Utils.cpp | 2 +- .../AudioSimilarityEngine.impl.hpp | 2 +- .../impl/clusters/ClustersEngine.cpp | 2 +- .../steps/ScanStepArtistReconciliation.cpp | 2 +- .../steps/ScanStepAssociateArtistImages.cpp | 2 +- .../steps/ScanStepAssociateReleaseImages.cpp | 2 +- .../steps/ScanStepCheckForDuplicatedFiles.cpp | 2 +- .../impl/listenbrainz/ListenTypes.cpp | 4 +- .../impl/listenbrainz/ListensSynchronizer.cpp | 10 +- .../services/scrobbling/test/Listenbrainz.cpp | 12 +-- src/libs/subsonic/impl/endpoints/Browsing.cpp | 4 +- .../subsonic/impl/endpoints/Transcoding.cpp | 2 +- src/libs/subsonic/impl/responses/Album.cpp | 2 +- .../subsonic/impl/responses/AlbumInfo.cpp | 4 +- src/libs/subsonic/impl/responses/Artist.cpp | 2 +- src/libs/subsonic/impl/responses/Song.cpp | 2 +- src/lms/ui/Utils.cpp | 4 +- src/lms/ui/admin/ScannerReportResource.cpp | 2 +- src/lms/ui/admin/UserView.cpp | 2 +- src/lms/ui/explore/ArtistView.cpp | 2 +- src/lms/ui/explore/ReleaseView.cpp | 2 +- src/lms/ui/settings/SubsonicSettingsView.cpp | 2 +- src/tools/db-generator/LmsDbGenerator.cpp | 8 +- 43 files changed, 392 insertions(+), 140 deletions(-) create mode 100644 src/libs/core/bench/UUIDBench.cpp create mode 100644 src/libs/database/impl/traits/UUIDTraits.hpp diff --git a/src/libs/core/bench/CMakeLists.txt b/src/libs/core/bench/CMakeLists.txt index 4ab4c319..7c07b875 100644 --- a/src/libs/core/bench/CMakeLists.txt +++ b/src/libs/core/bench/CMakeLists.txt @@ -2,6 +2,7 @@ add_executable(bench-core Core.cpp TraceLoggerBench.cpp + UUIDBench.cpp ) target_link_libraries(bench-core PRIVATE diff --git a/src/libs/core/bench/UUIDBench.cpp b/src/libs/core/bench/UUIDBench.cpp new file mode 100644 index 00000000..1f22f93b --- /dev/null +++ b/src/libs/core/bench/UUIDBench.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2026 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 + +#include "core/UUID.hpp" + +namespace lms::core::benchs +{ + static void BM_UUID_fromString(benchmark::State& state) + { + for (auto _ : state) + benchmark::DoNotOptimize(UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178fc")); + } + + static void BM_UUID_fromString_invalid(benchmark::State& state) + { + for (auto _ : state) + benchmark::DoNotOptimize(UUID::fromString("not-a-valid-uuid-string-at-all-xx")); + } + + static void BM_UUID_toString(benchmark::State& state) + { + const UUID uuid{ *UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178fc") }; + for (auto _ : state) + benchmark::DoNotOptimize(uuid.toString()); + } + + static void BM_UUID_generate(benchmark::State& state) + { + for (auto _ : state) + benchmark::DoNotOptimize(UUID::generate()); + } + + BENCHMARK(BM_UUID_fromString); + BENCHMARK(BM_UUID_fromString_invalid); + BENCHMARK(BM_UUID_toString); + BENCHMARK(BM_UUID_generate); +} // namespace lms::core::benchs diff --git a/src/libs/core/impl/UUID.cpp b/src/libs/core/impl/UUID.cpp index 756bcb1a..aafe5e4a 100644 --- a/src/libs/core/impl/UUID.cpp +++ b/src/libs/core/impl/UUID.cpp @@ -19,72 +19,93 @@ #include "core/UUID.hpp" -#include -#include -#include -#include +#include +#include +#include +#include #include "core/Random.hpp" -#include "core/String.hpp" namespace lms::core { namespace stringUtils { template<> - std::optional - readAs(std::string_view str) + std::optional readAs(std::string_view str) { return UUID::fromString(str); } } // namespace stringUtils + namespace { - bool stringIsUUID(std::string_view str) - { - static const std::regex re{ R"([0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12})" }; + // Each entry is the str index of the high hex char for that UUID byte + constexpr std::array byteOffsets{ + 0, 2, 4, 6, // group 1 (4 bytes, positions 0-7) + 9, 11, // group 2 (2 bytes, positions 9-12) + 14, 16, // group 3 (2 bytes, positions 14-17) + 19, 21, // group 4 (2 bytes, positions 19-22) + 24, 26, 28, 30, 32, 34 // group 5 (6 bytes, positions 24-35) + }; - return std::regex_match(std::cbegin(str), std::cend(str), re); + bool parseUUID(std::string_view str, std::array& out) + { + if (str.size() != 36 || str[8] != '-' || str[13] != '-' || str[18] != '-' || str[23] != '-') + return false; + + for (std::size_t i{}; i < 16; ++i) + { + unsigned int byte{}; + const char* begin{ str.data() + byteOffsets[i] }; + const auto [ptr, ec]{ std::from_chars(begin, begin + 2, byte, 16) }; + if (ec != std::errc{} || ptr != begin + 2) + return false; + out[i] = static_cast(byte); + } + return true; } } // namespace - UUID::UUID(std::string_view str) - : _value{ stringUtils::stringToLower(str) } + UUID::UUID(std::array bytes) noexcept + : _bytes{ bytes } { } std::optional UUID::fromString(std::string_view str) { - if (!stringIsUUID(str)) + std::array bytes{}; + if (!parseUUID(str, bytes)) return std::nullopt; + return UUID{ bytes }; + } - return UUID{ str }; + UUID UUID::fromBytes(std::span bytes) noexcept + { + std::array arr{}; + std::copy(bytes.begin(), bytes.end(), arr.begin()); + return UUID{ arr }; + } + + std::string UUID::toString() const + { + static constexpr char hex[]{ "0123456789abcdef" }; + std::string s(36, '-'); + for (std::size_t i{}; i < 16; ++i) + { + const auto b{ std::to_integer(_bytes[i]) }; + s[byteOffsets[i]] = hex[b >> 4]; + s[byteOffsets[i] + 1] = hex[b & 0x0F]; + } + return s; } UUID UUID::generate() { - // Form is "123e4567-e89b-12d3-a456-426614174000" - // TODO: store 128 bits and only convert to string when necessary - - std::ostringstream oss; - - auto concatRandomBytes{ [](std::ostream& os, std::size_t byteCount) { - for (std::size_t i{}; i < byteCount; ++i) - os << std::hex << std::setfill('0') << std::setw(2) << static_cast(random::getRandom(0, 255)); - } }; - - concatRandomBytes(oss, 4); - oss << "-"; - concatRandomBytes(oss, 2); - oss << "-"; - concatRandomBytes(oss, 2); - oss << "-"; - concatRandomBytes(oss, 2); - oss << "-"; - concatRandomBytes(oss, 6); - - const auto uuid{ fromString(oss.str()) }; - assert(uuid); - return uuid.value(); + std::uniform_int_distribution dist{ 0, 255 }; + auto& rng{ random::getRandGenerator() }; + std::array bytes{}; + for (auto& b : bytes) + b = static_cast(dist(rng)); + return UUID{ bytes }; } -} // namespace lms::core \ No newline at end of file +} // namespace lms::core diff --git a/src/libs/core/include/core/UUID.hpp b/src/libs/core/include/core/UUID.hpp index 422bba75..c7367ebf 100644 --- a/src/libs/core/include/core/UUID.hpp +++ b/src/libs/core/include/core/UUID.hpp @@ -19,8 +19,11 @@ #pragma once +#include +#include #include #include +#include #include #include @@ -31,24 +34,28 @@ namespace lms::core class UUID { public: + static constexpr std::size_t binarySize{ 16 }; + + UUID() noexcept = default; static std::optional fromString(std::string_view str); + static UUID fromBytes(std::span bytes) noexcept; static UUID generate(); - std::string_view getAsString() const { return _value; } + std::string toString() const; + std::span bytes() const noexcept { return _bytes; } auto operator<=>(const UUID&) const = default; private: - UUID(std::string_view value); - std::string _value; + explicit UUID(std::array bytes) noexcept; + std::array _bytes{}; }; } // namespace lms::core namespace lms::core::stringUtils { template<> - std::optional - readAs(std::string_view str); + std::optional readAs(std::string_view str); } namespace std @@ -56,9 +63,10 @@ namespace std template<> struct hash { - size_t operator()(const lms::core::UUID& str) const + size_t operator()(const lms::core::UUID& uuid) const noexcept { - return hash{}(str.getAsString()); + const auto& b{ uuid.bytes() }; + return hash{}({ static_cast(static_cast(b.data())), b.size() }); } }; } // namespace std diff --git a/src/libs/core/test/UUID.cpp b/src/libs/core/test/UUID.cpp index 9dad6f09..18d8b4d6 100644 --- a/src/libs/core/test/UUID.cpp +++ b/src/libs/core/test/UUID.cpp @@ -17,10 +17,7 @@ * along with LMS. If not, see . */ -#include -#include -#include -#include +#include #include @@ -28,6 +25,19 @@ namespace lms::core { + TEST(UUID, fromString_invalid) + { + EXPECT_FALSE(UUID::fromString("")); + EXPECT_FALSE(UUID::fromString("not-a-uuid")); + EXPECT_FALSE(UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178f")); // too short + EXPECT_FALSE(UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178fcc")); // too long + EXPECT_FALSE(UUID::fromString("3f51c839-bee2-4e9d-a7b7_0693e45178fc")); // wrong separator position 23 + EXPECT_FALSE(UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178gz")); // invalid hex char 'g','z' + EXPECT_FALSE(UUID::fromString("3f51c839Xbee2-4e9d-a7b7-0693e45178fc")); // dash replaced at position 8 + EXPECT_FALSE(UUID::fromString("3f51c839-bee2X4e9d-a7b7-0693e45178fc")); // dash replaced at position 13 + EXPECT_FALSE(UUID::fromString("3f51c839-bee2-4e9dXa7b7-0693e45178fc")); // dash replaced at position 18 + } + TEST(UUID, caseInsensitive) { const std::optional uuid1{ UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178fc") }; @@ -37,4 +47,51 @@ namespace lms::core EXPECT_TRUE(uuid1 >= uuid2); EXPECT_TRUE(uuid1 <= uuid2); } + + TEST(UUID, toString_roundTrip) + { + const std::string str{ "3f51c839-bee2-4e9d-a7b7-0693e45178fc" }; + const std::optional uuid{ UUID::fromString(str) }; + + ASSERT_TRUE(uuid); + EXPECT_EQ(uuid->toString(), str); + } + + TEST(UUID, toString_lowercase) + { + const std::optional uuid{ UUID::fromString("3F51C839-BEE2-4E9D-A7B7-0693E45178FC") }; + + ASSERT_TRUE(uuid); + EXPECT_EQ(uuid->toString(), "3f51c839-bee2-4e9d-a7b7-0693e45178fc"); + } + + TEST(UUID, fromBytes_roundTrip) + { + const std::optional uuid{ UUID::fromString("550e8400-e29b-41d4-a716-446655440000") }; + ASSERT_TRUE(uuid); + + const UUID fromB{ UUID::fromBytes(uuid->bytes()) }; + EXPECT_EQ(fromB, *uuid); + EXPECT_EQ(fromB.toString(), "550e8400-e29b-41d4-a716-446655440000"); + } + + TEST(UUID, bytes_size) + { + const std::optional uuid{ UUID::fromString("3f51c839-bee2-4e9d-a7b7-0693e45178fc") }; + ASSERT_TRUE(uuid); + EXPECT_EQ(uuid->bytes().size(), 16U); + } + + TEST(UUID, generate_validString) + { + const UUID uuid{ UUID::generate() }; + const std::string s{ uuid.toString() }; + + ASSERT_EQ(s.size(), 36U); + EXPECT_EQ(s[8], '-'); + EXPECT_EQ(s[13], '-'); + EXPECT_EQ(s[18], '-'); + EXPECT_EQ(s[23], '-'); + EXPECT_TRUE(UUID::fromString(s).has_value()); + } } // namespace lms::core \ No newline at end of file diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index e7b2e54a..93e4f5f8 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -35,7 +35,7 @@ namespace lms::db { namespace { - static constexpr Version LMS_DATABASE_VERSION{ 106 }; + static constexpr Version LMS_DATABASE_VERSION{ 107 }; } VersionInfo::VersionInfo() @@ -1736,6 +1736,44 @@ FROM track)"); utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE "user" ADD COLUMN "lastfm_session_key" TEXT NOT NULL DEFAULT '')"); } + void migrateFromV106(Session& session) + { + dropIndexes(session); + + // Convert the 5 MBID TEXT columns to BLOB (16 raw bytes) + // unhex() returns NULL for non-hex input, so malformed values become NULL + + // artist.mbid + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist ADD COLUMN mbid_new BLOB)"); + utils::executeCommand(*session.getDboSession(), R"(UPDATE artist SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist DROP COLUMN mbid)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist RENAME COLUMN mbid_new TO mbid)"); + + // release.mbid + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release ADD COLUMN mbid_new BLOB)"); + utils::executeCommand(*session.getDboSession(), R"(UPDATE release SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release DROP COLUMN mbid)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release RENAME COLUMN mbid_new TO mbid)"); + + // release.group_mbid + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release ADD COLUMN group_mbid_new BLOB)"); + utils::executeCommand(*session.getDboSession(), R"(UPDATE release SET group_mbid_new = CASE WHEN group_mbid != '' THEN unhex(replace(group_mbid, '-', '')) ELSE NULL END)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release DROP COLUMN group_mbid)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release RENAME COLUMN group_mbid_new TO group_mbid)"); + + // track.mbid + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track ADD COLUMN mbid_new BLOB)"); + utils::executeCommand(*session.getDboSession(), R"(UPDATE track SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track DROP COLUMN mbid)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track RENAME COLUMN mbid_new TO mbid)"); + + // track.recording_mbid + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track ADD COLUMN recording_mbid_new BLOB)"); + utils::executeCommand(*session.getDboSession(), R"(UPDATE track SET recording_mbid_new = CASE WHEN recording_mbid != '' THEN unhex(replace(recording_mbid, '-', '')) ELSE NULL END)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track DROP COLUMN recording_mbid)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track RENAME COLUMN recording_mbid_new TO recording_mbid)"); + } + bool doDbMigration(Session& session) { constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" }; @@ -1818,6 +1856,7 @@ FROM track)"); { 103, migrateFromV103 }, { 104, migrateFromV104 }, { 105, migrateFromV105 }, + { 106, migrateFromV106 }, }; bool migrationPerformed{}; diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp index f1c0371f..df51253e 100644 --- a/src/libs/database/impl/Session.cpp +++ b/src/libs/database/impl/Session.cpp @@ -66,6 +66,7 @@ #include "traits/ImageHashTypeTraits.hpp" #include "traits/PartialDateTimeTraits.hpp" #include "traits/PathTraits.hpp" +#include "traits/UUIDTraits.hpp" namespace lms::db { diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp index 6e7cf657..d064e7fc 100644 --- a/src/libs/database/impl/objects/Artist.cpp +++ b/src/libs/database/impl/objects/Artist.cpp @@ -35,6 +35,7 @@ #include "objects/detail/Types.hpp" #include "traits/IdTypeTraits.hpp" #include "traits/StringViewTraits.hpp" +#include "traits/UUIDTraits.hpp" DBO_INSTANTIATE_TEMPLATES(lms::db::Artist) @@ -214,7 +215,7 @@ namespace lms::db } // namespace Artist::Artist(const std::string& name, const std::optional& mbid) - : _mbid{ mbid ? mbid->getAsString() : "" } + : _mbid{ mbid } { setName(name); } @@ -277,7 +278,7 @@ namespace lms::db Artist::pointer Artist::find(Session& session, const core::UUID& mbid) { session.checkReadTransaction(); - return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT a FROM artist a").where("a.mbid = ?").bind(std::string{ mbid.getAsString() })); + return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT a FROM artist a").where("a.mbid = ?").bind(mbid)); } Artist::pointer Artist::find(Session& session, ArtistId id) @@ -386,17 +387,6 @@ AND NOT EXISTS ( utils::executeCommand(*session.getDboSession(), "UPDATE artist SET preferred_artwork_id = NULL WHERE id = ?", artistId); } - std::optional Artist::getMBID() const - { - return core::UUID::fromString(_mbid); - } - - bool Artist::hasMBID() const - { - // TODO optim this - return getMBID().has_value(); - } - ObjectPtr Artist::getPreferredArtwork() const { return ObjectPtr{ _preferredArtwork }; diff --git a/src/libs/database/impl/objects/ArtistInfo.cpp b/src/libs/database/impl/objects/ArtistInfo.cpp index b7acd5d4..736acbb2 100644 --- a/src/libs/database/impl/objects/ArtistInfo.cpp +++ b/src/libs/database/impl/objects/ArtistInfo.cpp @@ -112,13 +112,13 @@ namespace lms::db query.where("a_i.mbid_matched = FALSE"); if (!allowArtistMBIDFallback) { - query.where("a.mbid <> ''"); + query.where("a.mbid IS NOT NULL"); } else { query.where(R"( - (a.mbid <> '' AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '' AND a2.mbid <> a.mbid)) - OR (a.mbid = '' AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '') = 1))"); + (a.mbid IS NOT NULL AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL AND a2.mbid <> a.mbid)) + OR (a.mbid IS NULL AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL) = 1))"); } utils::applyRange(query, range); diff --git a/src/libs/database/impl/objects/Release.cpp b/src/libs/database/impl/objects/Release.cpp index 1747fe75..8117f978 100644 --- a/src/libs/database/impl/objects/Release.cpp +++ b/src/libs/database/impl/objects/Release.cpp @@ -46,6 +46,7 @@ #include "traits/IdTypeTraits.hpp" #include "traits/PartialDateTimeTraits.hpp" #include "traits/StringViewTraits.hpp" +#include "traits/UUIDTraits.hpp" DBO_INSTANTIATE_TEMPLATES(lms::db::Country) DBO_INSTANTIATE_TEMPLATES(lms::db::Label) @@ -218,7 +219,7 @@ namespace lms::db query.where("t.codec = ?").bind(detail::getDbCodec(params.filters.codec.value())); if (params.releaseGroupMBID) - query.where("group_mbid = ?").bind(params.releaseGroupMBID->getAsString()); + query.where("group_mbid = ?").bind(*params.releaseGroupMBID); switch (params.sortMethod) { @@ -454,7 +455,7 @@ namespace lms::db Release::Release(const std::string& name, const std::optional& MBID) : _name{ std::string(name, 0, _maxNameLength) } - , _MBID{ MBID ? MBID->getAsString() : "" } + , _MBID{ MBID } { } @@ -467,7 +468,7 @@ namespace lms::db { session.checkReadTransaction(); - return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT r from release r").where("r.mbid = ?").bind(mbid.getAsString())); + return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT r from release r").where("r.mbid = ?").bind(mbid)); } Release::pointer Release::find(Session& session, ReleaseId id) diff --git a/src/libs/database/impl/objects/ReleaseArtistLink.cpp b/src/libs/database/impl/objects/ReleaseArtistLink.cpp index 6c508c4c..c6eeeb7a 100644 --- a/src/libs/database/impl/objects/ReleaseArtistLink.cpp +++ b/src/libs/database/impl/objects/ReleaseArtistLink.cpp @@ -123,13 +123,13 @@ namespace lms::db query.where("r_a_l.artist_mbid_matched = FALSE"); if (!allowArtistMBIDFallback) { - query.where("a.mbid <> ''"); + query.where("a.mbid IS NOT NULL"); } else { query.where(R"( - (a.mbid <> '' AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '' AND a2.mbid <> a.mbid)) - OR (a.mbid = '' AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '') = 1))"); + (a.mbid IS NOT NULL AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL AND a2.mbid <> a.mbid)) + OR (a.mbid IS NULL AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL) = 1))"); } utils::applyRange(query, range); diff --git a/src/libs/database/impl/objects/Track.cpp b/src/libs/database/impl/objects/Track.cpp index 00aa93d5..ff8ad52d 100644 --- a/src/libs/database/impl/objects/Track.cpp +++ b/src/libs/database/impl/objects/Track.cpp @@ -46,6 +46,7 @@ #include "traits/PartialDateTimeTraits.hpp" #include "traits/PathTraits.hpp" #include "traits/StringViewTraits.hpp" +#include "traits/UUIDTraits.hpp" DBO_INSTANTIATE_TEMPLATES(lms::db::Track) @@ -392,21 +393,21 @@ namespace lms::db { session.checkReadTransaction(); - return utils::fetchQueryResults(session.getDboSession()->query>("SELECT t from track t").where("t.mbid = ?").bind(mbid.getAsString())); + return utils::fetchQueryResults(session.getDboSession()->query>("SELECT t from track t").where("t.mbid = ?").bind(mbid)); } std::vector Track::findByRecordingMBID(Session& session, const core::UUID& mbid) { session.checkReadTransaction(); - return utils::fetchQueryResults(session.getDboSession()->query>("SELECT t from track t").where("t.recording_mbid = ?").bind(mbid.getAsString())); + return utils::fetchQueryResults(session.getDboSession()->query>("SELECT t from track t").where("t.recording_mbid = ?").bind(mbid)); } RangeResults Track::findIdsTrackMBIDDuplicates(Session& session, std::optional range) { session.checkReadTransaction(); - auto query{ session.getDboSession()->query("SELECT track.id FROM track WHERE mbid in (SELECT mbid FROM track WHERE mbid <> '' GROUP BY mbid HAVING COUNT (*) > 1)").orderBy("track.release_id,track.mbid") }; + auto query{ session.getDboSession()->query("SELECT track.id FROM track WHERE mbid in (SELECT mbid FROM track WHERE mbid IS NOT NULL GROUP BY mbid HAVING COUNT (*) > 1)").orderBy("track.release_id,track.mbid") }; return utils::execRangeQuery(query, range); } diff --git a/src/libs/database/impl/objects/TrackArtistLink.cpp b/src/libs/database/impl/objects/TrackArtistLink.cpp index 3366d6bc..8ad07317 100644 --- a/src/libs/database/impl/objects/TrackArtistLink.cpp +++ b/src/libs/database/impl/objects/TrackArtistLink.cpp @@ -165,13 +165,13 @@ namespace lms::db query.where("t_a_l.artist_mbid_matched = FALSE"); if (!allowArtistMBIDFallback) { - query.where("a.mbid <> ''"); + query.where("a.mbid IS NOT NULL"); } else { query.where(R"( - (a.mbid <> '' AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '' AND a2.mbid <> a.mbid)) - OR (a.mbid = '' AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid <> '') = 1))"); + (a.mbid IS NOT NULL AND EXISTS (SELECT 1 FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL AND a2.mbid <> a.mbid)) + OR (a.mbid IS NULL AND (SELECT COUNT(*) FROM artist a2 WHERE a2.name = a.name AND a2.mbid IS NOT NULL) = 1))"); } utils::applyRange(query, range); diff --git a/src/libs/database/impl/traits/UUIDTraits.hpp b/src/libs/database/impl/traits/UUIDTraits.hpp new file mode 100644 index 00000000..25d7b510 --- /dev/null +++ b/src/libs/database/impl/traits/UUIDTraits.hpp @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2025 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 +#include +#include + +#include + +#include "core/UUID.hpp" + +namespace Wt::Dbo +{ + template<> + struct sql_value_traits + { + static constexpr bool specialized{ true }; + using UnderlyingType = std::vector; + + static std::string type(SqlConnection* conn, int size) + { + return sql_value_traits::type(conn, size); + } + + static void bind(const lms::core::UUID& v, SqlStatement* statement, int column, int size) + { + constexpr auto binarySize{ lms::core::UUID::binarySize }; + const auto bytes{ v.bytes() }; + UnderlyingType blob(binarySize); + std::memcpy(blob.data(), bytes.data(), binarySize); + sql_value_traits::bind(blob, statement, column, size); + } + + static bool read(lms::core::UUID& v, SqlStatement* statement, int column, int size) + { + constexpr auto binarySize{ lms::core::UUID::binarySize }; + UnderlyingType buf; + if (!sql_value_traits::read(buf, statement, column, size) || buf.size() != binarySize) + return false; + + v = lms::core::UUID::fromBytes(std::span{ reinterpret_cast(buf.data()), binarySize }); + return true; + } + }; +} // namespace Wt::Dbo diff --git a/src/libs/database/include/database/objects/Artist.hpp b/src/libs/database/include/database/objects/Artist.hpp index 1d3adbda..8786c15f 100644 --- a/src/libs/database/include/database/objects/Artist.hpp +++ b/src/libs/database/include/database/objects/Artist.hpp @@ -141,8 +141,8 @@ namespace lms::db // Accessors const std::string& getName() const { return _name; } const std::string& getSortName() const { return _sortName; } - std::optional getMBID() const; - bool hasMBID() const; + std::optional getMBID() const { return _mbid; } + bool hasMBID() const { return _mbid.has_value(); } ObjectPtr getPreferredArtwork() const; ArtworkId getPreferredArtworkId() const; @@ -152,7 +152,7 @@ namespace lms::db std::vector>> getClusterGroups(std::span clusterTypeIds, std::size_t size) const; void setName(std::string_view name); - void setMBID(const std::optional& mbid) { _mbid = mbid ? mbid->getAsString() : ""; } + void setMBID(const std::optional& mbid) { _mbid = mbid; } void setSortName(std::string_view sortName); void setPreferredArtwork(ObjectPtr artwork); @@ -174,7 +174,7 @@ namespace lms::db std::string _name; std::string _sortName; - std::string _mbid; // Musicbrainz Identifier + std::optional _mbid; Wt::Dbo::ptr _preferredArtwork; }; diff --git a/src/libs/database/include/database/objects/Release.hpp b/src/libs/database/include/database/objects/Release.hpp index 53eec131..95a0d1ae 100644 --- a/src/libs/database/include/database/objects/Release.hpp +++ b/src/libs/database/include/database/objects/Release.hpp @@ -298,8 +298,8 @@ namespace lms::db // Accessors std::string_view getName() const { return _name; } std::string_view getSortName() const { return _sortName; } - std::optional getMBID() const { return core::UUID::fromString(_MBID); } - std::optional getGroupMBID() const { return core::UUID::fromString(_groupMBID); } + std::optional getMBID() const { return _MBID; } + std::optional getGroupMBID() const { return _groupMBID; } std::optional getTotalDisc() const { return _totalDisc; } // the number of discs this release should have if complete std::chrono::milliseconds getDuration() const; Wt::WDateTime getAddedTime() const; @@ -325,8 +325,8 @@ namespace lms::db // Setters void setName(std::string_view name) { _name = name; } void setSortName(std::string_view sortName) { _sortName = sortName; } - void setMBID(const std::optional& mbid) { _MBID = mbid ? mbid->getAsString() : ""; } - void setGroupMBID(const std::optional& mbid) { _groupMBID = mbid ? mbid->getAsString() : ""; } + void setMBID(const std::optional& mbid) { _MBID = mbid; } + void setGroupMBID(const std::optional& mbid) { _groupMBID = mbid; } void setTotalDisc(std::optional totalDisc) { _totalDisc = totalDisc; } void setArtistDisplayName(std::string_view name) { _artistDisplayName = name; } void clearArtistLinks(); @@ -382,8 +382,8 @@ namespace lms::db std::string _name; std::string _sortName; - std::string _MBID; - std::string _groupMBID; + std::optional _MBID; + std::optional _groupMBID; std::optional _totalDisc{}; std::string _artistDisplayName; bool _isCompilation{}; // See https://picard-docs.musicbrainz.org/en/appendices/tag_mapping.html#compilation-itunes-5 diff --git a/src/libs/database/include/database/objects/Track.hpp b/src/libs/database/include/database/objects/Track.hpp index cc06c373..9be95a2a 100644 --- a/src/libs/database/include/database/objects/Track.hpp +++ b/src/libs/database/include/database/objects/Track.hpp @@ -258,8 +258,8 @@ namespace lms::db void setName(std::string_view name); void setDate(const core::PartialDateTime& date) { _date = date; } void setOriginalDate(const core::PartialDateTime& date) { _originalDate = date; } - void setTrackMBID(const std::optional& MBID) { _trackMBID = MBID ? MBID->getAsString() : ""; } - void setRecordingMBID(const std::optional& MBID) { _recordingMBID = MBID ? MBID->getAsString() : ""; } + void setTrackMBID(const std::optional& MBID) { _trackMBID = MBID; } + void setRecordingMBID(const std::optional& MBID) { _recordingMBID = MBID; } void setCopyright(std::string_view copyright); void setCopyrightURL(std::string_view copyrightURL); void setAdvisory(Advisory advisory) { _advisory = advisory; } @@ -308,8 +308,8 @@ namespace lms::db std::optional getOriginalYear() const; const Wt::WDateTime& getLastWriteTime() const { return _fileLastWrite; } bool hasLyrics() const; - std::optional getTrackMBID() const { return core::UUID::fromString(_trackMBID); } - std::optional getRecordingMBID() const { return core::UUID::fromString(_recordingMBID); } + std::optional getTrackMBID() const { return _trackMBID; } + std::optional getRecordingMBID() const { return _recordingMBID; } std::string_view getCopyright() const; std::string_view getCopyrightURL() const; std::string_view getArtistDisplayName() const { return _artistDisplayName; } @@ -413,8 +413,8 @@ namespace lms::db std::string _name; core::PartialDateTime _date; core::PartialDateTime _originalDate; - std::string _trackMBID; - std::string _recordingMBID; + std::optional _trackMBID; + std::optional _recordingMBID; std::string _copyright; std::string _copyrightURL; std::string _artistDisplayName; diff --git a/src/libs/database/test/Migration.cpp b/src/libs/database/test/Migration.cpp index 522e9097..82c4b00c 100644 --- a/src/libs/database/test/Migration.cpp +++ b/src/libs/database/test/Migration.cpp @@ -20,6 +20,7 @@ #include "Common.hpp" #include "core/String.hpp" +#include "core/UUID.hpp" #include "database/objects/Artist.hpp" #include "database/objects/ArtistInfo.hpp" @@ -289,14 +290,14 @@ CREATE INDEX starred_release_user_scrobbler_idx ON starred_release(user_id,scrob CREATE INDEX starred_track_user_scrobbler_idx ON starred_track(user_id,scrobbler);)" }; const std::string_view createDummyData{ R"( --- Inserting artists +-- Inserting artists (Artist A has a valid UUID MBID to verify round-trip through migration) INSERT INTO artist (version, name, sort_name, mbid) VALUES -(1, 'Artist A', 'Artist A', 'mbid_artist_a'), +(1, 'Artist A', 'Artist A', '550e8400-e29b-41d4-a716-446655440000'), (2, 'Artist B', 'Artist B', 'mbid_artist_b'); --- Inserting releases +-- Inserting releases (Release X has a valid UUID MBID to verify round-trip through migration) INSERT INTO release (version, name, mbid) VALUES -(1, 'Release X', 'mbid_release_x'), +(1, 'Release X', '6ba7b810-9dad-11d1-80b4-00c04fd430c8'), (2, 'Release Y', 'mbid_release_y'); -- Inserting tracks without any associated artists or releases (Orphan Tracks) @@ -381,6 +382,19 @@ VALUES EXPECT_FALSE(TrackLyrics::find(session, TrackLyricsId{})); EXPECT_FALSE(UIState::find(session, UIStateId{})); EXPECT_FALSE(User::find(session, UserId{})); + + // Verify UUID MBID round-trip through V107 migration (TEXT → BLOB) + const auto artistMBID{ core::UUID::fromString("550e8400-e29b-41d4-a716-446655440000") }; + ASSERT_TRUE(artistMBID); + const auto artist{ Artist::find(session, *artistMBID) }; + ASSERT_TRUE(artist); + EXPECT_EQ(artist->getMBID(), artistMBID); + + const auto releaseMBID{ core::UUID::fromString("6ba7b810-9dad-11d1-80b4-00c04fd430c8") }; + ASSERT_TRUE(releaseMBID); + const auto release{ Release::find(session, *releaseMBID) }; + ASSERT_TRUE(release); + EXPECT_EQ(release->getMBID(), releaseMBID); } } } // namespace lms::db::tests \ No newline at end of file diff --git a/src/libs/services/feedback/impl/listenbrainz/FeedbackTypes.cpp b/src/libs/services/feedback/impl/listenbrainz/FeedbackTypes.cpp index 5d231141..89380df8 100644 --- a/src/libs/services/feedback/impl/listenbrainz/FeedbackTypes.cpp +++ b/src/libs/services/feedback/impl/listenbrainz/FeedbackTypes.cpp @@ -25,7 +25,7 @@ namespace lms::feedback::listenBrainz { std::ostream& operator<<(std::ostream& os, const Feedback& feedback) { - os << "created = '" << feedback.created.toString() << "', recording MBID = '" << feedback.recordingMBID.getAsString() << "', score = " << static_cast(feedback.score); + os << "created = '" << feedback.created.toString() << "', recording MBID = '" << feedback.recordingMBID.toString() << "', score = " << static_cast(feedback.score); return os; } } // namespace lms::feedback::listenBrainz diff --git a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp index 0ba352a2..2818ae13 100644 --- a/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp +++ b/src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp @@ -127,7 +127,7 @@ namespace lms::feedback::listenBrainz request.message.addHeader("Authorization", "Token " + listenBrainzToken); Wt::Json::Object root; - root["recording_mbid"] = Wt::Json::Value{ std::string{ recordingMBID->getAsString() } }; + root["recording_mbid"] = Wt::Json::Value{ recordingMBID->toString() }; root["score"] = Wt::Json::Value{ static_cast(type) }; request.message.addBodyText(Wt::Json::serialize(root)); diff --git a/src/libs/services/podcast/impl/steps/Utils.cpp b/src/libs/services/podcast/impl/steps/Utils.cpp index f60adaaa..cdf9ae42 100644 --- a/src/libs/services/podcast/impl/steps/Utils.cpp +++ b/src/libs/services/podcast/impl/steps/Utils.cpp @@ -78,7 +78,7 @@ namespace lms::podcast::utils std::string generateRandomFileName() { - return std::string{ core::UUID::generate().getAsString() }; + return core::UUID::generate().toString(); } void removeFile(const std::filesystem::path& filePath) diff --git a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp index 92a28801..c3c869c7 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp +++ b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp @@ -620,7 +620,7 @@ namespace lms::recommendation db::Artist::find(session, db::Artist::FindParameters{}, [&](const db::Artist::pointer& artist) { const auto mbid{ artist->getMBID() }; // skip "Various Artists" to avoid false artist matches - if (mbid && mbid->getAsString() == "89ad4ac3-39f7-470e-963a-56509c546377") + if (mbid && mbid->toString() == "89ad4ac3-39f7-470e-963a-56509c546377") return; std::unordered_set artistTrackIds; diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp index 86540518..5e4476a8 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp +++ b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp @@ -144,7 +144,7 @@ namespace lms::recommendation db::Artist::find(session, db::Artist::FindParameters{}, [&](const db::Artist::pointer& artist) { const auto mbid{ artist->getMBID() }; // skip "Various Artists" to avoid false artist matches - if (mbid && mbid->getAsString() == "89ad4ac3-39f7-470e-963a-56509c546377") + if (mbid && mbid->toString() == "89ad4ac3-39f7-470e-963a-56509c546377") return; std::unordered_set artistTrackIds; diff --git a/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp b/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp index 2a8ff7c7..83d036b6 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepArtistReconciliation.cpp @@ -46,7 +46,7 @@ namespace lms::scanner { os << "'" << artist->getName() << "'"; if (const auto mbid{ artist->getMBID() }) - os << " [" << mbid->getAsString() << "]"; + os << " [" << mbid->toString() << "]"; return os; } diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp index c5d9bf13..fec80a73 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp @@ -94,7 +94,7 @@ namespace lms::scanner db::Image::pointer image; // Find anywhere, since it is supposed to be unique! - db::Image::find(session, db::Image::FindParameters{}.setFileStem(mbid.getAsString()), [&](const db::Image::pointer foundImg) { + db::Image::find(session, db::Image::FindParameters{}.setFileStem(mbid.toString()), [&](const db::Image::pointer foundImg) { if (!image) image = foundImg; }); diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp index 341366a7..749d041d 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp @@ -90,7 +90,7 @@ namespace lms::scanner if (mbid) { // Find anywhere, since it is suppoed to be unique! - db::Image::find(session, db::Image::FindParameters{}.setFileStem(mbid->getAsString()), [&](const db::Image::pointer& image) { + db::Image::find(session, db::Image::FindParameters{}.setFileStem(mbid->toString()), [&](const db::Image::pointer& image) { if (!artwork) artwork = db::Artwork::find(session, image->getId()); }); diff --git a/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp index 3b236cd7..8c3aafae 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepCheckForDuplicatedFiles.cpp @@ -50,7 +50,7 @@ namespace lms::scanner const Track::pointer track{ Track::find(session, trackId) }; if (auto trackMBID{ track->getTrackMBID() }) { - LMS_LOG(DBUPDATER, INFO, "Found duplicated track MBID [" << trackMBID->getAsString() << "], file: " << track->getAbsoluteFilePath().string() << " - " << track->getName()); + LMS_LOG(DBUPDATER, INFO, "Found duplicated track MBID [" << trackMBID->toString() << "], file: " << track->getAbsoluteFilePath().string() << " - " << track->getName()); context.stats.duplicates.emplace_back(ScanDuplicate{ track->getId(), DuplicateReason::SameTrackMBID }); context.currentStepStats.processedElems++; _progressCallback(context.currentStepStats); diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.cpp index 322ae5f0..d1092c54 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListenTypes.cpp @@ -31,9 +31,9 @@ namespace lms::scrobbling::listenBrainz if (listen.trackNumber) os << ", trackNumber = " << *listen.trackNumber; if (listen.trackMBID) - os << ", trackMBID = '" << listen.trackMBID->getAsString() << "'"; + os << ", trackMBID = '" << listen.trackMBID->toString() << "'"; if (listen.recordingMBID) - os << ", recordingMBID = '" << listen.recordingMBID->getAsString() << "'"; + os << ", recordingMBID = '" << listen.recordingMBID->toString() << "'"; return os; } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp index 62da3092..ac271a80 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp @@ -89,9 +89,9 @@ namespace lms::scrobbling::listenBrainz if (const auto release{ track->getRelease() }) { if (auto MBID{ release->getMBID() }) - additionalInfo["release_mbid"] = Wt::Json::Value{ std::string{ MBID->getAsString() } }; + additionalInfo["release_mbid"] = Wt::Json::Value{ MBID->toString() }; if (auto groupMBID{ release->getGroupMBID() }) - additionalInfo["release_group_mbid"] = Wt::Json::Value{ std::string{ groupMBID->getAsString() } }; + additionalInfo["release_group_mbid"] = Wt::Json::Value{ groupMBID->toString() }; } { @@ -99,7 +99,7 @@ namespace lms::scrobbling::listenBrainz for (const Artist& artist : artists) { if (artist.mbid) - artistMBIDs.push_back(Wt::Json::Value{ std::string{ artist.mbid->getAsString() } }); + artistMBIDs.push_back(Wt::Json::Value{ artist.mbid->toString() }); } if (!artistMBIDs.empty()) @@ -107,10 +107,10 @@ namespace lms::scrobbling::listenBrainz } if (auto MBID{ track->getTrackMBID() }) - additionalInfo["track_mbid"] = Wt::Json::Value{ std::string{ MBID->getAsString() } }; + additionalInfo["track_mbid"] = Wt::Json::Value{ MBID->toString() }; if (auto MBID{ track->getRecordingMBID() }) - additionalInfo["recording_mbid"] = Wt::Json::Value{ std::string{ MBID->getAsString() } }; + additionalInfo["recording_mbid"] = Wt::Json::Value{ MBID->toString() }; if (const std::optional trackNumber{ track->getTrackNumber() }) additionalInfo["tracknumber"] = Wt::Json::Value{ static_cast(*trackNumber) }; diff --git a/src/libs/services/scrobbling/test/Listenbrainz.cpp b/src/libs/services/scrobbling/test/Listenbrainz.cpp index 3b585d0d..8be3a0bc 100644 --- a/src/libs/services/scrobbling/test/Listenbrainz.cpp +++ b/src/libs/services/scrobbling/test/Listenbrainz.cpp @@ -60,18 +60,18 @@ namespace lms::scrobbling::listenBrainz::tests EXPECT_EQ(result.listens[0].releaseName, "Petal"); EXPECT_EQ(result.listens[0].artistName, "Broke For Free"); ASSERT_TRUE(result.listens[0].recordingMBID.has_value()); - EXPECT_EQ(result.listens[0].recordingMBID->getAsString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30"); + EXPECT_EQ(result.listens[0].recordingMBID->toString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30"); ASSERT_TRUE(result.listens[0].releaseMBID.has_value()); - EXPECT_EQ(result.listens[0].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc"); + EXPECT_EQ(result.listens[0].releaseMBID->toString(), "44915500-fbb9-4060-98ce-59a57a429edc"); EXPECT_EQ(result.listens[0].trackNumber, 5); EXPECT_EQ(result.listens[1].trackName, "Melt"); EXPECT_EQ(result.listens[1].releaseName, "Petal"); EXPECT_EQ(result.listens[1].artistName, "Broke For Free"); ASSERT_TRUE(result.listens[1].recordingMBID.has_value()); - EXPECT_EQ(result.listens[1].recordingMBID->getAsString(), "d89d042c-8cc1-4526-9080-5bab728ee15f"); + EXPECT_EQ(result.listens[1].recordingMBID->toString(), "d89d042c-8cc1-4526-9080-5bab728ee15f"); ASSERT_TRUE(result.listens[1].releaseMBID.has_value()); - EXPECT_EQ(result.listens[1].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc"); + EXPECT_EQ(result.listens[1].releaseMBID->toString(), "44915500-fbb9-4060-98ce-59a57a429edc"); EXPECT_EQ(result.listens[1].trackNumber, 4); } @@ -84,9 +84,9 @@ namespace lms::scrobbling::listenBrainz::tests EXPECT_EQ(result.listens[0].releaseName, "Petal"); EXPECT_EQ(result.listens[0].artistName, "Broke For Free"); ASSERT_TRUE(result.listens[0].recordingMBID.has_value()); - EXPECT_EQ(result.listens[0].recordingMBID->getAsString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30"); + EXPECT_EQ(result.listens[0].recordingMBID->toString(), "46ae879f-2dbe-46d3-99ad-05c116f97a30"); ASSERT_TRUE(result.listens[0].releaseMBID.has_value()); - EXPECT_EQ(result.listens[0].releaseMBID->getAsString(), "44915500-fbb9-4060-98ce-59a57a429edc"); + EXPECT_EQ(result.listens[0].releaseMBID->toString(), "44915500-fbb9-4060-98ce-59a57a429edc"); EXPECT_EQ(result.listens[0].trackNumber, 5); } diff --git a/src/libs/subsonic/impl/endpoints/Browsing.cpp b/src/libs/subsonic/impl/endpoints/Browsing.cpp index 5092e535..98c55b5e 100644 --- a/src/libs/subsonic/impl/endpoints/Browsing.cpp +++ b/src/libs/subsonic/impl/endpoints/Browsing.cpp @@ -561,10 +561,10 @@ namespace lms::api::subsonic switch (context.getResponseFormat()) { case ResponseFormat::json: - artistInfoNode.setAttribute("musicBrainzId", artistMBID->getAsString()); + artistInfoNode.setAttribute("musicBrainzId", artistMBID->toString()); break; case ResponseFormat::xml: - artistInfoNode.createChild("musicBrainzId").setValue(artistMBID->getAsString()); + artistInfoNode.createChild("musicBrainzId").setValue(artistMBID->toString()); break; } } diff --git a/src/libs/subsonic/impl/endpoints/Transcoding.cpp b/src/libs/subsonic/impl/endpoints/Transcoding.cpp index b9112e5b..2ef4bc08 100644 --- a/src/libs/subsonic/impl/endpoints/Transcoding.cpp +++ b/src/libs/subsonic/impl/endpoints/Transcoding.cpp @@ -108,7 +108,7 @@ namespace lms::api::subsonic const core::UUID uuid{ getTranscodeDecisionTracker().add(audioFileId, transcodeRes.targetStreamInfo) }; transcodeNode.addChild("transcodeStream", createStreamDetails(transcodeRes.targetStreamInfo)); - transcodeNode.setAttribute("transcodeParams", uuid.getAsString()); + transcodeNode.setAttribute("transcodeParams", uuid.toString()); }, [&](const detail::FailureResult& failureRes) { transcodeNode.setAttribute("canDirectPlay", false); diff --git a/src/libs/subsonic/impl/responses/Album.cpp b/src/libs/subsonic/impl/responses/Album.cpp index 3baf3bd2..7d7fa1d6 100644 --- a/src/libs/subsonic/impl/responses/Album.cpp +++ b/src/libs/subsonic/impl/responses/Album.cpp @@ -165,7 +165,7 @@ namespace lms::api::subsonic { std::optional mbid{ release->getMBID() }; - albumNode.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : ""); + albumNode.setAttribute("musicBrainzId", mbid ? mbid->toString() : ""); } auto addClusters{ [&](Response::Node::Key field, std::string_view clusterTypeName) { diff --git a/src/libs/subsonic/impl/responses/AlbumInfo.cpp b/src/libs/subsonic/impl/responses/AlbumInfo.cpp index e58b07c7..3831d324 100644 --- a/src/libs/subsonic/impl/responses/AlbumInfo.cpp +++ b/src/libs/subsonic/impl/responses/AlbumInfo.cpp @@ -34,10 +34,10 @@ namespace lms::api::subsonic switch (context.getResponseFormat()) { case ResponseFormat::json: - albumInfo.setAttribute("musicBrainzId", releaseMBID->getAsString()); + albumInfo.setAttribute("musicBrainzId", releaseMBID->toString()); break; case ResponseFormat::xml: - albumInfo.createChild("musicBrainzId").setValue(releaseMBID->getAsString()); + albumInfo.createChild("musicBrainzId").setValue(releaseMBID->toString()); break; } } diff --git a/src/libs/subsonic/impl/responses/Artist.cpp b/src/libs/subsonic/impl/responses/Artist.cpp index 577d97c7..297e6ad0 100644 --- a/src/libs/subsonic/impl/responses/Artist.cpp +++ b/src/libs/subsonic/impl/responses/Artist.cpp @@ -102,7 +102,7 @@ namespace lms::api::subsonic { std::optional mbid{ artist->getMBID() }; - artistNode.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : ""); + artistNode.setAttribute("musicBrainzId", mbid ? mbid->toString() : ""); } artistNode.setAttribute("sortName", artist->getSortName()); diff --git a/src/libs/subsonic/impl/responses/Song.cpp b/src/libs/subsonic/impl/responses/Song.cpp index c20a0de0..fb8c7281 100644 --- a/src/libs/subsonic/impl/responses/Song.cpp +++ b/src/libs/subsonic/impl/responses/Song.cpp @@ -192,7 +192,7 @@ namespace lms::api::subsonic { std::optional mbid{ track->getRecordingMBID() }; - trackResponse.setAttribute("musicBrainzId", mbid ? mbid->getAsString() : ""); + trackResponse.setAttribute("musicBrainzId", mbid ? mbid->toString() : ""); } { diff --git a/src/lms/ui/Utils.cpp b/src/lms/ui/Utils.cpp index a5425d9e..4ac236a5 100644 --- a/src/lms/ui/Utils.cpp +++ b/src/lms/ui/Utils.cpp @@ -59,7 +59,7 @@ namespace lms::ui::utils Wt::WLink createArtistLink(const db::Artist::pointer& artist) { if (const auto mbid{ artist->getMBID() }) - return Wt::WLink{ Wt::LinkType::InternalPath, "/artist/mbid/" + std::string{ mbid->getAsString() } }; + return Wt::WLink{ Wt::LinkType::InternalPath, "/artist/mbid/" + mbid->toString() }; else return Wt::WLink{ Wt::LinkType::InternalPath, "/artist/" + artist->getId().toString() }; } @@ -229,7 +229,7 @@ namespace lms::ui::utils Wt::WLink createReleaseLink(db::Release::pointer release) { if (const auto mbid{ release->getMBID() }) - return Wt::WLink{ Wt::LinkType::InternalPath, "/release/mbid/" + std::string{ mbid->getAsString() } }; + return Wt::WLink{ Wt::LinkType::InternalPath, "/release/mbid/" + mbid->toString() }; return Wt::WLink{ Wt::LinkType::InternalPath, "/release/" + release->getId().toString() }; } diff --git a/src/lms/ui/admin/ScannerReportResource.cpp b/src/lms/ui/admin/ScannerReportResource.cpp index 8a1c369a..acc4bfbd 100644 --- a/src/lms/ui/admin/ScannerReportResource.cpp +++ b/src/lms/ui/admin/ScannerReportResource.cpp @@ -150,7 +150,7 @@ namespace lms::ui response.out() << track->getAbsoluteFilePath().string(); if (auto mbid{ track->getTrackMBID() }) - response.out() << " (Track MBID " << mbid->getAsString() << ")"; + response.out() << " (Track MBID " << mbid->toString() << ")"; response.out() << " - " << duplicateReasonToWString(duplicate.reason).toUTF8() << '\n'; } diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp index 9af91ce6..74cbed9f 100644 --- a/src/lms/ui/admin/UserView.cpp +++ b/src/lms/ui/admin/UserView.cpp @@ -107,7 +107,7 @@ namespace lms::ui user.modify()->setType(db::UserType::DEMO); // For demo user, we create the subsonic API auth token now as we have no other mean to create it later - core::Service::get()->createAuthToken("subsonic", user->getId(), core::UUID::generate().getAsString()); + core::Service::get()->createAuthToken("subsonic", user->getId(), core::UUID::generate().toString()); } if (_authPasswordService) diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index e1bea7e0..8883fbd7 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -393,7 +393,7 @@ namespace lms::ui if (mbid) { setCondition("if-has-mbid", true); - bindString("mbid-link", std::string{ "https://musicbrainz.org/artist/" } + std::string{ mbid->getAsString() }); + bindString("mbid-link", "https://musicbrainz.org/artist/" + mbid->toString()); } } diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index 9f1455d6..d11ed45c 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -554,7 +554,7 @@ namespace lms::ui if (mbid) { setCondition("if-has-mbid", true); - bindString("mbid-link", std::string{ "https://musicbrainz.org/release/" } + std::string{ mbid->getAsString() }); + bindString("mbid-link", "https://musicbrainz.org/release/" + mbid->toString()); } } diff --git a/src/lms/ui/settings/SubsonicSettingsView.cpp b/src/lms/ui/settings/SubsonicSettingsView.cpp index 97ad929c..27cc51e5 100644 --- a/src/lms/ui/settings/SubsonicSettingsView.cpp +++ b/src/lms/ui/settings/SubsonicSettingsView.cpp @@ -225,7 +225,7 @@ namespace lms::ui } auto doGenerate{ [subsonicTokenPtr, updateKeyButtonStates] { - const std::string newToken{ core::UUID::generate().getAsString() }; + const std::string newToken{ core::UUID::generate().toString() }; { auto transaction{ LmsApp->getDbSession().createWriteTransaction() }; auto& authService{ *core::Service::get() }; diff --git a/src/tools/db-generator/LmsDbGenerator.cpp b/src/tools/db-generator/LmsDbGenerator.cpp index f1c0a5bf..0d2a8054 100644 --- a/src/tools/db-generator/LmsDbGenerator.cpp +++ b/src/tools/db-generator/LmsDbGenerator.cpp @@ -78,14 +78,14 @@ namespace lms db::Cluster::pointer generateCluster(db::Session& session, db::ClusterType::pointer clusterType) { - const std::string clusterName{ std::string{ clusterType->getName() } + "-" + std::string{ core::UUID::generate().getAsString() } }; + const std::string clusterName{ std::string{ clusterType->getName() } + "-" + core::UUID::generate().toString() }; return session.create(clusterType, clusterName); } db::Artist::pointer generateArtist(db::Session& session) { const core::UUID artistMBID{ core::UUID::generate() }; - const std::string artistName{ "Artist-" + std::string{ core::UUID::generate().getAsString() } }; + const std::string artistName{ "Artist-" + core::UUID::generate().toString() }; return session.create(artistName, artistMBID); } @@ -94,7 +94,7 @@ namespace lms using namespace db; const core::UUID releaseMBID{ core::UUID::generate() }; - const std::string releaseName{ "Release-" + std::string{ core::UUID::generate().getAsString() } }; + const std::string releaseName{ "Release-" + core::UUID::generate().toString() }; Release::pointer release{ context.session.create(releaseName, releaseMBID) }; Medium::pointer medium{ context.session.create(release) }; medium.modify()->setTrackCount(params.trackCountPerRelease); @@ -113,7 +113,7 @@ namespace lms { Track::pointer track{ context.session.create() }; - track.modify()->setName("Track-" + std::string{ core::UUID::generate().getAsString() }); + track.modify()->setName("Track-" + core::UUID::generate().toString()); track.modify()->setMedium(medium); track.modify()->setTrackNumber(i); track.modify()->setDuration(std::chrono::seconds{ core::random::getRandom(30, 300) }); From 845c437364c08f5b18d2f37f9d3c6e4ccd59d442 Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 13 Jun 2026 23:28:07 +0200 Subject: [PATCH 12/38] Replaced the near similar filter constraint by a duplicate recording mbid one --- .../AudioSimilarityEngine.impl.hpp | 54 +- .../impl/clusters/ClustersEngine.cpp | 21 +- .../impl/clusters/ClustersEngine.hpp | 2 +- .../SameRecordingMBIDConstraint.hpp | 53 ++ .../TrackMetadata.hpp | 8 +- .../recommendation/test/ConstraintsTest.cpp | 736 ++++++++++-------- 6 files changed, 505 insertions(+), 369 deletions(-) create mode 100644 src/libs/services/recommendation/impl/track-selection-constraints/SameRecordingMBIDConstraint.hpp diff --git a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp index c3c869c7..114335ef 100644 --- a/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp +++ b/src/libs/services/recommendation/impl/audio-similarity/AudioSimilarityEngine.impl.hpp @@ -50,10 +50,10 @@ #include "InterpolationFitConstraint.hpp" #include "MaxDistanceConstraint.hpp" -#include "NearDuplicateEmbeddingConstraint.hpp" #include "SmoothTransitionConstraint.hpp" #include "track-selection-constraints/DuplicateTrackConstraint.hpp" #include "track-selection-constraints/SameArtistConstraint.hpp" +#include "track-selection-constraints/SameRecordingMBIDConstraint.hpp" #include "track-selection-constraints/SameReleaseConstraint.hpp" #include "Types.hpp" @@ -121,11 +121,9 @@ namespace lms::recommendation constexpr float smoothTransitionWeight{ 0.2F }; constexpr float sameReleaseWeight{ 0.5F }; constexpr float sameArtistWeight{ 0.5F }; - constexpr float nearDuplicateThreshold{ 0.01F }; - _similarityEvaluator = {}; _similarityEvaluator.addHardConstraint(std::make_unique()); - _similarityEvaluator.addHardConstraint(std::make_unique>(_trackVectors, nearDuplicateThreshold)); + _similarityEvaluator.addHardConstraint(std::make_unique(_trackMetadata)); _similarityEvaluator.addHardConstraint(std::make_unique>(_trackVectors, _trackDistanceThreshold)); _similarityEvaluator.addSoftConstraint(std::make_unique>(_trackVectors), interpolationFitWeight); _similarityEvaluator.addSoftConstraint(std::make_unique>(_trackVectors), smoothTransitionWeight); @@ -134,7 +132,7 @@ namespace lms::recommendation _pathEvaluator = {}; _pathEvaluator.addHardConstraint(std::make_unique()); - _pathEvaluator.addHardConstraint(std::make_unique>(_trackVectors, nearDuplicateThreshold)); + _pathEvaluator.addHardConstraint(std::make_unique(_trackMetadata)); _pathEvaluator.addSoftConstraint(std::make_unique>(_trackVectors), interpolationFitWeight); _pathEvaluator.addSoftConstraint(std::make_unique>(_trackVectors), smoothTransitionWeight); _pathEvaluator.addSoftConstraint(std::make_unique(_trackMetadata), sameReleaseWeight); @@ -595,28 +593,29 @@ namespace lms::recommendation _trackVectors.try_emplace(trackId, &reducedVector); }); - db::Release::find(session, db::Release::FindParameters{}, [&](const db::Release::pointer& release) { - std::vector> releaseTrackFeatures; + db::Track::find(session, db::Track::FindParameters{}, [&](const db::Track::pointer& track) { + const auto itVec{ _trackVectors.find(track->getId()) }; + if (itVec == _trackVectors.cend()) + return; - db::Track::FindParameters params; - params.setRelease(release->getId()); + auto& meta{ _trackMetadata[track->getId()] }; + const db::ReleaseId releaseId{ track->getReleaseId() }; + meta.releaseId = releaseId; + meta.recordingMBID = track->getRecordingMBID(); - const auto trackIds{ db::Track::findIds(session, params) }; - for (const db::TrackId trackId : trackIds.results) - { - const auto itFeatures{ _trackVectors.find(trackId) }; - if (itFeatures != std::cend(_trackVectors)) - { - assert(itFeatures->second); - releaseTrackFeatures.emplace_back(*itFeatures->second); - _trackMetadata[trackId].releaseId = release->getId(); - } - } - - if (!releaseTrackFeatures.empty()) - _releaseVectors.try_emplace(release->getId(), std::move(releaseTrackFeatures)); + if (releaseId.isValid()) + _releaseVectors[releaseId].emplace_back(*itVec->second); }); + math::MedoidCalculator calc; + for (const auto& [id, vecs] : _releaseVectors) + { + calc.clear(); + for (const auto& v : vecs) + calc.add(v.get()); + _releaseMedoids.try_emplace(id, calc.finalize()); + } + db::Artist::find(session, db::Artist::FindParameters{}, [&](const db::Artist::pointer& artist) { const auto mbid{ artist->getMBID() }; // skip "Various Artists" to avoid false artist matches @@ -658,15 +657,6 @@ namespace lms::recommendation _artistVectors.try_emplace(artist->getId(), std::move(artistTrackVectors)); }); - math::MedoidCalculator calc; - for (const auto& [id, vecs] : _releaseVectors) - { - calc.clear(); - for (const auto& v : vecs) - calc.add(v.get()); - _releaseMedoids.try_emplace(id, calc.finalize()); - } - for (const auto& [id, vecs] : _artistVectors) { calc.clear(); diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp index 5e4476a8..8c01c15c 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp +++ b/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "database/IDb.hpp" @@ -39,6 +38,7 @@ #include "track-selection-constraints/DuplicateTrackConstraint.hpp" #include "track-selection-constraints/SameArtistConstraint.hpp" +#include "track-selection-constraints/SameRecordingMBIDConstraint.hpp" #include "track-selection-constraints/SameReleaseConstraint.hpp" #include "track-selection-constraints/TrackCandidateContext.hpp" @@ -103,6 +103,7 @@ namespace lms::recommendation constexpr float sameReleaseWeight{ 0.5F }; constexpr float sameArtistWeight{ 0.5F }; _trackEvaluator.addHardConstraint(std::make_unique()); + _trackEvaluator.addHardConstraint(std::make_unique(_trackMetadata)); _trackEvaluator.addSoftConstraint(std::make_unique(_trackMetadata), sameReleaseWeight); _trackEvaluator.addSoftConstraint(std::make_unique(_trackMetadata), sameArtistWeight); } @@ -122,8 +123,8 @@ namespace lms::recommendation db::Session& session{ _db.getTLSSession() }; auto transaction{ session.createReadTransaction() }; - buildTrackMetadata(session); buildTrackClusters(session); + buildTrackMetadata(session); buildReleaseClusters(); buildArtistClusters(); @@ -134,11 +135,17 @@ namespace lms::recommendation { LOG(DEBUG, "building track metadata..."); - db::Release::find(session, db::Release::FindParameters{}, [&](const db::Release::pointer& release) { - db::Track::FindParameters params; - params.setRelease(release->getId()); - for (const db::TrackId trackId : db::Track::findIds(session, params).results) - _trackMetadata[trackId].releaseId = release->getId(); + // Ensure cluster tracks with no release/artist have an entry + for (const auto& [trackId, _] : _trackClusters) + _trackMetadata.try_emplace(trackId); + + db::Track::find(session, db::Track::FindParameters{}, [&](const db::Track::pointer& track) { + const auto it{ _trackMetadata.find(track->getId()) }; + if (it != _trackMetadata.cend()) + { + it->second.releaseId = track->getReleaseId(); + it->second.recordingMBID = track->getRecordingMBID(); + } }); db::Artist::find(session, db::Artist::FindParameters{}, [&](const db::Artist::pointer& artist) { diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp b/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp index f123c15e..bd46f9ac 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp +++ b/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp @@ -54,8 +54,8 @@ namespace lms::recommendation ArtistResults findSimilarArtists(db::ArtistId artistId, core::EnumSet linkTypes, std::size_t maxCount) const override; TrackResults greedySelect(std::vector candidates, std::vector selectedTracks, std::size_t maxCount) const; - void buildTrackMetadata(db::Session& session); void buildTrackClusters(db::Session& session); + void buildTrackMetadata(db::Session& session); void buildReleaseClusters(); void buildArtistClusters(); diff --git a/src/libs/services/recommendation/impl/track-selection-constraints/SameRecordingMBIDConstraint.hpp b/src/libs/services/recommendation/impl/track-selection-constraints/SameRecordingMBIDConstraint.hpp new file mode 100644 index 00000000..9a76edd7 --- /dev/null +++ b/src/libs/services/recommendation/impl/track-selection-constraints/SameRecordingMBIDConstraint.hpp @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2026 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 "ITrackCandidateHardConstraint.hpp" +#include "TrackMetadata.hpp" + +namespace lms::recommendation +{ + class SameRecordingMBIDConstraint : public ITrackCandidateHardConstraint + { + public: + SameRecordingMBIDConstraint(const TrackMetadataMap& trackMetadata) + : _trackMetadata{ trackMetadata } + { + } + + bool rejects(const TrackCandidateContext& context) const override + { + const auto it{ _trackMetadata.find(context.candidateTrackId) }; + if (it == _trackMetadata.cend() || !it->second.recordingMBID) + return false; + + for (const db::TrackId selectedId : context.selectedTracks) + { + const auto itSel{ _trackMetadata.find(selectedId) }; + if (itSel != _trackMetadata.cend() && itSel->second.recordingMBID == it->second.recordingMBID) + return true; + } + return false; + } + + private: + const TrackMetadataMap& _trackMetadata; + }; +} // namespace lms::recommendation diff --git a/src/libs/services/recommendation/impl/track-selection-constraints/TrackMetadata.hpp b/src/libs/services/recommendation/impl/track-selection-constraints/TrackMetadata.hpp index d2a89b43..88393b7a 100644 --- a/src/libs/services/recommendation/impl/track-selection-constraints/TrackMetadata.hpp +++ b/src/libs/services/recommendation/impl/track-selection-constraints/TrackMetadata.hpp @@ -19,9 +19,11 @@ #pragma once +#include #include #include +#include "core/UUID.hpp" #include "database/objects/ArtistId.hpp" #include "database/objects/ReleaseId.hpp" #include "database/objects/TrackId.hpp" @@ -30,9 +32,9 @@ namespace lms::recommendation { struct TrackMetadata { - db::ReleaseId releaseId; // invalid if track has no release - std::vector artistIds; // sorted; album artists only - // Future: db::MediaLibraryId mediaLibraryId; + db::ReleaseId releaseId; // invalid if track has no release + std::vector artistIds; // sorted, album artists only + std::optional recordingMBID; // absent if track has no recording MBID }; using TrackMetadataMap = std::unordered_map; diff --git a/src/libs/services/recommendation/test/ConstraintsTest.cpp b/src/libs/services/recommendation/test/ConstraintsTest.cpp index 4d9cc9b9..f9fc7b38 100644 --- a/src/libs/services/recommendation/test/ConstraintsTest.cpp +++ b/src/libs/services/recommendation/test/ConstraintsTest.cpp @@ -24,390 +24,474 @@ #include "database/objects/TrackId.hpp" #include "math/Vector.hpp" +#include "core/UUID.hpp" + #include "audio-similarity/InterpolationFitConstraint.hpp" #include "audio-similarity/MaxDistanceConstraint.hpp" #include "audio-similarity/NearDuplicateEmbeddingConstraint.hpp" #include "audio-similarity/SmoothTransitionConstraint.hpp" #include "track-selection-constraints/DuplicateTrackConstraint.hpp" #include "track-selection-constraints/SameArtistConstraint.hpp" +#include "track-selection-constraints/SameRecordingMBIDConstraint.hpp" #include "track-selection-constraints/SameReleaseConstraint.hpp" #include "track-selection-constraints/TrackCandidateContext.hpp" #include "track-selection-constraints/TrackCandidateEvaluator.hpp" #include "track-selection-constraints/TrackMetadata.hpp" -using namespace lms; -using namespace lms::recommendation; - -namespace +namespace lms::recommendation::tests { - const db::TrackId T1{ 1 }; - const db::TrackId T2{ 2 }; - const db::TrackId T3{ 3 }; - const db::TrackId T4{ 4 }; + namespace + { + const db::TrackId T1{ 1 }; + const db::TrackId T2{ 2 }; + const db::TrackId T3{ 3 }; + const db::TrackId T4{ 4 }; - const db::ArtistId A1{ 10 }; - const db::ArtistId A2{ 20 }; + const db::ArtistId A1{ 10 }; + const db::ArtistId A2{ 20 }; - const db::ReleaseId R1{ 100 }; - const db::ReleaseId R2{ 200 }; -} // namespace + const db::ReleaseId R1{ 100 }; + const db::ReleaseId R2{ 200 }; + } // namespace -TEST(DuplicateTrackConstraint, acceptsNewCandidate) -{ - const std::vector selected{ T1, T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T3, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(DuplicateTrackConstraint{}.rejects(ctx)); -} + TEST(DuplicateTrackConstraint, acceptsNewCandidate) + { + const std::vector selected{ T1, T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T3, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(DuplicateTrackConstraint{}.rejects(ctx)); + } -TEST(DuplicateTrackConstraint, rejectsAlreadySelected) -{ - const std::vector selected{ T1, T2, T3 }; - const TrackCandidateContext ctx{ .candidateTrackId = T2, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_TRUE(DuplicateTrackConstraint{}.rejects(ctx)); -} + TEST(DuplicateTrackConstraint, rejectsAlreadySelected) + { + const std::vector selected{ T1, T2, T3 }; + const TrackCandidateContext ctx{ .candidateTrackId = T2, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_TRUE(DuplicateTrackConstraint{}.rejects(ctx)); + } -TEST(DuplicateTrackConstraint, acceptsWhenSelectionEmpty) -{ - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FALSE(DuplicateTrackConstraint{}.rejects(ctx)); -} + TEST(DuplicateTrackConstraint, acceptsWhenSelectionEmpty) + { + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FALSE(DuplicateTrackConstraint{}.rejects(ctx)); + } -TEST(SameArtistConstraint, zeroScoreWhenNoSharedArtist) -{ - const TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, - }; - const SameArtistConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SameArtistConstraint, zeroScoreWhenNoSharedArtist) + { + const TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = { A1 } } }, + { T2, { .releaseId = {}, .artistIds = { A2 } } }, + }; + const SameArtistConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SameArtistConstraint, fullScoreWhenMostRecentMatchesArtist) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A1 } } }, - }; - const SameArtistConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + TEST(SameArtistConstraint, fullScoreWhenMostRecentMatchesArtist) + { + TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = { A1 } } }, + { T2, { .releaseId = {}, .artistIds = { A1 } } }, + }; + const SameArtistConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 1.F); -} + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 1.F); + } -TEST(SameArtistConstraint, halfScoreWhenSecondMostRecentMatchesArtist) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, - { T3, { .releaseId = {}, .artistIds = { A1 } } }, - }; - const SameArtistConstraint constraint{ meta }; + TEST(SameArtistConstraint, halfScoreWhenSecondMostRecentMatchesArtist) + { + TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = { A1 } } }, + { T2, { .releaseId = {}, .artistIds = { A2 } } }, + { T3, { .releaseId = {}, .artistIds = { A1 } } }, + }; + const SameArtistConstraint constraint{ meta }; - const std::vector selected{ T3, T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + const std::vector selected{ T3, T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); -} + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); + } -TEST(SameArtistConstraint, trackOutsideWindowIsIgnored) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, - { T3, { .releaseId = {}, .artistIds = { A1 } } }, - }; - const SameArtistConstraint constraint{ meta, /*window=*/1 }; + TEST(SameArtistConstraint, trackOutsideWindowIsIgnored) + { + TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = { A1 } } }, + { T2, { .releaseId = {}, .artistIds = { A2 } } }, + { T3, { .releaseId = {}, .artistIds = { A1 } } }, + }; + const SameArtistConstraint constraint{ meta, /*window=*/1 }; - const std::vector selected{ T3, T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + const std::vector selected{ T3, T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SameArtistConstraint, zeroScoreWhenCandidateNotInMap) -{ - const TrackMetadataMap meta{}; - const SameArtistConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SameArtistConstraint, zeroScoreWhenCandidateNotInMap) + { + const TrackMetadataMap meta{}; + const SameArtistConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SameReleaseConstraint, zeroScoreWhenNoSharedRelease) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R2, .artistIds = {} } }, - }; - const SameReleaseConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SameReleaseConstraint, zeroScoreWhenNoSharedRelease) + { + TrackMetadataMap meta{ + { T1, { .releaseId = R1, .artistIds = {} } }, + { T2, { .releaseId = R2, .artistIds = {} } }, + }; + const SameReleaseConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SameReleaseConstraint, fullScoreWhenMostRecentMatchesRelease) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, - }; - const SameReleaseConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 1.F); -} + TEST(SameReleaseConstraint, fullScoreWhenMostRecentMatchesRelease) + { + TrackMetadataMap meta{ + { T1, { .releaseId = R1, .artistIds = {} } }, + { T2, { .releaseId = R1, .artistIds = {} } }, + }; + const SameReleaseConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 1.F); + } -TEST(SameReleaseConstraint, zeroScoreWhenCandidateHasNoRelease) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, - }; - const SameReleaseConstraint constraint{ meta }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SameReleaseConstraint, zeroScoreWhenCandidateHasNoRelease) + { + TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = {} } }, + { T2, { .releaseId = R1, .artistIds = {} } }, + }; + const SameReleaseConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(TrackCandidateEvaluator, hardConstraintRejects) -{ - TrackCandidateEvaluator evaluator; - evaluator.addHardConstraint(std::make_unique()); + TEST(TrackCandidateEvaluator, hardConstraintRejects) + { + TrackCandidateEvaluator evaluator; + evaluator.addHardConstraint(std::make_unique()); - const std::vector selected{ T1 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_TRUE(evaluator.rejects(ctx)); -} + const std::vector selected{ T1 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_TRUE(evaluator.rejects(ctx)); + } -TEST(TrackCandidateEvaluator, noHardConstraintDoesNotReject) -{ - TrackCandidateEvaluator evaluator; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FALSE(evaluator.rejects(ctx)); -} + TEST(TrackCandidateEvaluator, noHardConstraintDoesNotReject) + { + TrackCandidateEvaluator evaluator; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FALSE(evaluator.rejects(ctx)); + } -TEST(TrackCandidateEvaluator, softConstraintScoreIsWeighted) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, - }; - TrackCandidateEvaluator evaluator; - evaluator.addSoftConstraint(std::make_unique(meta), 2.F); + TEST(TrackCandidateEvaluator, softConstraintScoreIsWeighted) + { + TrackMetadataMap meta{ + { T1, { .releaseId = R1, .artistIds = {} } }, + { T2, { .releaseId = R1, .artistIds = {} } }, + }; + TrackCandidateEvaluator evaluator; + evaluator.addSoftConstraint(std::make_unique(meta), 2.F); - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(evaluator.score(ctx), 2.F); -} + EXPECT_FLOAT_EQ(evaluator.score(ctx), 2.F); + } -TEST(TrackCandidateEvaluator, multipleSoftConstraintsAreAccumulated) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = { A1 } } }, - { T2, { .releaseId = R1, .artistIds = { A1 } } }, - }; - TrackCandidateEvaluator evaluator; - evaluator.addSoftConstraint(std::make_unique(meta), 1.F); - evaluator.addSoftConstraint(std::make_unique(meta), 1.F); + TEST(TrackCandidateEvaluator, multipleSoftConstraintsAreAccumulated) + { + TrackMetadataMap meta{ + { T1, { .releaseId = R1, .artistIds = { A1 } } }, + { T2, { .releaseId = R1, .artistIds = { A1 } } }, + }; + TrackCandidateEvaluator evaluator; + evaluator.addSoftConstraint(std::make_unique(meta), 1.F); + evaluator.addSoftConstraint(std::make_unique(meta), 1.F); - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(evaluator.score(ctx), 2.F); -} + EXPECT_FLOAT_EQ(evaluator.score(ctx), 2.F); + } -TEST(TrackCandidateEvaluator, hardConstraintPassesEvenWithSoftConstraints) -{ - TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, - }; - TrackCandidateEvaluator evaluator; - evaluator.addHardConstraint(std::make_unique()); - evaluator.addSoftConstraint(std::make_unique(meta), 1.F); + TEST(TrackCandidateEvaluator, hardConstraintPassesEvenWithSoftConstraints) + { + TrackMetadataMap meta{ + { T1, { .releaseId = R1, .artistIds = {} } }, + { T2, { .releaseId = R1, .artistIds = {} } }, + }; + TrackCandidateEvaluator evaluator; + evaluator.addHardConstraint(std::make_unique()); + evaluator.addSoftConstraint(std::make_unique(meta), 1.F); - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(evaluator.rejects(ctx)); - EXPECT_FLOAT_EQ(evaluator.score(ctx), 1.F); -} + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(evaluator.rejects(ctx)); + EXPECT_FLOAT_EQ(evaluator.score(ctx), 1.F); + } -namespace -{ - using TestVec = math::Vector<2, float>; - const TestVec v_x{ 1.F, 0.F }; - const TestVec v_y{ 0.F, 1.F }; + namespace + { + using TestVec = math::Vector<2, float>; + const TestVec v_x{ 1.F, 0.F }; + const TestVec v_y{ 0.F, 1.F }; - using TestConstraint = NearDuplicateEmbeddingConstraint<2>; - using TestVectorMap = TestConstraint::TrackVectorMap; -} // namespace + using TestConstraint = NearDuplicateEmbeddingConstraint<2>; + using TestVectorMap = TestConstraint::TrackVectorMap; + } // namespace -TEST(NearDuplicateEmbeddingConstraint, acceptsWhenCandidateNotInMap) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T1 }; - const TrackCandidateContext ctx{ .candidateTrackId = T2, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, acceptsWhenCandidateNotInMap) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T1 }; + const TrackCandidateContext ctx{ .candidateTrackId = T2, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, acceptsWhenSelectionEmpty) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, acceptsWhenSelectionEmpty) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, acceptsWhenSelectedTrackNotInMap) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, acceptsWhenSelectedTrackNotInMap) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, rejectsWhenDistanceBelowThreshold) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_TRUE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, rejectsWhenDistanceBelowThreshold) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_TRUE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, acceptsWhenDistanceAboveThreshold) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, acceptsWhenDistanceAboveThreshold) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, rejectsWhenOneOfManySelectedIsNearDuplicate) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T3, &v_y }, { T4, &v_x } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T3, T4 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_TRUE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, rejectsWhenOneOfManySelectedIsNearDuplicate) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T3, &v_y }, { T4, &v_x } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T3, T4 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_TRUE(constraint.rejects(ctx)); + } -TEST(NearDuplicateEmbeddingConstraint, acceptsWhenAllSelectedAreFarEnough) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y }, { T3, &v_y } }; - const TestConstraint constraint{ trackVectors, 0.1F }; - const std::vector selected{ T2, T3 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(NearDuplicateEmbeddingConstraint, acceptsWhenAllSelectedAreFarEnough) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y }, { T3, &v_y } }; + const TestConstraint constraint{ trackVectors, 0.1F }; + const std::vector selected{ T2, T3 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(InterpolationFitConstraint, zeroScoreWhenNoSeeds) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const InterpolationFitConstraint<2> constraint{ trackVectors }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(InterpolationFitConstraint, zeroScoreWhenNoSeeds) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const InterpolationFitConstraint<2> constraint{ trackVectors }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(InterpolationFitConstraint, zeroScoreWhenCandidateMatchesSeed) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; - const InterpolationFitConstraint<2> constraint{ trackVectors }; - const std::vector seeds{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(InterpolationFitConstraint, zeroScoreWhenCandidateMatchesSeed) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; + const InterpolationFitConstraint<2> constraint{ trackVectors }; + const std::vector seeds{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(InterpolationFitConstraint, halfScoreWhenCandidateOrthogonalToSeed) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; - const InterpolationFitConstraint<2> constraint{ trackVectors }; - const std::vector seeds{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); -} + TEST(InterpolationFitConstraint, halfScoreWhenCandidateOrthogonalToSeed) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; + const InterpolationFitConstraint<2> constraint{ trackVectors }; + const std::vector seeds{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); + } -TEST(InterpolationFitConstraint, usesClosestSeed) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x }, { T3, &v_y } }; - const InterpolationFitConstraint<2> constraint{ trackVectors }; - const std::vector seeds{ T3, T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(InterpolationFitConstraint, usesClosestSeed) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x }, { T3, &v_y } }; + const InterpolationFitConstraint<2> constraint{ trackVectors }; + const std::vector seeds{ T3, T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(MaxDistanceConstraint, acceptsWhenNoSeeds) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(MaxDistanceConstraint, acceptsWhenNoSeeds) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(MaxDistanceConstraint, acceptsWhenWithinThresholdOfOneSeed) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; - const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; - const std::vector seeds{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(MaxDistanceConstraint, acceptsWhenWithinThresholdOfOneSeed) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; + const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; + const std::vector seeds{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(MaxDistanceConstraint, rejectsWhenBeyondThresholdFromAllSeeds) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; - const MaxDistanceConstraint<2> constraint{ trackVectors, 0.1F }; - const std::vector seeds{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_TRUE(constraint.rejects(ctx)); -} + TEST(MaxDistanceConstraint, rejectsWhenBeyondThresholdFromAllSeeds) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; + const MaxDistanceConstraint<2> constraint{ trackVectors, 0.1F }; + const std::vector seeds{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_TRUE(constraint.rejects(ctx)); + } -TEST(MaxDistanceConstraint, acceptsWhenAnyOfManySeedsIsCloseEnough) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y }, { T3, &v_x } }; - const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; - const std::vector seeds{ T2, T3 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; - EXPECT_FALSE(constraint.rejects(ctx)); -} + TEST(MaxDistanceConstraint, acceptsWhenAnyOfManySeedsIsCloseEnough) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y }, { T3, &v_x } }; + const MaxDistanceConstraint<2> constraint{ trackVectors, 0.5F }; + const std::vector seeds{ T2, T3 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = seeds }; + EXPECT_FALSE(constraint.rejects(ctx)); + } -TEST(SmoothTransitionConstraint, zeroScoreWhenNoSelectedTracks) -{ - const TestVectorMap trackVectors{ { T1, &v_x } }; - const SmoothTransitionConstraint<2> constraint{ trackVectors }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SmoothTransitionConstraint, zeroScoreWhenNoSelectedTracks) + { + const TestVectorMap trackVectors{ { T1, &v_x } }; + const SmoothTransitionConstraint<2> constraint{ trackVectors }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SmoothTransitionConstraint, zeroScoreWhenPreviousMatchesCandidate) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; - const SmoothTransitionConstraint<2> constraint{ trackVectors }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SmoothTransitionConstraint, zeroScoreWhenPreviousMatchesCandidate) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x } }; + const SmoothTransitionConstraint<2> constraint{ trackVectors }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } -TEST(SmoothTransitionConstraint, halfScoreWhenPreviousOrthogonalToCandidate) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; - const SmoothTransitionConstraint<2> constraint{ trackVectors }; - const std::vector selected{ T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); -} + TEST(SmoothTransitionConstraint, halfScoreWhenPreviousOrthogonalToCandidate) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_y } }; + const SmoothTransitionConstraint<2> constraint{ trackVectors }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.5F); + } -TEST(SmoothTransitionConstraint, usesMostRecentlySelectedTrack) -{ - const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x }, { T3, &v_y } }; - const SmoothTransitionConstraint<2> constraint{ trackVectors }; - const std::vector selected{ T3, T2 }; - const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; - EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); -} + TEST(SmoothTransitionConstraint, usesMostRecentlySelectedTrack) + { + const TestVectorMap trackVectors{ { T1, &v_x }, { T2, &v_x }, { T3, &v_y } }; + const SmoothTransitionConstraint<2> constraint{ trackVectors }; + const std::vector selected{ T3, T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FLOAT_EQ(constraint.computeScore(ctx), 0.F); + } + + namespace + { + const core::UUID MBID1{ *core::UUID::fromString("3d2508f7-3a7e-4f25-895c-fca079dd71ce") }; + const core::UUID MBID2{ *core::UUID::fromString("8e44e4ea-9bce-47c2-a48c-8aa338242fb2") }; + } // namespace + + TEST(SameRecordingMBIDConstraint, acceptsWhenCandidateNotInMap) + { + const TrackMetadataMap meta{ { T2, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } } }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, acceptsWhenCandidateHasNoMBID) + { + const TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = std::nullopt } }, + { T2, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } }, + }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, acceptsWhenSelectionEmpty) + { + const TrackMetadataMap meta{ { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } } }; + const SameRecordingMBIDConstraint constraint{ meta }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = {}, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, acceptsWhenNoneOfSelectedHasSameMBID) + { + const TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } }, + { T2, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID2 } }, + }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, rejectsWhenOneOfSelectedHasSameMBID) + { + const TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } }, + { T2, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID2 } }, + { T3, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } }, + }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2, T3 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_TRUE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, acceptsWhenSelectedTrackNotInMap) + { + const TrackMetadataMap meta{ { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } } }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } + + TEST(SameRecordingMBIDConstraint, acceptsWhenSelectedTrackHasNoMBID) + { + const TrackMetadataMap meta{ + { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = MBID1 } }, + { T2, { .releaseId = {}, .artistIds = {}, .recordingMBID = std::nullopt } }, + }; + const SameRecordingMBIDConstraint constraint{ meta }; + const std::vector selected{ T2 }; + const TrackCandidateContext ctx{ .candidateTrackId = T1, .selectedTracks = selected, .seedTrackIds = {} }; + EXPECT_FALSE(constraint.rejects(ctx)); + } +} // namespace lms::recommendation::tests \ No newline at end of file From 77f9b033ed5f14444e055133bf3169b532a1240d Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 14 Jun 2026 14:19:19 +0200 Subject: [PATCH 13/38] Removed useless group by --- src/libs/database/impl/objects/Cluster.cpp | 5 ++-- src/libs/database/test/Cluster.cpp | 34 ++++++++++++++++++++++ src/libs/database/test/TrackArtistLink.cpp | 31 ++++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/libs/database/impl/objects/Cluster.cpp b/src/libs/database/impl/objects/Cluster.cpp index 71cedbc9..44e63e45 100644 --- a/src/libs/database/impl/objects/Cluster.cpp +++ b/src/libs/database/impl/objects/Cluster.cpp @@ -51,7 +51,6 @@ namespace lms::db session.checkReadTransaction(); auto query{ session.getDboSession()->query("SELECT " + std::string{ itemToSelect } + " FROM cluster c") }; - query.groupBy("c.id"); if (params.track.isValid() || params.release.isValid()) query.join("track_cluster t_c ON t_c.cluster_id = c.id"); @@ -83,7 +82,9 @@ namespace lms::db break; } - query.groupBy("c.id"); + // track_cluster has a UNIQUE constraint on (track_id, cluster_id), so no duplicates can occur when filtering by track + if (!params.track.isValid()) + query.groupBy("c.id"); return query; } diff --git a/src/libs/database/test/Cluster.cpp b/src/libs/database/test/Cluster.cpp index 4eb6d57e..4936a6a5 100644 --- a/src/libs/database/test/Cluster.cpp +++ b/src/libs/database/test/Cluster.cpp @@ -723,4 +723,38 @@ namespace lms::db::tests } } + TEST_F(DatabaseFixture, Cluster_findByTrackAndTypeName) + { + ScopedTrack track{ session }; + ScopedClusterType genreType{ session, "GENRE" }; + ScopedClusterType moodType{ session, "MOOD" }; + ScopedCluster genre1{ session, genreType.lockAndGet(), "Rock" }; + ScopedCluster genre2{ session, genreType.lockAndGet(), "Pop" }; + ScopedCluster mood{ session, moodType.lockAndGet(), "Happy" }; + + { + auto transaction{ session.createWriteTransaction() }; + genre1.get().modify()->addTrack(track.get()); + genre2.get().modify()->addTrack(track.get()); + mood.get().modify()->addTrack(track.get()); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto genres{ Cluster::find(session, Cluster::FindParameters{}.setTrack(track.getId()).setClusterTypeName("GENRE")) }; + ASSERT_EQ(genres.results.size(), 2); + + const auto moods{ Cluster::find(session, Cluster::FindParameters{}.setTrack(track.getId()).setClusterTypeName("MOOD")) }; + ASSERT_EQ(moods.results.size(), 1); + EXPECT_EQ(moods.results.front()->getId(), mood.getId()); + + const auto all{ Cluster::find(session, Cluster::FindParameters{}.setTrack(track.getId())) }; + EXPECT_EQ(all.results.size(), 3); + + const auto none{ Cluster::find(session, Cluster::FindParameters{}.setTrack(track.getId()).setClusterTypeName("GROUPING")) }; + EXPECT_EQ(none.results.size(), 0); + } + } + } // namespace lms::db::tests \ No newline at end of file diff --git a/src/libs/database/test/TrackArtistLink.cpp b/src/libs/database/test/TrackArtistLink.cpp index 27d1a487..8e021367 100644 --- a/src/libs/database/test/TrackArtistLink.cpp +++ b/src/libs/database/test/TrackArtistLink.cpp @@ -275,4 +275,35 @@ namespace lms::db::tests EXPECT_EQ(links[0]->getTrack()->getId(), track2.getId()); } } + + TEST_F(DatabaseFixture, Track_getArtists_typeFilterAndOrder) + { + ScopedTrack track{ session }; + ScopedArtist artist1{ session, "Artist1" }; + ScopedArtist artist2{ session, "Artist2" }; + + { + auto transaction{ session.createWriteTransaction() }; + session.create(track.get(), artist1.get(), TrackArtistLinkType::Artist, false); + session.create(track.get(), artist2.get(), TrackArtistLinkType::Artist, false); + session.create(track.get(), artist1.get(), TrackArtistLinkType::Mixer, false); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto artistLinks{ track->getArtists({ TrackArtistLinkType::Artist }) }; + ASSERT_EQ(artistLinks.size(), 2); + EXPECT_EQ(artistLinks[0]->getId(), artist1.getId()); + EXPECT_EQ(artistLinks[1]->getId(), artist2.getId()); + + const auto mixerLinks{ track->getArtists({ TrackArtistLinkType::Mixer }) }; + ASSERT_EQ(mixerLinks.size(), 1); + EXPECT_EQ(mixerLinks[0]->getId(), artist1.getId()); + + const auto noFilter{ track->getArtists({}) }; + EXPECT_EQ(noFilter.size(), 2); + } + } + } // namespace lms::db::tests \ No newline at end of file From dbd6e57160287405faec4ec1a17aeba3d5825d14 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 17 Jun 2026 21:34:29 +0200 Subject: [PATCH 14/38] Extracted genre, mood, language and grouping from generic clusters --- README.md | 2 +- approot/messages.xml | 18 +- approot/messages_es.xml | 18 +- approot/messages_fr.xml | 18 +- approot/messages_it.xml | 18 +- approot/messages_pl.xml | 22 +- approot/messages_zh.xml | 6 +- approot/tracks.xml | 40 +++ src/libs/database/CMakeLists.txt | 4 + src/libs/database/impl/Migration.cpp | 124 +++++++++- src/libs/database/impl/Session.cpp | 13 + src/libs/database/impl/objects/Artist.cpp | 36 +++ src/libs/database/impl/objects/Cluster.cpp | 4 + src/libs/database/impl/objects/Genre.cpp | 187 ++++++++++++++ src/libs/database/impl/objects/Grouping.cpp | 175 +++++++++++++ src/libs/database/impl/objects/Language.cpp | 175 +++++++++++++ src/libs/database/impl/objects/Listen.cpp | 82 +++++- .../database/impl/objects/MediaLibrary.cpp | 4 + src/libs/database/impl/objects/Medium.cpp | 4 + src/libs/database/impl/objects/Mood.cpp | 175 +++++++++++++ .../database/impl/objects/PlayListFile.cpp | 4 + src/libs/database/impl/objects/PlayQueue.cpp | 4 + src/libs/database/impl/objects/RatedTrack.cpp | 4 + src/libs/database/impl/objects/Release.cpp | 36 +++ .../impl/objects/ReleaseArtistLink.cpp | 4 + .../database/impl/objects/StarredTrack.cpp | 4 + src/libs/database/impl/objects/Track.cpp | 116 +++++++++ .../database/impl/objects/TrackArtistLink.cpp | 4 + .../database/impl/objects/TrackBookmark.cpp | 4 + .../impl/objects/TrackEmbeddedImage.cpp | 4 + .../impl/objects/TrackEmbeddedImageLink.cpp | 4 + src/libs/database/impl/objects/TrackList.cpp | 4 + .../database/impl/objects/TrackLyrics.cpp | 4 + .../impl/objects/TrackMusicNNEmbeddings.cpp | 4 + src/libs/database/impl/objects/User.cpp | 4 + .../include/database/objects/Cluster.hpp | 10 - .../include/database/objects/Filters.hpp | 28 +++ .../include/database/objects/Genre.hpp | 123 +++++++++ .../include/database/objects/GenreId.hpp | 24 ++ .../include/database/objects/Grouping.hpp | 110 +++++++++ .../include/database/objects/GroupingId.hpp | 24 ++ .../include/database/objects/Language.hpp | 110 +++++++++ .../include/database/objects/LanguageId.hpp | 24 ++ .../include/database/objects/Mood.hpp | 110 +++++++++ .../include/database/objects/MoodId.hpp | 24 ++ .../include/database/objects/Track.hpp | 28 +++ .../include/database/objects/Types.hpp | 28 +++ src/libs/database/test/CMakeLists.txt | 4 + src/libs/database/test/Common.cpp | 2 - src/libs/database/test/Common.hpp | 4 + src/libs/database/test/Genre.cpp | 233 ++++++++++++++++++ src/libs/database/test/Grouping.cpp | 190 ++++++++++++++ src/libs/database/test/Language.cpp | 190 ++++++++++++++ src/libs/database/test/Mood.cpp | 190 ++++++++++++++ src/libs/database/test/Track.cpp | 33 +++ .../services/recommendation/CMakeLists.txt | 2 +- .../impl/RecommendationService.cpp | 4 +- .../TagsEngine.cpp} | 206 ++++++++++------ .../TagsEngine.hpp} | 62 ++++- src/libs/services/scanner/CMakeLists.txt | 2 +- .../services/scanner/impl/ScannerService.cpp | 4 +- .../audiofile/AudioFileScanOperation.cpp | 70 +++++- ...tats.cpp => ScanStepComputeGenreStats.cpp} | 47 ++-- ...tats.hpp => ScanStepComputeGenreStats.hpp} | 6 +- .../steps/ScanStepRemoveOrphanedDbEntries.cpp | 32 +++ .../steps/ScanStepRemoveOrphanedDbEntries.hpp | 4 + .../include/services/scanner/ScannerStats.hpp | 2 +- .../impl/endpoints/AlbumSongLists.cpp | 29 +-- src/libs/subsonic/impl/endpoints/Browsing.cpp | 12 +- src/libs/subsonic/impl/responses/Album.cpp | 51 ++-- src/libs/subsonic/impl/responses/Genre.cpp | 18 +- src/libs/subsonic/impl/responses/Genre.hpp | 4 +- src/libs/subsonic/impl/responses/Song.cpp | 37 +-- src/lms/ui/Utils.cpp | 48 ++++ src/lms/ui/Utils.hpp | 8 + src/lms/ui/admin/ScannerController.cpp | 4 +- src/lms/ui/explore/ArtistView.cpp | 38 +++ src/lms/ui/explore/Filters.cpp | 217 +++++++++++++++- src/lms/ui/explore/Filters.hpp | 12 + src/lms/ui/explore/ReleaseView.cpp | 40 ++- src/lms/ui/explore/TrackListHelpers.cpp | 65 +++++ src/tools/db-generator/LmsDbGenerator.cpp | 81 ++++-- 82 files changed, 3648 insertions(+), 275 deletions(-) create mode 100644 src/libs/database/impl/objects/Genre.cpp create mode 100644 src/libs/database/impl/objects/Grouping.cpp create mode 100644 src/libs/database/impl/objects/Language.cpp create mode 100644 src/libs/database/impl/objects/Mood.cpp create mode 100644 src/libs/database/include/database/objects/Genre.hpp create mode 100644 src/libs/database/include/database/objects/GenreId.hpp create mode 100644 src/libs/database/include/database/objects/Grouping.hpp create mode 100644 src/libs/database/include/database/objects/GroupingId.hpp create mode 100644 src/libs/database/include/database/objects/Language.hpp create mode 100644 src/libs/database/include/database/objects/LanguageId.hpp create mode 100644 src/libs/database/include/database/objects/Mood.hpp create mode 100644 src/libs/database/include/database/objects/MoodId.hpp create mode 100644 src/libs/database/test/Genre.cpp create mode 100644 src/libs/database/test/Grouping.cpp create mode 100644 src/libs/database/test/Language.cpp create mode 100644 src/libs/database/test/Mood.cpp rename src/libs/services/recommendation/impl/{clusters/ClustersEngine.cpp => tags/TagsEngine.cpp} (59%) rename src/libs/services/recommendation/impl/{clusters/ClustersEngine.hpp => tags/TagsEngine.hpp} (56%) rename src/libs/services/scanner/impl/steps/{ScanStepComputeClusterStats.cpp => ScanStepComputeGenreStats.cpp} (56%) rename src/libs/services/scanner/impl/steps/{ScanStepComputeClusterStats.hpp => ScanStepComputeGenreStats.hpp} (91%) diff --git a/README.md b/README.md index 8c1f3dfe..16e4499a 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ _LMS_ provides several ways to help you find the music you like: * ... __Note__: the recommendation engine supports two modes: -* **Tag-based**: uses metadata tags `genre` and `grouping`. +* **Tag-based**: uses metadata tags `genre`, `mood`, `grouping`, and `language`. * **Audio similarity**: uses MusicNN embeddings. Extraction throughput depends heavily on both the number of scanner threads and the speed of your storage. Typical reported speeds range from ~1k tracks/hour on a Raspberry Pi 4 (3 threads) to ~25k tracks/hour on an Intel Core i5-13500 (10 threads). To speed up extraction, consider tweaking `scanner-thread-count` in `lms.conf` (defaults to half the number of logical CPUs). ## About tags diff --git a/approot/messages.xml b/approot/messages.xml index 4163ae7b..732e805b 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -152,7 +152,7 @@ Checking for duplicate files... {1} files Checking for removed files... {1}% Compacting database... -Computing stats... {1}% +Computing stats... {1}% Extracting MusicNN embeddings: {1} of {2} files ({3}%) Optimizing database... {1}%... Reconciliating artists: {1} entries... @@ -221,7 +221,19 @@ Duration Filter added Filters + + Genre + Genres + + + Grouping + Groupings + Label + + Language + Languages + Lyricist Lyricists @@ -231,6 +243,10 @@ Mixer Mixers + + Mood + Moods + Most played MusicBrainz Artist MusicBrainz Release diff --git a/approot/messages_es.xml b/approot/messages_es.xml index 7d67101f..c14b8491 100644 --- a/approot/messages_es.xml +++ b/approot/messages_es.xml @@ -152,7 +152,7 @@ Comprobando ficheros duplicados ... {1} ficheros Comprobando ficheros eliminados... {1}% Compactando la base de datos... -Calculando estadísticas... {1}% +Calculando estadísticas... {1}% Extracción de embeddings de MusicNN: {1} de {2} archivos ({3}%) Optimizando la base de datos... {1}%... Reconciliando artistas: {1} entradas... @@ -221,7 +221,19 @@ Duración Filtro añadido Filtros + + Género + Géneros + + + Agrupación + Agrupaciones + Sello discográfico + + Idioma + Idiomas + Letrista Letristas @@ -231,6 +243,10 @@ Mezclador Mezcladores + + Estado de ánimo + Estados de ánimo + Reproducidos frecuentemente Artista de MusicBrainz Álbum de MusicBrainz diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 6f9a6166..97f392b4 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -152,7 +152,7 @@ Vérification des fichiers dupliqués... {1} fichiers Vérification des fichiers supprimés... {1}% Compactage de la base de données... -Calcul des statistiques... {1}% +Calcul des statistiques... {1}% Extraction des embeddings MusicNN : {1} sur {2} fichiers ({3}%) Optimisation de la base de données... {1}%... Reconciliation des artistes: {1} entrées... @@ -221,7 +221,19 @@ Durée Filtre ajouté Filtres + + Genre + Genres + + + Regroupement + Regroupements + Label + + Langue + Langues + Parolier Paroliers @@ -231,6 +243,10 @@ Mixeur Mixeurs + + Ambiance + Ambiances + Plus joués MusicBrainz Artist MusicBrainz Release diff --git a/approot/messages_it.xml b/approot/messages_it.xml index 06baee9c..da46dd5d 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -152,7 +152,7 @@ Controllo duplicati... {1} files Controllo file... {1}% Compattazione del database... -Calcolo statistiche... {1}% +Calcolo statistiche... {1}% Estrazione degli embeddings MusicNN: {1} di {2} file ({3}%) Ottimizzazione del database... {1}%... Riconciliazione artisti: {1} voci... @@ -221,7 +221,19 @@ Durata Filtro aggiunto Filtri + + Genere + Generi + + + Raggruppamento + Raggruppamenti + Etichetta + + Lingua + Lingue + Paroliere Parolieri @@ -231,6 +243,10 @@ Tecnico del mixaggio Tecnici del mixaggio + + Umore + Umori + Più ascoltati Artista MusicBrainz Album MusicBrainz diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml index d89687d5..16523ae9 100644 --- a/approot/messages_pl.xml +++ b/approot/messages_pl.xml @@ -165,7 +165,7 @@ Sprawdzanie plików... {1}% Prasowanie bazy danych... -Obliczanie statystyk... {1}% +Obliczanie statystyk... {1}% Ekstrakcja embeddingów MusicNN: {1} z {2} plików ({3}%) Optymalizowanie bazy danych... {1}%... Uzgodnianie artystów: {1} wpisów... @@ -240,7 +240,22 @@ Długość Filtr dodany Filtry + + Gatunek + Gatunki + Gatunków + + + Grupowanie + Grupowania + Grupowań + Wytwórnia + + Język + Języki + Języków + Tekściarz Tekściarze @@ -252,6 +267,11 @@ Mikserzy Mikserów + + Nastrój + Nastroje + Nastrojów + Najczęściej odtwarzane Artysta w MusicBrainz Wydanie w MusicBrainz diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 9c525cc4..2da4a425 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -150,7 +150,7 @@ 检查重复文件... {1} 个文件 检查文件中... {1}% 正在压缩数据库... -正在计算统计信息... {1}% +正在计算统计信息... {1}% 正在提取 MusicNN 嵌入：{1} / {2} 个文件（{3}%） 正在优化数据库... {1}%... 整理艺术家：{1} 条记录... @@ -213,10 +213,14 @@ 时长 过滤器已添加 过滤器 +流派 +分组 厂牌 +语言 作词者 音乐库 混音师 +情绪 播放最多 MusicBrainz 歌手 MusicBrainz 专辑 diff --git a/approot/tracks.xml b/approot/tracks.xml index d40598ab..76dba9ae 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -80,6 +80,46 @@
+ ${} +
+
+ ${genres-label} +
+
+ ${genres} +
+
+ ${} + ${} +
+
+ ${groupings-label} +
+
+ ${groupings} +
+
+ ${} + ${} +
+
+ ${languages-label} +
+
+ ${languages} +
+
+ ${} + ${} +
+
+ ${moods-label} +
+
+ ${moods} +
+
+ ${} ${}
diff --git a/src/libs/database/CMakeLists.txt b/src/libs/database/CMakeLists.txt index b59f17d1..bc164a03 100644 --- a/src/libs/database/CMakeLists.txt +++ b/src/libs/database/CMakeLists.txt @@ -6,10 +6,14 @@ add_library(lmsdatabase STATIC impl/objects/AuthToken.cpp impl/objects/Cluster.cpp impl/objects/Directory.cpp + impl/objects/Genre.cpp + impl/objects/Grouping.cpp impl/objects/Image.cpp + impl/objects/Language.cpp impl/objects/Listen.cpp impl/objects/MediaLibrary.cpp impl/objects/Medium.cpp + impl/objects/Mood.cpp impl/objects/PlayListFile.cpp impl/objects/PlayQueue.cpp impl/objects/Podcast.cpp diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index 93e4f5f8..ba9d3a67 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -35,7 +35,7 @@ namespace lms::db { namespace { - static constexpr Version LMS_DATABASE_VERSION{ 107 }; + static constexpr Version LMS_DATABASE_VERSION{ 108 }; } VersionInfo::VersionInfo() @@ -1774,6 +1774,127 @@ FROM track)"); utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track RENAME COLUMN recording_mbid_new TO recording_mbid)"); } + void migrateFromV107(Session& session) + { + // Extract Genre, Mood, Language and Grouping from Cluster (keep it for user tags) + + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "genre" ( + "id" integer primary key autoincrement, + "version" integer not null, + "name" text not null, + "track_count" integer not null default 0, + "release_count" integer not null default 0 +))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "track_genre" ( + "track_id" bigint, + "genre_id" bigint, + primary key ("track_id", "genre_id"), + constraint "fk_track_genre_track" foreign key ("track_id") references "track" ("id") on delete cascade deferrable initially deferred, + constraint "fk_track_genre_genre" foreign key ("genre_id") references "genre" ("id") on delete cascade deferrable initially deferred +))"); + + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO genre (version, name, track_count, release_count) +SELECT 0, c.name, c.track_count, c.release_count FROM cluster c +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +WHERE ct.name = 'GENRE')"); + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_genre (track_id, genre_id) +SELECT tc.track_id, g.id FROM track_cluster tc +INNER JOIN cluster c ON c.id = tc.cluster_id +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +INNER JOIN genre g ON g.name = c.name +WHERE ct.name = 'GENRE')"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_genre_genre" ON "track_genre" ("genre_id"))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_genre_track" ON "track_genre" ("track_id"))"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "mood" ( + "id" integer primary key autoincrement, + "version" integer not null, + "name" text not null +))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "track_mood" ( + "track_id" bigint, + "mood_id" bigint, + primary key ("track_id", "mood_id"), + constraint "fk_track_mood_track" foreign key ("track_id") references "track" ("id") on delete cascade deferrable initially deferred, + constraint "fk_track_mood_mood" foreign key ("mood_id") references "mood" ("id") on delete cascade deferrable initially deferred +))"); + + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO mood (version, name) +SELECT 0, c.name FROM cluster c +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +WHERE ct.name = 'MOOD')"); + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_mood (track_id, mood_id) +SELECT tc.track_id, m.id FROM track_cluster tc +INNER JOIN cluster c ON c.id = tc.cluster_id +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +INNER JOIN mood m ON m.name = c.name +WHERE ct.name = 'MOOD')"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_mood_mood" ON "track_mood" ("mood_id"))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_mood_track" ON "track_mood" ("track_id"))"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "language" ( + "id" integer primary key autoincrement, + "version" integer not null, + "name" text not null +))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "track_language" ( + "track_id" bigint, + "language_id" bigint, + primary key ("track_id", "language_id"), + constraint "fk_track_language_track" foreign key ("track_id") references "track" ("id") on delete cascade deferrable initially deferred, + constraint "fk_track_language_language" foreign key ("language_id") references "language" ("id") on delete cascade deferrable initially deferred +))"); + + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO language (version, name) +SELECT 0, c.name FROM cluster c +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +WHERE ct.name = 'LANGUAGE')"); + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_language (track_id, language_id) +SELECT tc.track_id, l.id FROM track_cluster tc +INNER JOIN cluster c ON c.id = tc.cluster_id +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +INNER JOIN language l ON l.name = c.name +WHERE ct.name = 'LANGUAGE')"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_language_language" ON "track_language" ("language_id"))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_language_track" ON "track_language" ("track_id"))"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "grouping" ( + "id" integer primary key autoincrement, + "version" integer not null, + "name" text not null +))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "track_grouping" ( + "track_id" bigint, + "grouping_id" bigint, + primary key ("track_id", "grouping_id"), + constraint "fk_track_grouping_track" foreign key ("track_id") references "track" ("id") on delete cascade deferrable initially deferred, + constraint "fk_track_grouping_grouping" foreign key ("grouping_id") references "grouping" ("id") on delete cascade deferrable initially deferred +))"); + + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO grouping (version, name) +SELECT 0, c.name FROM cluster c +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +WHERE ct.name = 'GROUPING')"); + utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_grouping (track_id, grouping_id) +SELECT tc.track_id, g.id FROM track_cluster tc +INNER JOIN cluster c ON c.id = tc.cluster_id +INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id +INNER JOIN grouping g ON g.name = c.name +WHERE ct.name = 'GROUPING')"); + + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_grouping_grouping" ON "track_grouping" ("grouping_id"))"); + utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_grouping_track" ON "track_grouping" ("track_id"))"); + + utils::executeCommand(*session.getDboSession(), R"(DELETE FROM track_cluster WHERE cluster_id IN (SELECT c.id FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name IN ('GENRE', 'MOOD', 'LANGUAGE', 'GROUPING')))"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE cluster DROP COLUMN track_count)"); + utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE cluster DROP COLUMN release_count)"); + utils::executeCommand(*session.getDboSession(), R"(DELETE FROM cluster WHERE cluster_type_id IN (SELECT id FROM cluster_type WHERE name IN ('GENRE', 'MOOD', 'LANGUAGE', 'GROUPING')))"); + utils::executeCommand(*session.getDboSession(), R"(DELETE FROM cluster_type WHERE name IN ('GENRE', 'MOOD', 'LANGUAGE', 'GROUPING'))"); + } + bool doDbMigration(Session& session) { constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" }; @@ -1857,6 +1978,7 @@ FROM track)"); { 104, migrateFromV104 }, { 105, migrateFromV105 }, { 106, migrateFromV106 }, + { 107, migrateFromV107 }, }; bool migrationPerformed{}; diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp index df51253e..875a15ac 100644 --- a/src/libs/database/impl/Session.cpp +++ b/src/libs/database/impl/Session.cpp @@ -30,10 +30,14 @@ #include "database/objects/AuthToken.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" #include "database/objects/Image.hpp" +#include "database/objects/Language.hpp" #include "database/objects/Listen.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/PlayListFile.hpp" #include "database/objects/PlayQueue.hpp" #include "database/objects/Podcast.hpp" @@ -81,6 +85,10 @@ namespace lms::db _session.mapClass("auth_token"); _session.mapClass("cluster"); _session.mapClass("cluster_type"); + _session.mapClass("genre"); + _session.mapClass("grouping"); + _session.mapClass("language"); + _session.mapClass("mood"); _session.mapClass("country"); _session.mapClass("directory"); _session.mapClass("image"); @@ -210,6 +218,11 @@ namespace lms::db utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_cluster_type_idx ON cluster(cluster_type_id)"); utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)"); + utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS genre_name_idx ON genre(name)"); + utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS grouping_name_idx ON grouping(name)"); + utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS language_name_idx ON language(name)"); + utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS mood_name_idx ON mood(name)"); + utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_id_idx ON country(id)"); utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_name_idx ON country(name COLLATE NOCASE)"); diff --git a/src/libs/database/impl/objects/Artist.cpp b/src/libs/database/impl/objects/Artist.cpp index d064e7fc..ea9e6b48 100644 --- a/src/libs/database/impl/objects/Artist.cpp +++ b/src/libs/database/impl/objects/Artist.cpp @@ -26,6 +26,10 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" @@ -55,6 +59,10 @@ namespace lms::db || params.trackArtistLinkType.has_value() || params.track.isValid() || params.filters.clusters.size() == 1 + || params.filters.genre.isValid() + || params.filters.grouping.isValid() + || params.filters.language.isValid() + || params.filters.mood.isValid() || params.filters.codec.has_value() || params.filters.label.isValid() || params.filters.releaseType.isValid()) @@ -162,6 +170,34 @@ namespace lms::db query.where(oss.str()); } + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t_a_l.track_id") + .where("t_g.genre_id = ?") + .bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t_a_l.track_id") + .where("t_gr.grouping_id = ?") + .bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t_a_l.track_id") + .where("t_l.language_id = ?") + .bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t_a_l.track_id") + .where("t_m.mood_id = ?") + .bind(params.filters.mood); + } + if (params.track.isValid()) query.where("t_a_l.track_id = ?").bind(params.track); diff --git a/src/libs/database/impl/objects/Cluster.cpp b/src/libs/database/impl/objects/Cluster.cpp index 44e63e45..b574e798 100644 --- a/src/libs/database/impl/objects/Cluster.cpp +++ b/src/libs/database/impl/objects/Cluster.cpp @@ -25,8 +25,12 @@ #include "database/objects/Artist.hpp" #include "database/objects/Artwork.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackArtistLink.hpp" diff --git a/src/libs/database/impl/objects/Genre.cpp b/src/libs/database/impl/objects/Genre.cpp new file mode 100644 index 00000000..d2149ad3 --- /dev/null +++ b/src/libs/database/impl/objects/Genre.cpp @@ -0,0 +1,187 @@ +/* + * Copyright (C) 2025 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 "database/objects/Genre.hpp" + +#include + +#include "core/ILogger.hpp" + +#include "database/Session.hpp" +#include "database/objects/Artist.hpp" +#include "database/objects/Artwork.hpp" +#include "database/objects/Cluster.hpp" +#include "database/objects/Directory.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/MediaLibrary.hpp" +#include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" +#include "database/objects/Release.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/TrackArtistLink.hpp" +#include "database/objects/TrackEmbeddedImage.hpp" +#include "database/objects/TrackEmbeddedImageLink.hpp" +#include "database/objects/TrackLyrics.hpp" + +#include "Utils.hpp" +#include "traits/IdTypeTraits.hpp" +#include "traits/StringViewTraits.hpp" + +DBO_INSTANTIATE_TEMPLATES(lms::db::Genre) + +namespace lms::db +{ + namespace + { + template + Wt::Dbo::Query createQuery(Session& session, std::string_view itemToSelect, const Genre::FindParameters& params) + { + session.checkReadTransaction(); + + auto query{ session.getDboSession()->query("SELECT " + std::string{ itemToSelect } + " FROM genre g") }; + + if (params.artist.isValid() || params.track.isValid() || params.release.isValid() + || params.sortMethod == GenreSortMethod::TrackCountDesc) + query.join("track_genre t_g ON t_g.genre_id = g.id"); + + if (params.track.isValid()) + query.where("t_g.track_id = ?").bind(params.track); + + if (params.release.isValid() || params.artist.isValid()) + query.join("track t ON t.id = t_g.track_id"); + + if (params.release.isValid()) + query.where("t.release_id = ?").bind(params.release); + + if (params.artist.isValid()) + { + query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id"); + query.where("t_a_l.artist_id = ?").bind(params.artist); + } + + switch (params.sortMethod) + { + case GenreSortMethod::None: + break; + case GenreSortMethod::Name: + query.orderBy("g.name COLLATE NOCASE"); + break; + case GenreSortMethod::TrackCountDesc: + query.orderBy("COUNT(t_g.track_id) DESC"); + break; + } + + // track_genre has a UNIQUE constraint on (track_id, genre_id), so no duplicates when filtering by track + if (!params.track.isValid()) + query.groupBy("g.id"); + + return query; + } + + template + Wt::Dbo::Query createQuery(Session& session, const Genre::FindParameters& params) + { + std::string_view itemToSelect; + + if constexpr (std::is_same_v) + itemToSelect = "g.id"; + else if constexpr (std::is_same_v>) + itemToSelect = "g"; + else + static_assert("Unhandled type"); + + return createQuery(session, itemToSelect, params); + } + } // namespace + + Genre::Genre(std::string_view name) + : _name{ name.substr(0, maxNameLength) } + { + LMS_LOG_IF(DB, WARNING, name.size() > maxNameLength, "Genre name too long, truncated to '" << _name << "'"); + } + + Genre::pointer Genre::create(Session& session, std::string_view name) + { + return session.getDboSession()->add(std::unique_ptr{ new Genre{ name } }); + } + + std::size_t Genre::getCount(Session& session) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(*) FROM genre")); + } + + RangeResults Genre::findIds(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + RangeResults Genre::find(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + void Genre::find(Session& session, const FindParameters& params, std::function func) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + utils::forEachQueryRangeResult(query, params.range, func); + } + + Genre::pointer Genre::find(Session& session, GenreId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("id = ?").bind(id)); + } + + Genre::pointer Genre::find(Session& session, std::string_view name) + { + session.checkReadTransaction(); + + if (name.size() > maxNameLength) + name = name.substr(0, maxNameLength); + + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("name = ?").bind(name)); + } + + RangeResults Genre::findOrphanIds(Session& session, std::optional range) + { + session.checkReadTransaction(); + auto query{ session.getDboSession()->query("SELECT g.id FROM genre g WHERE NOT EXISTS (SELECT 1 FROM track_genre t_g WHERE t_g.genre_id = g.id)") }; + return utils::execRangeQuery(query, range); + } + + std::size_t Genre::computeTrackCount(Session& session, GenreId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(t.id) FROM track t INNER JOIN track_genre t_g ON t_g.track_id = t.id").where("t_g.genre_id = ?").bind(id)); + } + + std::size_t Genre::computeReleaseCount(Session& session, GenreId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(DISTINCT t.release_id) FROM track t INNER JOIN track_genre t_g ON t_g.track_id = t.id").where("t_g.genre_id = ?").bind(id)); + } + +} // namespace lms::db diff --git a/src/libs/database/impl/objects/Grouping.cpp b/src/libs/database/impl/objects/Grouping.cpp new file mode 100644 index 00000000..96f6683a --- /dev/null +++ b/src/libs/database/impl/objects/Grouping.cpp @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2025 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 "database/objects/Grouping.hpp" + +#include + +#include "core/ILogger.hpp" + +#include "database/Session.hpp" +#include "database/objects/Artist.hpp" +#include "database/objects/Artwork.hpp" +#include "database/objects/Cluster.hpp" +#include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/MediaLibrary.hpp" +#include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" +#include "database/objects/Release.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/TrackArtistLink.hpp" +#include "database/objects/TrackEmbeddedImage.hpp" +#include "database/objects/TrackEmbeddedImageLink.hpp" +#include "database/objects/TrackLyrics.hpp" + +#include "Utils.hpp" +#include "traits/IdTypeTraits.hpp" +#include "traits/StringViewTraits.hpp" + +DBO_INSTANTIATE_TEMPLATES(lms::db::Grouping) + +namespace lms::db +{ + namespace + { + template + Wt::Dbo::Query createQuery(Session& session, std::string_view itemToSelect, const Grouping::FindParameters& params) + { + session.checkReadTransaction(); + + auto query{ session.getDboSession()->query("SELECT " + std::string{ itemToSelect } + " FROM grouping g") }; + + if (params.artist.isValid() || params.track.isValid() || params.release.isValid() + || params.sortMethod == GroupingSortMethod::TrackCountDesc) + query.join("track_grouping t_gr ON t_gr.grouping_id = g.id"); + + if (params.track.isValid()) + query.where("t_gr.track_id = ?").bind(params.track); + + if (params.release.isValid() || params.artist.isValid()) + query.join("track t ON t.id = t_gr.track_id"); + + if (params.release.isValid()) + query.where("t.release_id = ?").bind(params.release); + + if (params.artist.isValid()) + { + query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id"); + query.where("t_a_l.artist_id = ?").bind(params.artist); + } + + switch (params.sortMethod) + { + case GroupingSortMethod::None: + break; + case GroupingSortMethod::Name: + query.orderBy("g.name COLLATE NOCASE"); + break; + case GroupingSortMethod::TrackCountDesc: + query.orderBy("COUNT(t_gr.track_id) DESC"); + break; + } + + // track_grouping has a UNIQUE constraint on (track_id, grouping_id), so no duplicates when filtering by track + if (!params.track.isValid()) + query.groupBy("g.id"); + + return query; + } + + template + Wt::Dbo::Query createQuery(Session& session, const Grouping::FindParameters& params) + { + std::string_view itemToSelect; + + if constexpr (std::is_same_v) + itemToSelect = "g.id"; + else if constexpr (std::is_same_v>) + itemToSelect = "g"; + else + static_assert("Unhandled type"); + + return createQuery(session, itemToSelect, params); + } + } // namespace + + Grouping::Grouping(std::string_view name) + : _name{ name.substr(0, maxNameLength) } + { + LMS_LOG_IF(DB, WARNING, name.size() > maxNameLength, "Grouping name too long, truncated to '" << _name << "'"); + } + + Grouping::pointer Grouping::create(Session& session, std::string_view name) + { + return session.getDboSession()->add(std::unique_ptr{ new Grouping{ name } }); + } + + std::size_t Grouping::getCount(Session& session) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(*) FROM grouping")); + } + + RangeResults Grouping::findIds(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + RangeResults Grouping::find(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + void Grouping::find(Session& session, const FindParameters& params, std::function func) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + utils::forEachQueryRangeResult(query, params.range, func); + } + + Grouping::pointer Grouping::find(Session& session, GroupingId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("id = ?").bind(id)); + } + + Grouping::pointer Grouping::find(Session& session, std::string_view name) + { + session.checkReadTransaction(); + + if (name.size() > maxNameLength) + name = name.substr(0, maxNameLength); + + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("name = ?").bind(name)); + } + + RangeResults Grouping::findOrphanIds(Session& session, std::optional range) + { + session.checkReadTransaction(); + auto query{ session.getDboSession()->query("SELECT g.id FROM grouping g WHERE NOT EXISTS (SELECT 1 FROM track_grouping t_gr WHERE t_gr.grouping_id = g.id)") }; + return utils::execRangeQuery(query, range); + } + +} // namespace lms::db diff --git a/src/libs/database/impl/objects/Language.cpp b/src/libs/database/impl/objects/Language.cpp new file mode 100644 index 00000000..9a3698c2 --- /dev/null +++ b/src/libs/database/impl/objects/Language.cpp @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2025 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 "database/objects/Language.hpp" + +#include + +#include "core/ILogger.hpp" + +#include "database/Session.hpp" +#include "database/objects/Artist.hpp" +#include "database/objects/Artwork.hpp" +#include "database/objects/Cluster.hpp" +#include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/MediaLibrary.hpp" +#include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" +#include "database/objects/Release.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/TrackArtistLink.hpp" +#include "database/objects/TrackEmbeddedImage.hpp" +#include "database/objects/TrackEmbeddedImageLink.hpp" +#include "database/objects/TrackLyrics.hpp" + +#include "Utils.hpp" +#include "traits/IdTypeTraits.hpp" +#include "traits/StringViewTraits.hpp" + +DBO_INSTANTIATE_TEMPLATES(lms::db::Language) + +namespace lms::db +{ + namespace + { + template + Wt::Dbo::Query createQuery(Session& session, std::string_view itemToSelect, const Language::FindParameters& params) + { + session.checkReadTransaction(); + + auto query{ session.getDboSession()->query("SELECT " + std::string{ itemToSelect } + " FROM language l") }; + + if (params.artist.isValid() || params.track.isValid() || params.release.isValid() + || params.sortMethod == LanguageSortMethod::TrackCountDesc) + query.join("track_language t_l ON t_l.language_id = l.id"); + + if (params.track.isValid()) + query.where("t_l.track_id = ?").bind(params.track); + + if (params.release.isValid() || params.artist.isValid()) + query.join("track t ON t.id = t_l.track_id"); + + if (params.release.isValid()) + query.where("t.release_id = ?").bind(params.release); + + if (params.artist.isValid()) + { + query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id"); + query.where("t_a_l.artist_id = ?").bind(params.artist); + } + + switch (params.sortMethod) + { + case LanguageSortMethod::None: + break; + case LanguageSortMethod::Name: + query.orderBy("l.name COLLATE NOCASE"); + break; + case LanguageSortMethod::TrackCountDesc: + query.orderBy("COUNT(t_l.track_id) DESC"); + break; + } + + // track_language has a UNIQUE constraint on (track_id, language_id), so no duplicates when filtering by track + if (!params.track.isValid()) + query.groupBy("l.id"); + + return query; + } + + template + Wt::Dbo::Query createQuery(Session& session, const Language::FindParameters& params) + { + std::string_view itemToSelect; + + if constexpr (std::is_same_v) + itemToSelect = "l.id"; + else if constexpr (std::is_same_v>) + itemToSelect = "l"; + else + static_assert("Unhandled type"); + + return createQuery(session, itemToSelect, params); + } + } // namespace + + Language::Language(std::string_view name) + : _name{ name.substr(0, maxNameLength) } + { + LMS_LOG_IF(DB, WARNING, name.size() > maxNameLength, "Language name too long, truncated to '" << _name << "'"); + } + + Language::pointer Language::create(Session& session, std::string_view name) + { + return session.getDboSession()->add(std::unique_ptr{ new Language{ name } }); + } + + std::size_t Language::getCount(Session& session) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(*) FROM language")); + } + + RangeResults Language::findIds(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + RangeResults Language::find(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + void Language::find(Session& session, const FindParameters& params, std::function func) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + utils::forEachQueryRangeResult(query, params.range, func); + } + + Language::pointer Language::find(Session& session, LanguageId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("id = ?").bind(id)); + } + + Language::pointer Language::find(Session& session, std::string_view name) + { + session.checkReadTransaction(); + + if (name.size() > maxNameLength) + name = name.substr(0, maxNameLength); + + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("name = ?").bind(name)); + } + + RangeResults Language::findOrphanIds(Session& session, std::optional range) + { + session.checkReadTransaction(); + auto query{ session.getDboSession()->query("SELECT l.id FROM language l WHERE NOT EXISTS (SELECT 1 FROM track_language t_l WHERE t_l.language_id = l.id)") }; + return utils::execRangeQuery(query, range); + } + +} // namespace lms::db diff --git a/src/libs/database/impl/objects/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp index 82b472dc..9b13c0c6 100644 --- a/src/libs/database/impl/objects/Listen.cpp +++ b/src/libs/database/impl/objects/Listen.cpp @@ -23,6 +23,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" @@ -53,7 +57,11 @@ namespace lms::db || params.filters.codec.has_value() || params.filters.label.isValid() || params.filters.releaseType.isValid() - || params.trackArtistLinkType.has_value()) + || params.trackArtistLinkType.has_value() + || params.filters.genre.isValid() + || params.filters.grouping.isValid() + || params.filters.language.isValid() + || params.filters.mood.isValid()) { query.join("track t ON t.id = t_a_l.track_id"); @@ -74,6 +82,30 @@ namespace lms::db query.join("release_release_type r_r_t ON r_r_t.release_id = t.release_id"); query.where("r_r_t.release_type_id = ?").bind(params.filters.releaseType); } + + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t.id"); + query.where("t_g.genre_id = ?").bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t.id"); + query.where("t_gr.grouping_id = ?").bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t.id"); + query.where("t_l.language_id = ?").bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t.id"); + query.where("t_m.mood_id = ?").bind(params.filters.mood); + } } if (params.releaseArtistsOnly) @@ -156,6 +188,30 @@ namespace lms::db query.where("r_r_t.release_type_id = ?").bind(params.filters.releaseType); } + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t.id"); + query.where("t_g.genre_id = ?").bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t.id"); + query.where("t_gr.grouping_id = ?").bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t.id"); + query.where("t_l.language_id = ?").bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t.id"); + query.where("t_m.mood_id = ?").bind(params.filters.mood); + } + if (!params.filters.clusters.empty()) { std::ostringstream oss; @@ -215,6 +271,30 @@ namespace lms::db query.where("r_r_t.release_type_id = ?").bind(params.filters.releaseType); } + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t.id"); + query.where("t_g.genre_id = ?").bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t.id"); + query.where("t_gr.grouping_id = ?").bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t.id"); + query.where("t_l.language_id = ?").bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t.id"); + query.where("t_m.mood_id = ?").bind(params.filters.mood); + } + if (!params.filters.clusters.empty()) { std::ostringstream oss; diff --git a/src/libs/database/impl/objects/MediaLibrary.cpp b/src/libs/database/impl/objects/MediaLibrary.cpp index 73c0a60d..853658ca 100644 --- a/src/libs/database/impl/objects/MediaLibrary.cpp +++ b/src/libs/database/impl/objects/MediaLibrary.cpp @@ -22,6 +22,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "Utils.hpp" diff --git a/src/libs/database/impl/objects/Medium.cpp b/src/libs/database/impl/objects/Medium.cpp index 80ba9714..b98fbb72 100644 --- a/src/libs/database/impl/objects/Medium.cpp +++ b/src/libs/database/impl/objects/Medium.cpp @@ -26,7 +26,11 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackArtistLink.hpp" diff --git a/src/libs/database/impl/objects/Mood.cpp b/src/libs/database/impl/objects/Mood.cpp new file mode 100644 index 00000000..18430ba4 --- /dev/null +++ b/src/libs/database/impl/objects/Mood.cpp @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2025 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 "database/objects/Mood.hpp" + +#include + +#include "core/ILogger.hpp" + +#include "database/Session.hpp" +#include "database/objects/Artist.hpp" +#include "database/objects/Artwork.hpp" +#include "database/objects/Cluster.hpp" +#include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/MediaLibrary.hpp" +#include "database/objects/Medium.hpp" +#include "database/objects/Release.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/TrackArtistLink.hpp" +#include "database/objects/TrackEmbeddedImage.hpp" +#include "database/objects/TrackEmbeddedImageLink.hpp" +#include "database/objects/TrackLyrics.hpp" + +#include "Utils.hpp" +#include "traits/IdTypeTraits.hpp" +#include "traits/StringViewTraits.hpp" + +DBO_INSTANTIATE_TEMPLATES(lms::db::Mood) + +namespace lms::db +{ + namespace + { + template + Wt::Dbo::Query createQuery(Session& session, std::string_view itemToSelect, const Mood::FindParameters& params) + { + session.checkReadTransaction(); + + auto query{ session.getDboSession()->query("SELECT " + std::string{ itemToSelect } + " FROM mood m") }; + + if (params.artist.isValid() || params.track.isValid() || params.release.isValid() + || params.sortMethod == MoodSortMethod::TrackCountDesc) + query.join("track_mood t_m ON t_m.mood_id = m.id"); + + if (params.track.isValid()) + query.where("t_m.track_id = ?").bind(params.track); + + if (params.release.isValid() || params.artist.isValid()) + query.join("track t ON t.id = t_m.track_id"); + + if (params.release.isValid()) + query.where("t.release_id = ?").bind(params.release); + + if (params.artist.isValid()) + { + query.join("track_artist_link t_a_l ON t_a_l.track_id = t.id"); + query.where("t_a_l.artist_id = ?").bind(params.artist); + } + + switch (params.sortMethod) + { + case MoodSortMethod::None: + break; + case MoodSortMethod::Name: + query.orderBy("m.name COLLATE NOCASE"); + break; + case MoodSortMethod::TrackCountDesc: + query.orderBy("COUNT(t_m.track_id) DESC"); + break; + } + + // track_mood has a UNIQUE constraint on (track_id, mood_id), so no duplicates when filtering by track + if (!params.track.isValid()) + query.groupBy("m.id"); + + return query; + } + + template + Wt::Dbo::Query createQuery(Session& session, const Mood::FindParameters& params) + { + std::string_view itemToSelect; + + if constexpr (std::is_same_v) + itemToSelect = "m.id"; + else if constexpr (std::is_same_v>) + itemToSelect = "m"; + else + static_assert("Unhandled type"); + + return createQuery(session, itemToSelect, params); + } + } // namespace + + Mood::Mood(std::string_view name) + : _name{ name.substr(0, maxNameLength) } + { + LMS_LOG_IF(DB, WARNING, name.size() > maxNameLength, "Mood name too long, truncated to '" << _name << "'"); + } + + Mood::pointer Mood::create(Session& session, std::string_view name) + { + return session.getDboSession()->add(std::unique_ptr{ new Mood{ name } }); + } + + std::size_t Mood::getCount(Session& session) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->query("SELECT COUNT(*) FROM mood")); + } + + RangeResults Mood::findIds(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + RangeResults Mood::find(Session& session, const FindParameters& params) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + return utils::execRangeQuery(query, params.range); + } + + void Mood::find(Session& session, const FindParameters& params, std::function func) + { + session.checkReadTransaction(); + auto query{ createQuery>(session, params) }; + utils::forEachQueryRangeResult(query, params.range, func); + } + + Mood::pointer Mood::find(Session& session, MoodId id) + { + session.checkReadTransaction(); + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("id = ?").bind(id)); + } + + Mood::pointer Mood::find(Session& session, std::string_view name) + { + session.checkReadTransaction(); + + if (name.size() > maxNameLength) + name = name.substr(0, maxNameLength); + + return utils::fetchQuerySingleResult(session.getDboSession()->find().where("name = ?").bind(name)); + } + + RangeResults Mood::findOrphanIds(Session& session, std::optional range) + { + session.checkReadTransaction(); + auto query{ session.getDboSession()->query("SELECT m.id FROM mood m WHERE NOT EXISTS (SELECT 1 FROM track_mood t_m WHERE t_m.mood_id = m.id)") }; + return utils::execRangeQuery(query, range); + } + +} // namespace lms::db diff --git a/src/libs/database/impl/objects/PlayListFile.cpp b/src/libs/database/impl/objects/PlayListFile.cpp index 83db070e..702e6918 100644 --- a/src/libs/database/impl/objects/PlayListFile.cpp +++ b/src/libs/database/impl/objects/PlayListFile.cpp @@ -26,7 +26,11 @@ #include "database/Session.hpp" #include "database/objects/Artwork.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackList.hpp" #include "database/objects/User.hpp" diff --git a/src/libs/database/impl/objects/PlayQueue.cpp b/src/libs/database/impl/objects/PlayQueue.cpp index 13364d9c..ffa824ab 100644 --- a/src/libs/database/impl/objects/PlayQueue.cpp +++ b/src/libs/database/impl/objects/PlayQueue.cpp @@ -27,8 +27,12 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackArtistLink.hpp" diff --git a/src/libs/database/impl/objects/RatedTrack.cpp b/src/libs/database/impl/objects/RatedTrack.cpp index 8a8a1d7d..e3cc5e0f 100644 --- a/src/libs/database/impl/objects/RatedTrack.cpp +++ b/src/libs/database/impl/objects/RatedTrack.cpp @@ -23,6 +23,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" diff --git a/src/libs/database/impl/objects/Release.cpp b/src/libs/database/impl/objects/Release.cpp index 8117f978..71c5f402 100644 --- a/src/libs/database/impl/objects/Release.cpp +++ b/src/libs/database/impl/objects/Release.cpp @@ -29,8 +29,12 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackArtistLink.hpp" @@ -77,7 +81,11 @@ namespace lms::db || params.originalDateRange || params.trackArtist.isValid() || params.filters.clusters.size() == 1 + || params.filters.genre.isValid() + || params.filters.grouping.isValid() + || params.filters.language.isValid() || params.filters.mediaLibrary.isValid() + || params.filters.mood.isValid() || params.filters.codec.has_value() || params.directory.isValid() || params.parentDirectory.isValid()) @@ -215,6 +223,34 @@ namespace lms::db query.where(oss.str()); } + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t.id") + .where("t_g.genre_id = ?") + .bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t.id") + .where("t_gr.grouping_id = ?") + .bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t.id") + .where("t_l.language_id = ?") + .bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t.id") + .where("t_m.mood_id = ?") + .bind(params.filters.mood); + } + if (params.filters.codec.has_value()) query.where("t.codec = ?").bind(detail::getDbCodec(params.filters.codec.value())); diff --git a/src/libs/database/impl/objects/ReleaseArtistLink.cpp b/src/libs/database/impl/objects/ReleaseArtistLink.cpp index c6eeeb7a..b6616f9b 100644 --- a/src/libs/database/impl/objects/ReleaseArtistLink.cpp +++ b/src/libs/database/impl/objects/ReleaseArtistLink.cpp @@ -24,6 +24,10 @@ #include "core/ILogger.hpp" #include "database/Session.hpp" #include "database/objects/Artist.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" diff --git a/src/libs/database/impl/objects/StarredTrack.cpp b/src/libs/database/impl/objects/StarredTrack.cpp index 74230219..ed6ebecf 100644 --- a/src/libs/database/impl/objects/StarredTrack.cpp +++ b/src/libs/database/impl/objects/StarredTrack.cpp @@ -23,6 +23,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" diff --git a/src/libs/database/impl/objects/Track.cpp b/src/libs/database/impl/objects/Track.cpp index ff8ad52d..028b68f9 100644 --- a/src/libs/database/impl/objects/Track.cpp +++ b/src/libs/database/impl/objects/Track.cpp @@ -30,8 +30,12 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/TrackArtistLink.hpp" #include "database/objects/TrackEmbeddedImage.hpp" @@ -109,6 +113,34 @@ namespace lms::db query.where(oss.str()); } + if (params.filters.genre.isValid()) + { + query.join("track_genre t_g ON t_g.track_id = t.id") + .where("t_g.genre_id = ?") + .bind(params.filters.genre); + } + + if (params.filters.grouping.isValid()) + { + query.join("track_grouping t_gr ON t_gr.track_id = t.id") + .where("t_gr.grouping_id = ?") + .bind(params.filters.grouping); + } + + if (params.filters.language.isValid()) + { + query.join("track_language t_l ON t_l.track_id = t.id") + .where("t_l.language_id = ?") + .bind(params.filters.language); + } + + if (params.filters.mood.isValid()) + { + query.join("track_mood t_m ON t_m.track_id = t.id") + .where("t_m.mood_id = ?") + .bind(params.filters.mood); + } + if (params.artist.isValid() || !params.artistName.empty()) { query.join("artist a ON a.id = t_a_l.artist_id") @@ -446,6 +478,62 @@ namespace lms::db return utils::fetchQueryResults(query); } + std::vector Track::getGenres() const + { + return utils::fetchQueryResults(_genres.find()); + } + + std::vector Track::getGenreIds() const + { + assert(session()); + + const auto query{ session()->query("SELECT t_g.genre_id FROM track_genre t_g").where("t_g.track_id = ?").bind(getId()) }; + + return utils::fetchQueryResults(query); + } + + std::vector Track::getGroupings() const + { + return utils::fetchQueryResults(_groupings.find()); + } + + std::vector Track::getGroupingIds() const + { + assert(session()); + + const auto query{ session()->query("SELECT t_gr.grouping_id FROM track_grouping t_gr").where("t_gr.track_id = ?").bind(getId()) }; + + return utils::fetchQueryResults(query); + } + + std::vector Track::getLanguages() const + { + return utils::fetchQueryResults(_languages.find()); + } + + std::vector Track::getLanguageIds() const + { + assert(session()); + + const auto query{ session()->query("SELECT t_l.language_id FROM track_language t_l").where("t_l.track_id = ?").bind(getId()) }; + + return utils::fetchQueryResults(query); + } + + std::vector Track::getMoods() const + { + return utils::fetchQueryResults(_moods.find()); + } + + std::vector Track::getMoodIds() const + { + assert(session()); + + const auto query{ session()->query("SELECT t_m.mood_id FROM track_mood t_m").where("t_m.track_id = ?").bind(getId()) }; + + return utils::fetchQueryResults(query); + } + ObjectPtr Track::getMediaLibrary() const { return _mediaLibrary; @@ -566,6 +654,34 @@ namespace lms::db _clusters.insert(getDboPtr(cluster)); } + void Track::setGenres(std::span> genres) + { + _genres.clear(); + for (const ObjectPtr& genre : genres) + _genres.insert(getDboPtr(genre)); + } + + void Track::setGroupings(std::span> groupings) + { + _groupings.clear(); + for (const ObjectPtr& grouping : groupings) + _groupings.insert(getDboPtr(grouping)); + } + + void Track::setLanguages(std::span> languages) + { + _languages.clear(); + for (const ObjectPtr& language : languages) + _languages.insert(getDboPtr(language)); + } + + void Track::setMoods(std::span> moods) + { + _moods.clear(); + for (const ObjectPtr& mood : moods) + _moods.insert(getDboPtr(mood)); + } + void Track::clearLyrics() { _trackLyrics.clear(); diff --git a/src/libs/database/impl/objects/TrackArtistLink.cpp b/src/libs/database/impl/objects/TrackArtistLink.cpp index 8ad07317..e4e1a238 100644 --- a/src/libs/database/impl/objects/TrackArtistLink.cpp +++ b/src/libs/database/impl/objects/TrackArtistLink.cpp @@ -24,6 +24,10 @@ #include "core/ILogger.hpp" #include "database/Session.hpp" #include "database/objects/Artist.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "Utils.hpp" diff --git a/src/libs/database/impl/objects/TrackBookmark.cpp b/src/libs/database/impl/objects/TrackBookmark.cpp index aa358bd7..7da5f4fc 100644 --- a/src/libs/database/impl/objects/TrackBookmark.cpp +++ b/src/libs/database/impl/objects/TrackBookmark.cpp @@ -22,6 +22,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" diff --git a/src/libs/database/impl/objects/TrackEmbeddedImage.cpp b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp index 507ca4bb..5a75f034 100644 --- a/src/libs/database/impl/objects/TrackEmbeddedImage.cpp +++ b/src/libs/database/impl/objects/TrackEmbeddedImage.cpp @@ -23,6 +23,10 @@ #include "database/Session.hpp" #include "database/Types.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackEmbeddedImageLink.hpp" diff --git a/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp index 4cd05a08..92d6fdd2 100644 --- a/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp +++ b/src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp @@ -23,6 +23,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackEmbeddedImage.hpp" diff --git a/src/libs/database/impl/objects/TrackList.cpp b/src/libs/database/impl/objects/TrackList.cpp index 2f35e473..bfdf6b5a 100644 --- a/src/libs/database/impl/objects/TrackList.cpp +++ b/src/libs/database/impl/objects/TrackList.cpp @@ -25,6 +25,10 @@ #include "database/Session.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/PlayListFile.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" diff --git a/src/libs/database/impl/objects/TrackLyrics.cpp b/src/libs/database/impl/objects/TrackLyrics.cpp index e580efbe..666492a2 100644 --- a/src/libs/database/impl/objects/TrackLyrics.cpp +++ b/src/libs/database/impl/objects/TrackLyrics.cpp @@ -25,6 +25,10 @@ #include "database/Session.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" diff --git a/src/libs/database/impl/objects/TrackMusicNNEmbeddings.cpp b/src/libs/database/impl/objects/TrackMusicNNEmbeddings.cpp index 4ea93deb..214afc43 100644 --- a/src/libs/database/impl/objects/TrackMusicNNEmbeddings.cpp +++ b/src/libs/database/impl/objects/TrackMusicNNEmbeddings.cpp @@ -22,6 +22,10 @@ #include #include "database/Session.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Track.hpp" #include "Utils.hpp" diff --git a/src/libs/database/impl/objects/User.cpp b/src/libs/database/impl/objects/User.cpp index 1bc03388..1de617f3 100644 --- a/src/libs/database/impl/objects/User.cpp +++ b/src/libs/database/impl/objects/User.cpp @@ -27,6 +27,10 @@ #include "database/Session.hpp" #include "database/objects/Artist.hpp" #include "database/objects/AuthToken.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/UIState.hpp" diff --git a/src/libs/database/include/database/objects/Cluster.hpp b/src/libs/database/include/database/objects/Cluster.hpp index 01a60648..6a53e9eb 100644 --- a/src/libs/database/include/database/objects/Cluster.hpp +++ b/src/libs/database/include/database/objects/Cluster.hpp @@ -104,21 +104,13 @@ namespace lms::db // Accessors std::string_view getName() const { return _name; } ObjectPtr getType() const { return _clusterType; } - std::size_t getTrackCount() const { return _trackCount; } RangeResults getTracks(std::optional range = std::nullopt) const; - std::size_t getReleasesCount() const { return _releaseCount; }; - - void setReleaseCount(std::size_t releaseCount) { _releaseCount = releaseCount; } - void setTrackCount(std::size_t trackCount) { _trackCount = trackCount; } void addTrack(ObjectPtr track); template void persist(Action& a) { Wt::Dbo::field(a, _name, "name"); - // cached field since queries are too long - Wt::Dbo::field(a, _trackCount, "track_count"); - Wt::Dbo::field(a, _releaseCount, "release_count"); Wt::Dbo::belongsTo(a, _clusterType, "cluster_type", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); @@ -130,8 +122,6 @@ namespace lms::db static pointer create(Session& session, ObjectPtr type, std::string_view name); std::string _name; - int _trackCount{}; - int _releaseCount{}; Wt::Dbo::ptr _clusterType; Wt::Dbo::collection> _tracks; diff --git a/src/libs/database/include/database/objects/Filters.hpp b/src/libs/database/include/database/objects/Filters.hpp index a31d9de8..f8c79521 100644 --- a/src/libs/database/include/database/objects/Filters.hpp +++ b/src/libs/database/include/database/objects/Filters.hpp @@ -26,8 +26,12 @@ #include "core/media/Codec.hpp" #include "database/objects/ClusterId.hpp" +#include "database/objects/GenreId.hpp" +#include "database/objects/GroupingId.hpp" #include "database/objects/LabelId.hpp" +#include "database/objects/LanguageId.hpp" #include "database/objects/MediaLibraryId.hpp" +#include "database/objects/MoodId.hpp" #include "database/objects/ReleaseTypeId.hpp" namespace lms::db @@ -36,7 +40,11 @@ namespace lms::db { MediaLibraryId mediaLibrary; // tracks that belongs to this library std::vector clusters; // tracks that belong to *all* these clusters + GenreId genre; // tracks that belong to this genre + GroupingId grouping; // tracks that belong to this grouping LabelId label; // tracks which release has this label + LanguageId language; // tracks that belong to this language + MoodId mood; // tracks that belong to this mood ReleaseTypeId releaseType; // tracks which release has this type std::optional codec; // tracks that match this codec @@ -45,6 +53,26 @@ namespace lms::db clusters.assign(std::cbegin(_clusters), std::cend(_clusters)); return *this; } + Filters& setGenre(GenreId _genre) + { + genre = _genre; + return *this; + } + Filters& setGrouping(GroupingId _grouping) + { + grouping = _grouping; + return *this; + } + Filters& setLanguage(LanguageId _language) + { + language = _language; + return *this; + } + Filters& setMood(MoodId _mood) + { + mood = _mood; + return *this; + } Filters& setMediaLibrary(MediaLibraryId _mediaLibrary) { mediaLibrary = _mediaLibrary; diff --git a/src/libs/database/include/database/objects/Genre.hpp b/src/libs/database/include/database/objects/Genre.hpp new file mode 100644 index 00000000..3c4ed88a --- /dev/null +++ b/src/libs/database/include/database/objects/Genre.hpp @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2025 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 +#include + +#include +#include + +#include "database/Object.hpp" +#include "database/Types.hpp" +#include "database/objects/ArtistId.hpp" +#include "database/objects/GenreId.hpp" +#include "database/objects/ReleaseId.hpp" +#include "database/objects/TrackId.hpp" +#include "database/objects/Types.hpp" + +namespace lms::db +{ + class Session; + class Track; + + class Genre final : public Object + { + public: + static constexpr std::size_t maxNameLength{ 512 }; + + struct FindParameters + { + std::optional range; + GenreSortMethod sortMethod{ GenreSortMethod::None }; + ArtistId artist; // if set, genres of tracks by this artist + TrackId track; // if set, genres of this track + ReleaseId release; // if set, genres involved in this release + + FindParameters& setRange(std::optional _range) + { + range = _range; + return *this; + } + FindParameters& setSortMethod(GenreSortMethod _method) + { + sortMethod = _method; + return *this; + } + FindParameters& setTrack(TrackId _track) + { + track = _track; + return *this; + } + FindParameters& setArtist(ArtistId _artist) + { + artist = _artist; + return *this; + } + FindParameters& setRelease(ReleaseId _release) + { + release = _release; + return *this; + } + }; + + Genre() = default; + + static std::size_t getCount(Session& session); + static RangeResults findIds(Session& session, const FindParameters& params); + static RangeResults find(Session& session, const FindParameters& params); + static void find(Session& session, const FindParameters& params, std::function func); + static pointer find(Session& session, GenreId id); + static pointer find(Session& session, std::string_view name); + static RangeResults findOrphanIds(Session& session, std::optional range = std::nullopt); + + static std::size_t computeTrackCount(Session& session, GenreId id); + static std::size_t computeReleaseCount(Session& session, GenreId id); + + std::string_view getName() const { return _name; } + std::size_t getTrackCount() const { return _trackCount; } + std::size_t getReleaseCount() const { return _releaseCount; } + + void setTrackCount(std::size_t count) { _trackCount = count; } + void setReleaseCount(std::size_t count) { _releaseCount = count; } + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::field(a, _trackCount, "track_count"); + Wt::Dbo::field(a, _releaseCount, "release_count"); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_genre", "", Wt::Dbo::OnDeleteCascade); + } + + private: + friend class Session; + Genre(std::string_view name); + static pointer create(Session& session, std::string_view name); + + std::string _name; + int _trackCount{}; + int _releaseCount{}; + + Wt::Dbo::collection> _tracks; + }; + +} // namespace lms::db diff --git a/src/libs/database/include/database/objects/GenreId.hpp b/src/libs/database/include/database/objects/GenreId.hpp new file mode 100644 index 00000000..34c1773e --- /dev/null +++ b/src/libs/database/include/database/objects/GenreId.hpp @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 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 "database/IdType.hpp" + +LMS_DECLARE_IDTYPE(GenreId) diff --git a/src/libs/database/include/database/objects/Grouping.hpp b/src/libs/database/include/database/objects/Grouping.hpp new file mode 100644 index 00000000..26d758c7 --- /dev/null +++ b/src/libs/database/include/database/objects/Grouping.hpp @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2025 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 +#include + +#include +#include + +#include "database/Object.hpp" +#include "database/Types.hpp" +#include "database/objects/ArtistId.hpp" +#include "database/objects/GroupingId.hpp" +#include "database/objects/ReleaseId.hpp" +#include "database/objects/TrackId.hpp" +#include "database/objects/Types.hpp" + +namespace lms::db +{ + class Session; + class Track; + + class Grouping final : public Object + { + public: + static constexpr std::size_t maxNameLength{ 512 }; + + struct FindParameters + { + std::optional range; + GroupingSortMethod sortMethod{ GroupingSortMethod::None }; + ArtistId artist; // if set, groupings of tracks by this artist + TrackId track; // if set, groupings of this track + ReleaseId release; // if set, groupings involved in this release + + FindParameters& setRange(std::optional _range) + { + range = _range; + return *this; + } + FindParameters& setSortMethod(GroupingSortMethod _method) + { + sortMethod = _method; + return *this; + } + FindParameters& setTrack(TrackId _track) + { + track = _track; + return *this; + } + FindParameters& setArtist(ArtistId _artist) + { + artist = _artist; + return *this; + } + FindParameters& setRelease(ReleaseId _release) + { + release = _release; + return *this; + } + }; + + Grouping() = default; + + static std::size_t getCount(Session& session); + static RangeResults findIds(Session& session, const FindParameters& params); + static RangeResults find(Session& session, const FindParameters& params); + static void find(Session& session, const FindParameters& params, std::function func); + static pointer find(Session& session, GroupingId id); + static pointer find(Session& session, std::string_view name); + static RangeResults findOrphanIds(Session& session, std::optional range = std::nullopt); + + std::string_view getName() const { return _name; } + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_grouping", "", Wt::Dbo::OnDeleteCascade); + } + + private: + friend class Session; + Grouping(std::string_view name); + static pointer create(Session& session, std::string_view name); + + std::string _name; + Wt::Dbo::collection> _tracks; + }; + +} // namespace lms::db diff --git a/src/libs/database/include/database/objects/GroupingId.hpp b/src/libs/database/include/database/objects/GroupingId.hpp new file mode 100644 index 00000000..f865aa0f --- /dev/null +++ b/src/libs/database/include/database/objects/GroupingId.hpp @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 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 "database/IdType.hpp" + +LMS_DECLARE_IDTYPE(GroupingId) diff --git a/src/libs/database/include/database/objects/Language.hpp b/src/libs/database/include/database/objects/Language.hpp new file mode 100644 index 00000000..b5db8178 --- /dev/null +++ b/src/libs/database/include/database/objects/Language.hpp @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2025 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 +#include + +#include +#include + +#include "database/Object.hpp" +#include "database/Types.hpp" +#include "database/objects/ArtistId.hpp" +#include "database/objects/LanguageId.hpp" +#include "database/objects/ReleaseId.hpp" +#include "database/objects/TrackId.hpp" +#include "database/objects/Types.hpp" + +namespace lms::db +{ + class Session; + class Track; + + class Language final : public Object + { + public: + static constexpr std::size_t maxNameLength{ 512 }; + + struct FindParameters + { + std::optional range; + LanguageSortMethod sortMethod{ LanguageSortMethod::None }; + ArtistId artist; // if set, languages of tracks by this artist + TrackId track; // if set, languages of this track + ReleaseId release; // if set, languages involved in this release + + FindParameters& setRange(std::optional _range) + { + range = _range; + return *this; + } + FindParameters& setSortMethod(LanguageSortMethod _method) + { + sortMethod = _method; + return *this; + } + FindParameters& setTrack(TrackId _track) + { + track = _track; + return *this; + } + FindParameters& setArtist(ArtistId _artist) + { + artist = _artist; + return *this; + } + FindParameters& setRelease(ReleaseId _release) + { + release = _release; + return *this; + } + }; + + Language() = default; + + static std::size_t getCount(Session& session); + static RangeResults findIds(Session& session, const FindParameters& params); + static RangeResults find(Session& session, const FindParameters& params); + static void find(Session& session, const FindParameters& params, std::function func); + static pointer find(Session& session, LanguageId id); + static pointer find(Session& session, std::string_view name); + static RangeResults findOrphanIds(Session& session, std::optional range = std::nullopt); + + std::string_view getName() const { return _name; } + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_language", "", Wt::Dbo::OnDeleteCascade); + } + + private: + friend class Session; + Language(std::string_view name); + static pointer create(Session& session, std::string_view name); + + std::string _name; + Wt::Dbo::collection> _tracks; + }; + +} // namespace lms::db diff --git a/src/libs/database/include/database/objects/LanguageId.hpp b/src/libs/database/include/database/objects/LanguageId.hpp new file mode 100644 index 00000000..72b2d74b --- /dev/null +++ b/src/libs/database/include/database/objects/LanguageId.hpp @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 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 "database/IdType.hpp" + +LMS_DECLARE_IDTYPE(LanguageId) diff --git a/src/libs/database/include/database/objects/Mood.hpp b/src/libs/database/include/database/objects/Mood.hpp new file mode 100644 index 00000000..f12b4ea6 --- /dev/null +++ b/src/libs/database/include/database/objects/Mood.hpp @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2025 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 +#include + +#include +#include + +#include "database/Object.hpp" +#include "database/Types.hpp" +#include "database/objects/ArtistId.hpp" +#include "database/objects/MoodId.hpp" +#include "database/objects/ReleaseId.hpp" +#include "database/objects/TrackId.hpp" +#include "database/objects/Types.hpp" + +namespace lms::db +{ + class Session; + class Track; + + class Mood final : public Object + { + public: + static constexpr std::size_t maxNameLength{ 512 }; + + struct FindParameters + { + std::optional range; + MoodSortMethod sortMethod{ MoodSortMethod::None }; + ArtistId artist; // if set, moods of tracks by this artist + TrackId track; // if set, moods of this track + ReleaseId release; // if set, moods involved in this release + + FindParameters& setRange(std::optional _range) + { + range = _range; + return *this; + } + FindParameters& setSortMethod(MoodSortMethod _method) + { + sortMethod = _method; + return *this; + } + FindParameters& setTrack(TrackId _track) + { + track = _track; + return *this; + } + FindParameters& setArtist(ArtistId _artist) + { + artist = _artist; + return *this; + } + FindParameters& setRelease(ReleaseId _release) + { + release = _release; + return *this; + } + }; + + Mood() = default; + + static std::size_t getCount(Session& session); + static RangeResults findIds(Session& session, const FindParameters& params); + static RangeResults find(Session& session, const FindParameters& params); + static void find(Session& session, const FindParameters& params, std::function func); + static pointer find(Session& session, MoodId id); + static pointer find(Session& session, std::string_view name); + static RangeResults findOrphanIds(Session& session, std::optional range = std::nullopt); + + std::string_view getName() const { return _name; } + + template + void persist(Action& a) + { + Wt::Dbo::field(a, _name, "name"); + Wt::Dbo::hasMany(a, _tracks, Wt::Dbo::ManyToMany, "track_mood", "", Wt::Dbo::OnDeleteCascade); + } + + private: + friend class Session; + Mood(std::string_view name); + static pointer create(Session& session, std::string_view name); + + std::string _name; + Wt::Dbo::collection> _tracks; + }; + +} // namespace lms::db diff --git a/src/libs/database/include/database/objects/MoodId.hpp b/src/libs/database/include/database/objects/MoodId.hpp new file mode 100644 index 00000000..6892d319 --- /dev/null +++ b/src/libs/database/include/database/objects/MoodId.hpp @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2025 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 "database/IdType.hpp" + +LMS_DECLARE_IDTYPE(MoodId) diff --git a/src/libs/database/include/database/objects/Track.hpp b/src/libs/database/include/database/objects/Track.hpp index 9be95a2a..d9783b9f 100644 --- a/src/libs/database/include/database/objects/Track.hpp +++ b/src/libs/database/include/database/objects/Track.hpp @@ -45,8 +45,12 @@ #include "database/objects/ClusterId.hpp" #include "database/objects/DirectoryId.hpp" #include "database/objects/Filters.hpp" +#include "database/objects/GenreId.hpp" +#include "database/objects/GroupingId.hpp" +#include "database/objects/LanguageId.hpp" #include "database/objects/MediaLibraryId.hpp" #include "database/objects/MediumId.hpp" +#include "database/objects/MoodId.hpp" #include "database/objects/ReleaseId.hpp" #include "database/objects/TrackEmbeddedImageId.hpp" #include "database/objects/TrackId.hpp" @@ -62,6 +66,10 @@ namespace lms::db class Cluster; class ClusterType; class Directory; + class Genre; + class Grouping; + class Language; + class Mood; class TrackEmbeddedImageLink; class MediaLibrary; class Medium; @@ -270,6 +278,10 @@ namespace lms::db void setRelease(ObjectPtr release) { _release = getDboPtr(release); } void setMedium(ObjectPtr medium) { _medium = getDboPtr(medium); } void setClusters(const std::vector>& clusters); + void setGenres(std::span> genres); + void setGroupings(std::span> groupings); + void setLanguages(std::span> languages); + void setMoods(std::span> moods); void clearLyrics(); void clearEmbeddedLyrics(); void addLyrics(const ObjectPtr& lyrics); @@ -330,6 +342,14 @@ namespace lms::db ObjectPtr getMedium() const { return _medium; } std::vector> getClusters() const; std::vector getClusterIds() const; + std::vector> getGenres() const; + std::vector getGenreIds() const; + std::vector> getGroupings() const; + std::vector getGroupingIds() const; + std::vector> getLanguages() const; + std::vector getLanguageIds() const; + std::vector> getMoods() const; + std::vector getMoodIds() const; ObjectPtr getMediaLibrary() const; ObjectPtr getDirectory() const; ObjectPtr getPreferredArtwork() const; @@ -378,6 +398,10 @@ namespace lms::db Wt::Dbo::belongsTo(a, _preferredMediaArtwork, "preferred_media_artwork", Wt::Dbo::OnDeleteSetNull); Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "track"); Wt::Dbo::hasMany(a, _clusters, Wt::Dbo::ManyToMany, "track_cluster", "", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _genres, Wt::Dbo::ManyToMany, "track_genre", "", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _groupings, Wt::Dbo::ManyToMany, "track_grouping", "", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _languages, Wt::Dbo::ManyToMany, "track_language", "", Wt::Dbo::OnDeleteCascade); + Wt::Dbo::hasMany(a, _moods, Wt::Dbo::ManyToMany, "track_mood", "", Wt::Dbo::OnDeleteCascade); Wt::Dbo::hasMany(a, _trackLyrics, Wt::Dbo::ManyToOne, "track"); Wt::Dbo::hasMany(a, _embeddedImageLinks, Wt::Dbo::ManyToOne, "track"); } @@ -429,6 +453,10 @@ namespace lms::db Wt::Dbo::ptr _preferredMediaArtwork; Wt::Dbo::collection> _trackArtistLinks; Wt::Dbo::collection> _clusters; + Wt::Dbo::collection> _genres; + Wt::Dbo::collection> _groupings; + Wt::Dbo::collection> _languages; + Wt::Dbo::collection> _moods; Wt::Dbo::collection> _trackLyrics; Wt::Dbo::collection> _embeddedImageLinks; }; diff --git a/src/libs/database/include/database/objects/Types.hpp b/src/libs/database/include/database/objects/Types.hpp index f470d9e6..851e66b9 100644 --- a/src/libs/database/include/database/objects/Types.hpp +++ b/src/libs/database/include/database/objects/Types.hpp @@ -65,6 +65,20 @@ namespace lms::db Name, }; + enum class GenreSortMethod + { + None, + Name, + TrackCountDesc, + }; + + enum class GroupingSortMethod + { + None, + Name, + TrackCountDesc, + }; + using ImageHashType = core::TaggedType; enum class LabelSortMethod @@ -73,6 +87,20 @@ namespace lms::db Name, }; + enum class LanguageSortMethod + { + None, + Name, + TrackCountDesc, + }; + + enum class MoodSortMethod + { + None, + Name, + TrackCountDesc, + }; + enum class MediumSortMethod { None, diff --git a/src/libs/database/test/CMakeLists.txt b/src/libs/database/test/CMakeLists.txt index 5f619c27..90a204f1 100644 --- a/src/libs/database/test/CMakeLists.txt +++ b/src/libs/database/test/CMakeLists.txt @@ -8,10 +8,14 @@ add_executable(test-database Common.cpp DatabaseTest.cpp Directory.cpp + Genre.cpp + Grouping.cpp Image.cpp + Language.cpp Listen.cpp Medium.cpp Migration.cpp + Mood.cpp PlayListFile.cpp Podcast.cpp RatedArtist.cpp diff --git a/src/libs/database/test/Common.cpp b/src/libs/database/test/Common.cpp index b9377ff4..a7e3df7d 100644 --- a/src/libs/database/test/Common.cpp +++ b/src/libs/database/test/Common.cpp @@ -59,8 +59,6 @@ namespace lms::db::tests void DatabaseFixture::testDatabaseEmpty() { - using namespace db; - auto transaction{ session.createReadTransaction() }; EXPECT_TRUE(session.areAllTablesEmpty()); diff --git a/src/libs/database/test/Common.hpp b/src/libs/database/test/Common.hpp index 26ffa066..c2f89154 100644 --- a/src/libs/database/test/Common.hpp +++ b/src/libs/database/test/Common.hpp @@ -29,8 +29,12 @@ #include "database/Types.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/Listen.hpp" #include "database/objects/MediaLibrary.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ScanSettings.hpp" #include "database/objects/Track.hpp" diff --git a/src/libs/database/test/Genre.cpp b/src/libs/database/test/Genre.cpp new file mode 100644 index 00000000..034a3095 --- /dev/null +++ b/src/libs/database/test/Genre.cpp @@ -0,0 +1,233 @@ +/* + * Copyright (C) 2025 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 "Common.hpp" + +namespace lms::db::tests +{ + using ScopedGenre = ScopedEntity; + + TEST_F(DatabaseFixture, Genre_create) + { + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Genre::getCount(session), 0); + } + + ScopedGenre genre{ session, "Rock" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Genre::getCount(session), 1); + + const Genre::pointer found{ Genre::find(session, genre.getId()) }; + ASSERT_TRUE(found); + EXPECT_EQ(found->getName(), "Rock"); + EXPECT_EQ(found->getTrackCount(), 0); + EXPECT_EQ(found->getReleaseCount(), 0); + } + } + + TEST_F(DatabaseFixture, Genre_findByName) + { + ScopedGenre genre{ session, "Jazz" }; + + { + auto transaction{ session.createReadTransaction() }; + + EXPECT_TRUE(Genre::find(session, "Jazz")); + EXPECT_FALSE(Genre::find(session, "jazz")); + EXPECT_FALSE(Genre::find(session, "")); + EXPECT_FALSE(Genre::find(session, "Jaz")); + } + } + + TEST_F(DatabaseFixture, Genre_orphan) + { + ScopedGenre genre{ session, "Blues" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto orphans{ Genre::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), genre.getId()); + } + } + + TEST_F(DatabaseFixture, Genre_singleTrack) + { + ScopedTrack track{ session }; + ScopedGenre genre1{ session, "Metal" }; + ScopedGenre genre2{ session, "Punk" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Genre::findOrphanIds(session).results.size(), 2); + EXPECT_EQ(track->getGenres().size(), 0); + EXPECT_EQ(track->getGenreIds().size(), 0); + EXPECT_EQ(Genre::computeTrackCount(session, genre1.getId()), 0); + EXPECT_EQ(Genre::computeTrackCount(session, genre2.getId()), 0); + } + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setGenres(std::array{ genre1.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto genres{ Genre::findIds(session, Genre::FindParameters{}.setTrack(track.getId())) }; + ASSERT_EQ(genres.results.size(), 1); + EXPECT_EQ(genres.results.front(), genre1.getId()); + + EXPECT_EQ(Genre::computeTrackCount(session, genre1.getId()), 1); + EXPECT_EQ(Genre::computeTrackCount(session, genre2.getId()), 0); + + const auto orphans{ Genre::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), genre2.getId()); + + const auto trackGenres{ track->getGenres() }; + ASSERT_EQ(trackGenres.size(), 1); + EXPECT_EQ(trackGenres.front()->getId(), genre1.getId()); + + const auto trackGenreIds{ track->getGenreIds() }; + ASSERT_EQ(trackGenreIds.size(), 1); + EXPECT_EQ(trackGenreIds.front(), genre1.getId()); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGenre(genre1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGenre(genre2.getId()))) }; + EXPECT_EQ(tracks2.results.size(), 0); + } + } + + TEST_F(DatabaseFixture, Genre_multipleGenresOnTrack) + { + ScopedTrack track{ session }; + ScopedGenre genre1{ session, "Electronic" }; + ScopedGenre genre2{ session, "Ambient" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setGenres(std::array{ genre1.get(), genre2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Genre::computeTrackCount(session, genre1.getId()), 1); + EXPECT_EQ(Genre::computeTrackCount(session, genre2.getId()), 1); + EXPECT_EQ(Genre::findOrphanIds(session).results.size(), 0); + + const auto trackGenres{ track->getGenres() }; + EXPECT_EQ(trackGenres.size(), 2); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGenre(genre1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGenre(genre2.getId()))) }; + ASSERT_EQ(tracks2.results.size(), 1); + EXPECT_EQ(tracks2.results.front(), track.getId()); + } + } + + TEST_F(DatabaseFixture, Genre_computeReleaseCount) + { + ScopedRelease release{ session, "MyRelease" }; + ScopedTrack track{ session }; + ScopedGenre genre{ session, "Classical" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setRelease(release.get()); + track.get().modify()->setGenres(std::array{ genre.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Genre::computeTrackCount(session, genre.getId()), 1); + EXPECT_EQ(Genre::computeReleaseCount(session, genre.getId()), 1); + } + } + + TEST_F(DatabaseFixture, Genre_nameTruncation) + { + const std::string longName(Genre::maxNameLength + 100, 'x'); + const std::string expectedName(Genre::maxNameLength, 'x'); + + { + auto transaction{ session.createWriteTransaction() }; + Genre::pointer genre{ session.create(longName) }; + ASSERT_TRUE(genre); + EXPECT_EQ(genre->getName().size(), Genre::maxNameLength); + EXPECT_EQ(genre->getName(), expectedName); + genre.remove(); + } + } + + TEST_F(DatabaseFixture, Genre_sortByName) + { + ScopedGenre g1{ session, "Zzz" }; + ScopedGenre g2{ session, "Aaa" }; + ScopedGenre g3{ session, "Mmm" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto genres{ Genre::findIds(session, Genre::FindParameters{}.setSortMethod(GenreSortMethod::Name)) }; + ASSERT_EQ(genres.results.size(), 3); + EXPECT_EQ(genres.results[0], g2.getId()); + EXPECT_EQ(genres.results[1], g3.getId()); + EXPECT_EQ(genres.results[2], g1.getId()); + } + } + + TEST_F(DatabaseFixture, Genre_sortByTrackCount) + { + ScopedGenre g1{ session, "Rock" }; + ScopedGenre g2{ session, "Jazz" }; + ScopedTrack track1{ session }; + ScopedTrack track2{ session }; + ScopedTrack track3{ session }; + + { + auto transaction{ session.createWriteTransaction() }; + track1.get().modify()->setGenres(std::array{ g1.get() }); + track2.get().modify()->setGenres(std::array{ g1.get() }); + track3.get().modify()->setGenres(std::array{ g2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto genres{ Genre::findIds(session, Genre::FindParameters{}.setSortMethod(GenreSortMethod::TrackCountDesc)) }; + ASSERT_EQ(genres.results.size(), 2); + EXPECT_EQ(genres.results[0], g1.getId()); + EXPECT_EQ(genres.results[1], g2.getId()); + } + } +} // namespace lms::db::tests diff --git a/src/libs/database/test/Grouping.cpp b/src/libs/database/test/Grouping.cpp new file mode 100644 index 00000000..dcd92973 --- /dev/null +++ b/src/libs/database/test/Grouping.cpp @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2025 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 "Common.hpp" + +namespace lms::db::tests +{ + using ScopedGrouping = ScopedEntity; + + TEST_F(DatabaseFixture, Grouping_create) + { + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Grouping::getCount(session), 0); + } + + ScopedGrouping grouping{ session, "Soundtrack" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Grouping::getCount(session), 1); + + const Grouping::pointer found{ Grouping::find(session, grouping.getId()) }; + ASSERT_TRUE(found); + EXPECT_EQ(found->getName(), "Soundtrack"); + } + } + + TEST_F(DatabaseFixture, Grouping_findByName) + { + ScopedGrouping grouping{ session, "Live" }; + + { + auto transaction{ session.createReadTransaction() }; + + EXPECT_TRUE(Grouping::find(session, "Live")); + EXPECT_FALSE(Grouping::find(session, "live")); + EXPECT_FALSE(Grouping::find(session, "")); + EXPECT_FALSE(Grouping::find(session, "Liv")); + } + } + + TEST_F(DatabaseFixture, Grouping_orphan) + { + ScopedGrouping grouping{ session, "Podcast" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto orphans{ Grouping::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), grouping.getId()); + } + } + + TEST_F(DatabaseFixture, Grouping_singleTrack) + { + ScopedTrack track{ session }; + ScopedGrouping grouping1{ session, "Audiobook" }; + ScopedGrouping grouping2{ session, "Remix" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Grouping::findOrphanIds(session).results.size(), 2); + EXPECT_EQ(track->getGroupings().size(), 0); + EXPECT_EQ(track->getGroupingIds().size(), 0); + } + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setGroupings(std::array{ grouping1.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto groupings{ Grouping::findIds(session, Grouping::FindParameters{}.setTrack(track.getId())) }; + ASSERT_EQ(groupings.results.size(), 1); + EXPECT_EQ(groupings.results.front(), grouping1.getId()); + + const auto orphans{ Grouping::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), grouping2.getId()); + + const auto trackGroupings{ track->getGroupings() }; + ASSERT_EQ(trackGroupings.size(), 1); + EXPECT_EQ(trackGroupings.front()->getId(), grouping1.getId()); + + const auto trackGroupingIds{ track->getGroupingIds() }; + ASSERT_EQ(trackGroupingIds.size(), 1); + EXPECT_EQ(trackGroupingIds.front(), grouping1.getId()); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGrouping(grouping1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGrouping(grouping2.getId()))) }; + EXPECT_EQ(tracks2.results.size(), 0); + } + } + + TEST_F(DatabaseFixture, Grouping_multipleGroupingsOnTrack) + { + ScopedTrack track{ session }; + ScopedGrouping grouping1{ session, "Soundtrack" }; + ScopedGrouping grouping2{ session, "Live" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setGroupings(std::array{ grouping1.get(), grouping2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Grouping::findOrphanIds(session).results.size(), 0); + + const auto trackGroupings{ track->getGroupings() }; + EXPECT_EQ(trackGroupings.size(), 2); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGrouping(grouping1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGrouping(grouping2.getId()))) }; + ASSERT_EQ(tracks2.results.size(), 1); + EXPECT_EQ(tracks2.results.front(), track.getId()); + } + } + + TEST_F(DatabaseFixture, Grouping_sortByName) + { + ScopedGrouping g1{ session, "Zzz" }; + ScopedGrouping g2{ session, "Aaa" }; + ScopedGrouping g3{ session, "Mmm" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto groupings{ Grouping::findIds(session, Grouping::FindParameters{}.setSortMethod(GroupingSortMethod::Name)) }; + ASSERT_EQ(groupings.results.size(), 3); + EXPECT_EQ(groupings.results[0], g2.getId()); + EXPECT_EQ(groupings.results[1], g3.getId()); + EXPECT_EQ(groupings.results[2], g1.getId()); + } + } + + TEST_F(DatabaseFixture, Grouping_sortByTrackCount) + { + ScopedGrouping g1{ session, "Compilation" }; + ScopedGrouping g2{ session, "Live" }; + ScopedTrack track1{ session }; + ScopedTrack track2{ session }; + ScopedTrack track3{ session }; + + { + auto transaction{ session.createWriteTransaction() }; + track1.get().modify()->setGroupings(std::array{ g1.get() }); + track2.get().modify()->setGroupings(std::array{ g1.get() }); + track3.get().modify()->setGroupings(std::array{ g2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto groupings{ Grouping::findIds(session, Grouping::FindParameters{}.setSortMethod(GroupingSortMethod::TrackCountDesc)) }; + ASSERT_EQ(groupings.results.size(), 2); + EXPECT_EQ(groupings.results[0], g1.getId()); + EXPECT_EQ(groupings.results[1], g2.getId()); + } + } +} // namespace lms::db::tests diff --git a/src/libs/database/test/Language.cpp b/src/libs/database/test/Language.cpp new file mode 100644 index 00000000..dcf73d96 --- /dev/null +++ b/src/libs/database/test/Language.cpp @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2025 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 "Common.hpp" + +namespace lms::db::tests +{ + using ScopedLanguage = ScopedEntity; + + TEST_F(DatabaseFixture, Language_create) + { + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Language::getCount(session), 0); + } + + ScopedLanguage language{ session, "eng" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Language::getCount(session), 1); + + const Language::pointer found{ Language::find(session, language.getId()) }; + ASSERT_TRUE(found); + EXPECT_EQ(found->getName(), "eng"); + } + } + + TEST_F(DatabaseFixture, Language_findByName) + { + ScopedLanguage language{ session, "fra" }; + + { + auto transaction{ session.createReadTransaction() }; + + EXPECT_TRUE(Language::find(session, "fra")); + EXPECT_FALSE(Language::find(session, "FRA")); + EXPECT_FALSE(Language::find(session, "")); + EXPECT_FALSE(Language::find(session, "fr")); + } + } + + TEST_F(DatabaseFixture, Language_orphan) + { + ScopedLanguage language{ session, "jpn" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto orphans{ Language::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), language.getId()); + } + } + + TEST_F(DatabaseFixture, Language_singleTrack) + { + ScopedTrack track{ session }; + ScopedLanguage language1{ session, "eng" }; + ScopedLanguage language2{ session, "spa" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Language::findOrphanIds(session).results.size(), 2); + EXPECT_EQ(track->getLanguages().size(), 0); + EXPECT_EQ(track->getLanguageIds().size(), 0); + } + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setLanguages(std::array{ language1.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto languages{ Language::findIds(session, Language::FindParameters{}.setTrack(track.getId())) }; + ASSERT_EQ(languages.results.size(), 1); + EXPECT_EQ(languages.results.front(), language1.getId()); + + const auto orphans{ Language::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), language2.getId()); + + const auto trackLanguages{ track->getLanguages() }; + ASSERT_EQ(trackLanguages.size(), 1); + EXPECT_EQ(trackLanguages.front()->getId(), language1.getId()); + + const auto trackLanguageIds{ track->getLanguageIds() }; + ASSERT_EQ(trackLanguageIds.size(), 1); + EXPECT_EQ(trackLanguageIds.front(), language1.getId()); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setLanguage(language1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setLanguage(language2.getId()))) }; + EXPECT_EQ(tracks2.results.size(), 0); + } + } + + TEST_F(DatabaseFixture, Language_multipleLanguagesOnTrack) + { + ScopedTrack track{ session }; + ScopedLanguage language1{ session, "eng" }; + ScopedLanguage language2{ session, "fra" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setLanguages(std::array{ language1.get(), language2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Language::findOrphanIds(session).results.size(), 0); + + const auto trackLanguages{ track->getLanguages() }; + EXPECT_EQ(trackLanguages.size(), 2); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setLanguage(language1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setLanguage(language2.getId()))) }; + ASSERT_EQ(tracks2.results.size(), 1); + EXPECT_EQ(tracks2.results.front(), track.getId()); + } + } + + TEST_F(DatabaseFixture, Language_sortByName) + { + ScopedLanguage l1{ session, "zho" }; + ScopedLanguage l2{ session, "ara" }; + ScopedLanguage l3{ session, "por" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto languages{ Language::findIds(session, Language::FindParameters{}.setSortMethod(LanguageSortMethod::Name)) }; + ASSERT_EQ(languages.results.size(), 3); + EXPECT_EQ(languages.results[0], l2.getId()); + EXPECT_EQ(languages.results[1], l3.getId()); + EXPECT_EQ(languages.results[2], l1.getId()); + } + } + + TEST_F(DatabaseFixture, Language_sortByTrackCount) + { + ScopedLanguage l1{ session, "eng" }; + ScopedLanguage l2{ session, "fra" }; + ScopedTrack track1{ session }; + ScopedTrack track2{ session }; + ScopedTrack track3{ session }; + + { + auto transaction{ session.createWriteTransaction() }; + track1.get().modify()->setLanguages(std::array{ l1.get() }); + track2.get().modify()->setLanguages(std::array{ l1.get() }); + track3.get().modify()->setLanguages(std::array{ l2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto languages{ Language::findIds(session, Language::FindParameters{}.setSortMethod(LanguageSortMethod::TrackCountDesc)) }; + ASSERT_EQ(languages.results.size(), 2); + EXPECT_EQ(languages.results[0], l1.getId()); + EXPECT_EQ(languages.results[1], l2.getId()); + } + } +} // namespace lms::db::tests diff --git a/src/libs/database/test/Mood.cpp b/src/libs/database/test/Mood.cpp new file mode 100644 index 00000000..b3545237 --- /dev/null +++ b/src/libs/database/test/Mood.cpp @@ -0,0 +1,190 @@ +/* + * Copyright (C) 2025 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 "Common.hpp" + +namespace lms::db::tests +{ + using ScopedMood = ScopedEntity; + + TEST_F(DatabaseFixture, Mood_create) + { + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Mood::getCount(session), 0); + } + + ScopedMood mood{ session, "Happy" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Mood::getCount(session), 1); + + const Mood::pointer found{ Mood::find(session, mood.getId()) }; + ASSERT_TRUE(found); + EXPECT_EQ(found->getName(), "Happy"); + } + } + + TEST_F(DatabaseFixture, Mood_findByName) + { + ScopedMood mood{ session, "Chill" }; + + { + auto transaction{ session.createReadTransaction() }; + + EXPECT_TRUE(Mood::find(session, "Chill")); + EXPECT_FALSE(Mood::find(session, "chill")); + EXPECT_FALSE(Mood::find(session, "")); + EXPECT_FALSE(Mood::find(session, "Chil")); + } + } + + TEST_F(DatabaseFixture, Mood_orphan) + { + ScopedMood mood{ session, "Sad" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto orphans{ Mood::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), mood.getId()); + } + } + + TEST_F(DatabaseFixture, Mood_singleTrack) + { + ScopedTrack track{ session }; + ScopedMood mood1{ session, "Dark" }; + ScopedMood mood2{ session, "Upbeat" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Mood::findOrphanIds(session).results.size(), 2); + EXPECT_EQ(track->getMoods().size(), 0); + EXPECT_EQ(track->getMoodIds().size(), 0); + } + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setMoods(std::array{ mood1.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto moods{ Mood::findIds(session, Mood::FindParameters{}.setTrack(track.getId())) }; + ASSERT_EQ(moods.results.size(), 1); + EXPECT_EQ(moods.results.front(), mood1.getId()); + + const auto orphans{ Mood::findOrphanIds(session) }; + ASSERT_EQ(orphans.results.size(), 1); + EXPECT_EQ(orphans.results.front(), mood2.getId()); + + const auto trackMoods{ track->getMoods() }; + ASSERT_EQ(trackMoods.size(), 1); + EXPECT_EQ(trackMoods.front()->getId(), mood1.getId()); + + const auto trackMoodIds{ track->getMoodIds() }; + ASSERT_EQ(trackMoodIds.size(), 1); + EXPECT_EQ(trackMoodIds.front(), mood1.getId()); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setMood(mood1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setMood(mood2.getId()))) }; + EXPECT_EQ(tracks2.results.size(), 0); + } + } + + TEST_F(DatabaseFixture, Mood_multipleMoodsOnTrack) + { + ScopedTrack track{ session }; + ScopedMood mood1{ session, "Melancholic" }; + ScopedMood mood2{ session, "Romantic" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setMoods(std::array{ mood1.get(), mood2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_EQ(Mood::findOrphanIds(session).results.size(), 0); + + const auto trackMoods{ track->getMoods() }; + EXPECT_EQ(trackMoods.size(), 2); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto tracks{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setMood(mood1.getId()))) }; + ASSERT_EQ(tracks.results.size(), 1); + EXPECT_EQ(tracks.results.front(), track.getId()); + + const auto tracks2{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setMood(mood2.getId()))) }; + ASSERT_EQ(tracks2.results.size(), 1); + EXPECT_EQ(tracks2.results.front(), track.getId()); + } + } + + TEST_F(DatabaseFixture, Mood_sortByName) + { + ScopedMood m1{ session, "Zzz" }; + ScopedMood m2{ session, "Aaa" }; + ScopedMood m3{ session, "Mmm" }; + + { + auto transaction{ session.createReadTransaction() }; + const auto moods{ Mood::findIds(session, Mood::FindParameters{}.setSortMethod(MoodSortMethod::Name)) }; + ASSERT_EQ(moods.results.size(), 3); + EXPECT_EQ(moods.results[0], m2.getId()); + EXPECT_EQ(moods.results[1], m3.getId()); + EXPECT_EQ(moods.results[2], m1.getId()); + } + } + + TEST_F(DatabaseFixture, Mood_sortByTrackCount) + { + ScopedMood m1{ session, "Energetic" }; + ScopedMood m2{ session, "Chill" }; + ScopedTrack track1{ session }; + ScopedTrack track2{ session }; + ScopedTrack track3{ session }; + + { + auto transaction{ session.createWriteTransaction() }; + track1.get().modify()->setMoods(std::array{ m1.get() }); + track2.get().modify()->setMoods(std::array{ m1.get() }); + track3.get().modify()->setMoods(std::array{ m2.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + const auto moods{ Mood::findIds(session, Mood::FindParameters{}.setSortMethod(MoodSortMethod::TrackCountDesc)) }; + ASSERT_EQ(moods.results.size(), 2); + EXPECT_EQ(moods.results[0], m1.getId()); + EXPECT_EQ(moods.results[1], m2.getId()); + } + } +} // namespace lms::db::tests diff --git a/src/libs/database/test/Track.cpp b/src/libs/database/test/Track.cpp index 2cea765d..f68c7ebf 100644 --- a/src/libs/database/test/Track.cpp +++ b/src/libs/database/test/Track.cpp @@ -27,7 +27,11 @@ namespace lms::db::tests { using ScopedArtwork = ScopedEntity; + using ScopedGenre = ScopedEntity; + using ScopedGrouping = ScopedEntity; using ScopedImage = ScopedEntity; + using ScopedLanguage = ScopedEntity; + using ScopedMood = ScopedEntity; TEST_F(DatabaseFixture, Track) { @@ -590,4 +594,33 @@ namespace lms::db::tests EXPECT_EQ(track->getPreferredMediaArtwork(), Artwork::pointer{}); } } + + TEST_F(DatabaseFixture, Track_combinedTagFilters) + { + ScopedTrack track1{ session }; + ScopedTrack track2{ session }; + ScopedGenre genre{ session, "Rock" }; + ScopedMood mood{ session, "Energetic" }; + ScopedGrouping grouping{ session, "Compilation" }; + ScopedLanguage language{ session, "eng" }; + + { + auto transaction{ session.createWriteTransaction() }; + track1.get().modify()->setGenres(std::array{ genre.get() }); + track1.get().modify()->setMoods(std::array{ mood.get() }); + track1.get().modify()->setGroupings(std::array{ grouping.get() }); + track1.get().modify()->setLanguages(std::array{ language.get() }); + track2.get().modify()->setGenres(std::array{ genre.get() }); + track2.get().modify()->setMoods(std::array{ mood.get() }); + track2.get().modify()->setGroupings(std::array{ grouping.get() }); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto results{ Track::findIds(session, Track::FindParameters{}.setFilters(Filters{}.setGenre(genre.getId()).setMood(mood.getId()).setGrouping(grouping.getId()).setLanguage(language.getId()))) }; + ASSERT_EQ(results.results.size(), 1); + EXPECT_EQ(results.results.front(), track1.getId()); + } + } } // namespace lms::db::tests \ No newline at end of file diff --git a/src/libs/services/recommendation/CMakeLists.txt b/src/libs/services/recommendation/CMakeLists.txt index 05124b58..528af399 100644 --- a/src/libs/services/recommendation/CMakeLists.txt +++ b/src/libs/services/recommendation/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(lmsrecommendation STATIC - impl/clusters/ClustersEngine.cpp + impl/tags/TagsEngine.cpp impl/audio-similarity/musicnn/MusicNNEmbeddingEngine.cpp impl/audio-similarity/musicnn/MusicNNEmbeddingProvider.cpp impl/track-selection-constraints/SameArtistConstraint.cpp diff --git a/src/libs/services/recommendation/impl/RecommendationService.cpp b/src/libs/services/recommendation/impl/RecommendationService.cpp index 78a54848..3d12ba29 100644 --- a/src/libs/services/recommendation/impl/RecommendationService.cpp +++ b/src/libs/services/recommendation/impl/RecommendationService.cpp @@ -26,7 +26,7 @@ #include "database/Session.hpp" #include "audio-similarity/musicnn/MusicNNEmbeddingEngine.hpp" -#include "clusters/ClustersEngine.hpp" +#include "tags/TagsEngine.hpp" namespace lms::recommendation { @@ -57,7 +57,7 @@ namespace lms::recommendation switch (type) { case db::ScanSettings::RecommendationEngineType::Clusters: - return std::make_unique(db); + return std::make_unique(db); case db::ScanSettings::RecommendationEngineType::AudioSimilarity: return std::make_unique(db); case db::ScanSettings::RecommendationEngineType::None: diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp b/src/libs/services/recommendation/impl/tags/TagsEngine.cpp similarity index 59% rename from src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp rename to src/libs/services/recommendation/impl/tags/TagsEngine.cpp index 8c01c15c..6d1d87c6 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.cpp +++ b/src/libs/services/recommendation/impl/tags/TagsEngine.cpp @@ -17,7 +17,7 @@ * along with LMS. If not, see . */ -#include "ClustersEngine.hpp" +#include "TagsEngine.hpp" #include #include @@ -28,7 +28,10 @@ #include "database/IDb.hpp" #include "database/Session.hpp" #include "database/objects/Artist.hpp" -#include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackList.hpp" @@ -42,42 +45,48 @@ #include "track-selection-constraints/SameReleaseConstraint.hpp" #include "track-selection-constraints/TrackCandidateContext.hpp" -#define LOG(sev, message) LMS_LOG(RECOMMENDATION, sev, "[clusters] " << message) +#define LOG(sev, message) LMS_LOG(RECOMMENDATION, sev, "[tags] " << message) namespace lms::recommendation { namespace { template - std::vector> computeClusterOverlap( - const std::unordered_map>& profileMap, + std::vector> computeTagOverlap( + const std::unordered_map>& profileMap, const std::unordered_set& excludeIds, - const std::unordered_set& queryClusters) + const std::unordered_set& queryTags) { std::vector> results; - for (const auto& [candidateId, candidateClusters] : profileMap) + + for (const auto& [candidateId, candidateTags] : profileMap) { if (excludeIds.contains(candidateId)) continue; + std::size_t count{}; - for (const db::ClusterId clusterId : candidateClusters) - if (queryClusters.contains(clusterId)) + for (const TagId& tagId : candidateTags) + { + if (queryTags.contains(tagId)) ++count; + } + if (count > 0) results.emplace_back(candidateId, count); } + return results; } template - ResultContainer findSimilarByClusterOverlap( - const std::unordered_map>& profileMap, + ResultContainer findSimilarByTagOverlap( + const std::unordered_map>& profileMap, IdType queryId, - const std::vector& queryClusters, + const std::vector& queryTags, std::size_t maxCount) { - const std::unordered_set querySet{ queryClusters.cbegin(), queryClusters.cend() }; - auto overlapCounts{ computeClusterOverlap(profileMap, { queryId }, querySet) }; + const std::unordered_set querySet{ queryTags.cbegin(), queryTags.cend() }; + auto overlapCounts{ computeTagOverlap(profileMap, { queryId }, querySet) }; const std::size_t resultCount{ std::min(maxCount, overlapCounts.size()) }; std::partial_sort(overlapCounts.begin(), std::next(overlapCounts.begin(), resultCount), overlapCounts.end(), @@ -92,51 +101,51 @@ namespace lms::recommendation } } // namespace - std::unique_ptr createClustersEngine(db::IDb& db) + std::unique_ptr createTagsEngine(db::IDb& db) { - return std::make_unique(db); + return std::make_unique(db); } - ClusterEngine::ClusterEngine(db::IDb& db) + TagsEngine::TagsEngine(db::IDb& db) : _db{ db } { constexpr float sameReleaseWeight{ 0.5F }; constexpr float sameArtistWeight{ 0.5F }; + _trackEvaluator.addHardConstraint(std::make_unique()); _trackEvaluator.addHardConstraint(std::make_unique(_trackMetadata)); _trackEvaluator.addSoftConstraint(std::make_unique(_trackMetadata), sameReleaseWeight); _trackEvaluator.addSoftConstraint(std::make_unique(_trackMetadata), sameArtistWeight); } - ClusterEngine::~ClusterEngine() = default; + TagsEngine::~TagsEngine() = default; - void ClusterEngine::load() + void TagsEngine::load() { - LMS_SCOPED_TRACE_OVERVIEW("ClustersEngine", "Loading"); + LMS_SCOPED_TRACE_OVERVIEW("TagsEngine", "Loading"); LOG(INFO, "loading..."); _trackMetadata.clear(); - _trackClusters.clear(); - _releaseClusters.clear(); - _artistClusters.clear(); + _trackTags.clear(); + _releaseTags.clear(); + _artistTags.clear(); db::Session& session{ _db.getTLSSession() }; auto transaction{ session.createReadTransaction() }; - buildTrackClusters(session); + buildTrackTags(session); buildTrackMetadata(session); - buildReleaseClusters(); - buildArtistClusters(); + buildReleaseTags(); + buildArtistTags(); - LOG(INFO, "loaded " << _trackClusters.size() << " tracks, " << _releaseClusters.size() << " releases, " << _artistClusters.size() << " artists"); + LOG(INFO, "loaded " << _trackTags.size() << " tracks, " << _releaseTags.size() << " releases, " << _artistTags.size() << " artists"); } - void ClusterEngine::buildTrackMetadata(db::Session& session) + void TagsEngine::buildTrackMetadata(db::Session& session) { LOG(DEBUG, "building track metadata..."); - // Ensure cluster tracks with no release/artist have an entry - for (const auto& [trackId, _] : _trackClusters) + for (const auto& [trackId, tags] : _trackTags) _trackMetadata.try_emplace(trackId); db::Track::find(session, db::Track::FindParameters{}, [&](const db::Track::pointer& track) { @@ -159,6 +168,7 @@ namespace lms::recommendation { db::Release::FindParameters params; params.setArtist(artist->getId()); + for (const db::ReleaseId releaseId : db::Release::findIds(session, params).results) { db::Track::FindParameters trackParams; @@ -176,82 +186,126 @@ namespace lms::recommendation std::sort(metadata.artistIds.begin(), metadata.artistIds.end()); } - void ClusterEngine::buildTrackClusters(db::Session& session) + void TagsEngine::buildTrackTags(db::Session& session) { - LOG(DEBUG, "building track clusters..."); + LOG(DEBUG, "building track tags..."); - db::Cluster::find(session, db::Cluster::FindParameters{}, [&](const db::Cluster::pointer& cluster) { - const db::ClusterId clusterId{ cluster->getId() }; - for (const db::TrackId trackId : cluster->getTracks().results) - _trackClusters[trackId].push_back(clusterId); + db::Genre::find(session, db::Genre::FindParameters{}, [&](const db::Genre::pointer& genre) { + const TagId tagId{ .type = TagId::Type::Genre, .id = genre->getId() }; + + db::Track::FindParameters params; + params.filters.setGenre(genre->getId()); + + db::Track::find(session, params, [&](const db::Track::pointer& track) { + _trackTags[track->getId()].push_back(tagId); + }); + }); + + db::Mood::find(session, db::Mood::FindParameters{}, [&](const db::Mood::pointer& mood) { + const TagId tagId{ .type = TagId::Type::Mood, .id = mood->getId() }; + + db::Track::FindParameters params; + params.filters.setMood(mood->getId()); + + db::Track::find(session, params, [&](const db::Track::pointer& track) { + _trackTags[track->getId()].push_back(tagId); + }); + }); + + db::Grouping::find(session, db::Grouping::FindParameters{}, [&](const db::Grouping::pointer& grouping) { + const TagId tagId{ .type = TagId::Type::Grouping, .id = grouping->getId() }; + + db::Track::FindParameters params; + params.filters.setGrouping(grouping->getId()); + + db::Track::find(session, params, [&](const db::Track::pointer& track) { + _trackTags[track->getId()].push_back(tagId); + }); + }); + + db::Language::find(session, db::Language::FindParameters{}, [&](const db::Language::pointer& language) { + const TagId tagId{ .type = TagId::Type::Language, .id = language->getId() }; + + db::Track::FindParameters params; + params.filters.setLanguage(language->getId()); + + db::Track::find(session, params, [&](const db::Track::pointer& track) { + _trackTags[track->getId()].push_back(tagId); + }); }); } - void ClusterEngine::buildReleaseClusters() + void TagsEngine::buildReleaseTags() { - LOG(DEBUG, "building release clusters..."); + LOG(DEBUG, "building release tags..."); - for (const auto& [trackId, clusters] : _trackClusters) + for (const auto& [trackId, tags] : _trackTags) { const auto metaIt{ _trackMetadata.find(trackId) }; if (metaIt == _trackMetadata.cend()) continue; if (const db::ReleaseId releaseId{ metaIt->second.releaseId }; releaseId.isValid()) - for (const db::ClusterId clusterId : clusters) - _releaseClusters[releaseId].push_back(clusterId); + { + for (const TagId& tagId : tags) + _releaseTags[releaseId].push_back(tagId); + } } - for (auto& [_, clusters] : _releaseClusters) + for (auto& [releaseId, tags] : _releaseTags) { - std::sort(clusters.begin(), clusters.end()); - clusters.erase(std::unique(clusters.begin(), clusters.end()), clusters.end()); + std::sort(tags.begin(), tags.end()); + tags.erase(std::unique(tags.begin(), tags.end()), tags.end()); } } - void ClusterEngine::buildArtistClusters() + void TagsEngine::buildArtistTags() { - LOG(DEBUG, "building artist clusters..."); + LOG(DEBUG, "building artist tags..."); - for (const auto& [trackId, clusters] : _trackClusters) + for (const auto& [trackId, tags] : _trackTags) { const auto metaIt{ _trackMetadata.find(trackId) }; if (metaIt == _trackMetadata.cend()) continue; for (const db::ArtistId artistId : metaIt->second.artistIds) - for (const db::ClusterId clusterId : clusters) - _artistClusters[artistId].push_back(clusterId); + { + for (const TagId& tagId : tags) + _artistTags[artistId].push_back(tagId); + } } - for (auto& [_, clusters] : _artistClusters) + for (auto& [artistId, tags] : _artistTags) { - std::sort(clusters.begin(), clusters.end()); - clusters.erase(std::unique(clusters.begin(), clusters.end()), clusters.end()); + std::sort(tags.begin(), tags.end()); + tags.erase(std::unique(tags.begin(), tags.end()), tags.end()); } } - TrackResults ClusterEngine::findSimilarTracks(std::span trackIds, std::size_t maxCount) const + TrackResults TagsEngine::findSimilarTracks(std::span trackIds, std::size_t maxCount) const { - LMS_SCOPED_TRACE_DETAILED("ClustersEngine", "Find similar tracks"); + LMS_SCOPED_TRACE_DETAILED("TagsEngine", "Find similar tracks"); if (maxCount == 0 || trackIds.empty()) return {}; - std::unordered_set queryClusters; + std::unordered_set queryTags; for (const db::TrackId trackId : trackIds) { - const auto it{ _trackClusters.find(trackId) }; - if (it != _trackClusters.cend()) - for (const db::ClusterId clusterId : it->second) - queryClusters.insert(clusterId); + const auto it{ _trackTags.find(trackId) }; + if (it != _trackTags.cend()) + { + for (const TagId& tagId : it->second) + queryTags.insert(tagId); + } } - if (queryClusters.empty()) + if (queryTags.empty()) return {}; const std::unordered_set excludeSet{ std::cbegin(trackIds), std::cend(trackIds) }; - auto overlapCounts{ computeClusterOverlap(_trackClusters, excludeSet, queryClusters) }; + auto overlapCounts{ computeTagOverlap(_trackTags, excludeSet, queryTags) }; static constexpr std::size_t oversamplingFactor{ 5 }; const std::size_t candidateCount{ std::min(maxCount * oversamplingFactor, overlapCounts.size()) }; @@ -268,7 +322,7 @@ namespace lms::recommendation return greedySelect(std::move(candidates), std::move(seeds), maxCount); } - TrackResults ClusterEngine::greedySelect(std::vector candidates, std::vector selectedTracks, std::size_t maxCount) const + TrackResults TagsEngine::greedySelect(std::vector candidates, std::vector selectedTracks, std::size_t maxCount) const { selectedTracks.reserve(selectedTracks.size() + maxCount); @@ -310,9 +364,9 @@ namespace lms::recommendation return res; } - TrackResults ClusterEngine::findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const + TrackResults TagsEngine::findSimilarTracksFromTrackList(db::TrackListId tracklistId, std::size_t maxCount) const { - LMS_SCOPED_TRACE_DETAILED("ClustersEngine", "Find similar tracks from tracklist"); + LMS_SCOPED_TRACE_DETAILED("TagsEngine", "Find similar tracks from tracklist"); if (maxCount == 0) return {}; @@ -335,37 +389,37 @@ namespace lms::recommendation return findSimilarTracks(trackIds, maxCount); } - ReleaseResults ClusterEngine::findSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const + ReleaseResults TagsEngine::findSimilarReleases(db::ReleaseId releaseId, std::size_t maxCount) const { - LMS_SCOPED_TRACE_DETAILED("ClustersEngine", "Find similar releases"); + LMS_SCOPED_TRACE_DETAILED("TagsEngine", "Find similar releases"); if (maxCount == 0) return {}; - const auto queryIt{ _releaseClusters.find(releaseId) }; - if (queryIt == _releaseClusters.cend() || queryIt->second.empty()) + const auto queryIt{ _releaseTags.find(releaseId) }; + if (queryIt == _releaseTags.cend() || queryIt->second.empty()) return {}; - return findSimilarByClusterOverlap(_releaseClusters, releaseId, queryIt->second, maxCount); + return findSimilarByTagOverlap(_releaseTags, releaseId, queryIt->second, maxCount); } - ArtistResults ClusterEngine::findSimilarArtists(db::ArtistId artistId, core::EnumSet linkTypes, std::size_t maxCount) const + ArtistResults TagsEngine::findSimilarArtists(db::ArtistId artistId, core::EnumSet linkTypes, std::size_t maxCount) const { - LMS_SCOPED_TRACE_DETAILED("ClustersEngine", "Find similar artists"); + LMS_SCOPED_TRACE_DETAILED("TagsEngine", "Find similar artists"); if (maxCount == 0 || !linkTypes.contains(db::TrackArtistLinkType::Artist)) return {}; - const auto queryIt{ _artistClusters.find(artistId) }; - if (queryIt == _artistClusters.cend() || queryIt->second.empty()) + const auto queryIt{ _artistTags.find(artistId) }; + if (queryIt == _artistTags.cend() || queryIt->second.empty()) return {}; - return findSimilarByClusterOverlap(_artistClusters, artistId, queryIt->second, maxCount); + return findSimilarByTagOverlap(_artistTags, artistId, queryIt->second, maxCount); } - TrackResults ClusterEngine::findTrackSimilarityPath(db::TrackId startTrackId, db::TrackId endTrackId, std::size_t maxCount) const + TrackResults TagsEngine::findTrackSimilarityPath(db::TrackId startTrackId, db::TrackId endTrackId, std::size_t maxCount) const { - LMS_SCOPED_TRACE_DETAILED("ClustersEngine", "Find track similarity path"); + LMS_SCOPED_TRACE_DETAILED("TagsEngine", "Find track similarity path"); if (maxCount == 0) return {}; diff --git a/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp b/src/libs/services/recommendation/impl/tags/TagsEngine.hpp similarity index 56% rename from src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp rename to src/libs/services/recommendation/impl/tags/TagsEngine.hpp index bd46f9ac..a0dd08ae 100644 --- a/src/libs/services/recommendation/impl/clusters/ClustersEngine.hpp +++ b/src/libs/services/recommendation/impl/tags/TagsEngine.hpp @@ -19,11 +19,14 @@ #pragma once +#include +#include #include #include #include -#include "database/objects/ClusterId.hpp" +#include "database/IdType.hpp" + #include "track-selection-constraints/TrackCandidateEvaluator.hpp" #include "track-selection-constraints/TrackMetadata.hpp" @@ -36,13 +39,48 @@ namespace lms::db namespace lms::recommendation { - class ClusterEngine : public IEngine + struct TagId + { + enum class Type : std::uint8_t + { + Genre, + Mood, + Grouping, + Language + }; + Type type; + db::IdType id; + + auto operator<=>(const TagId&) const = default; + }; +} // namespace lms::recommendation + +namespace std +{ + template<> + struct hash + { + std::size_t operator()(const lms::recommendation::TagId& tagId) const noexcept + { + using UnderlyingType1 = std::underlying_type::type; + using UnderlyingType2 = lms::db::IdType::ValueType; + + const std::size_t h1{ std::hash{}(static_cast(tagId.type)) }; + const std::size_t h2{ std::hash{}(tagId.id.getValue()) }; + return h1 ^ (h2 << 4); + } + }; +} // namespace std + +namespace lms::recommendation +{ + class TagsEngine : public IEngine { public: - ClusterEngine(db::IDb& db); - ~ClusterEngine() override; - ClusterEngine(const ClusterEngine&) = delete; - ClusterEngine& operator=(const ClusterEngine&) = delete; + TagsEngine(db::IDb& db); + ~TagsEngine() override; + TagsEngine(const TagsEngine&) = delete; + TagsEngine& operator=(const TagsEngine&) = delete; private: void load() override; @@ -54,17 +92,17 @@ namespace lms::recommendation ArtistResults findSimilarArtists(db::ArtistId artistId, core::EnumSet linkTypes, std::size_t maxCount) const override; TrackResults greedySelect(std::vector candidates, std::vector selectedTracks, std::size_t maxCount) const; - void buildTrackClusters(db::Session& session); + void buildTrackTags(db::Session& session); void buildTrackMetadata(db::Session& session); - void buildReleaseClusters(); - void buildArtistClusters(); + void buildReleaseTags(); + void buildArtistTags(); db::IDb& _db; TrackMetadataMap _trackMetadata; - std::unordered_map> _trackClusters; - std::unordered_map> _releaseClusters; - std::unordered_map> _artistClusters; + std::unordered_map> _trackTags; + std::unordered_map> _releaseTags; + std::unordered_map> _artistTags; TrackCandidateEvaluator _trackEvaluator; }; } // namespace lms::recommendation diff --git a/src/libs/services/scanner/CMakeLists.txt b/src/libs/services/scanner/CMakeLists.txt index 1abea10a..158a5f5c 100644 --- a/src/libs/services/scanner/CMakeLists.txt +++ b/src/libs/services/scanner/CMakeLists.txt @@ -28,7 +28,7 @@ add_library(lmsscanner STATIC impl/steps/ScanStepCheckForDuplicatedFiles.cpp impl/steps/ScanStepCheckForRemovedFiles.cpp impl/steps/ScanStepCompact.cpp - impl/steps/ScanStepComputeClusterStats.cpp + impl/steps/ScanStepComputeGenreStats.cpp impl/steps/ScanStepExtractMusicNNEmbeddings.cpp impl/steps/ScanStepOptimize.cpp impl/steps/ScanStepRemoveOrphanedDbEntries.cpp diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index d608336f..87e07fd0 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -49,7 +49,7 @@ #include "steps/ScanStepCheckForDuplicatedFiles.hpp" #include "steps/ScanStepCheckForRemovedFiles.hpp" #include "steps/ScanStepCompact.hpp" -#include "steps/ScanStepComputeClusterStats.hpp" +#include "steps/ScanStepComputeGenreStats.hpp" #include "steps/ScanStepExtractMusicNNEmbeddings.hpp" #include "steps/ScanStepOptimize.hpp" #include "steps/ScanStepRemoveOrphanedDbEntries.hpp" @@ -528,7 +528,7 @@ namespace lms::scanner _scanSteps.emplace_back(std::make_unique(params)); _scanSteps.emplace_back(std::make_unique(params)); _scanSteps.emplace_back(std::make_unique(params)); - _scanSteps.emplace_back(std::make_unique(params)); + _scanSteps.emplace_back(std::make_unique(params)); _scanSteps.emplace_back(std::make_unique(params)); // Audio extraction scan step must be last as it is the most long running diff --git a/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.cpp b/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.cpp index 14a8827b..9f7b5918 100644 --- a/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.cpp +++ b/src/libs/services/scanner/impl/scanners/audiofile/AudioFileScanOperation.cpp @@ -35,8 +35,12 @@ #include "database/objects/Artwork.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/Track.hpp" @@ -308,6 +312,62 @@ namespace lms::scanner return dbMedium; } + std::vector getOrCreateGenres(db::Session& session, std::span names) + { + std::vector genres; + genres.reserve(names.size()); + for (const std::string& name : names) + { + db::Genre::pointer genre{ db::Genre::find(session, name) }; + if (!genre) + genre = session.create(name); + genres.push_back(genre); + } + return genres; + } + + std::vector getOrCreateGroupings(db::Session& session, std::span names) + { + std::vector groupings; + groupings.reserve(names.size()); + for (const std::string& name : names) + { + db::Grouping::pointer grouping{ db::Grouping::find(session, name) }; + if (!grouping) + grouping = session.create(name); + groupings.push_back(grouping); + } + return groupings; + } + + std::vector getOrCreateLanguages(db::Session& session, std::span names) + { + std::vector languages; + languages.reserve(names.size()); + for (const std::string& name : names) + { + db::Language::pointer language{ db::Language::find(session, name) }; + if (!language) + language = session.create(name); + languages.push_back(language); + } + return languages; + } + + std::vector getOrCreateMoods(db::Session& session, std::span names) + { + std::vector moods; + moods.reserve(names.size()); + for (const std::string& name : names) + { + db::Mood::pointer mood{ db::Mood::find(session, name) }; + if (!mood) + mood = session.create(name); + moods.push_back(mood); + } + return moods; + } + std::vector getOrCreateClusters(db::Session& session, const Track& track) { std::vector clusters; @@ -327,12 +387,6 @@ namespace lms::scanner } } }; - // TODO: migrate these fields in dedicated tables in DB - getOrCreateClusters("GENRE", track.genres); - getOrCreateClusters("MOOD", track.moods); - getOrCreateClusters("LANGUAGE", track.languages); - getOrCreateClusters("GROUPING", track.groupings); - for (const auto& [tag, values] : track.userExtraTags) getOrCreateClusters(tag, values); @@ -778,6 +832,10 @@ namespace lms::scanner createTrackArtistLinks(dbSession, track, db::TrackArtistLinkType::Performer, role, performers, allowFallback); track.modify()->setClusters(getOrCreateClusters(dbSession, _file->track)); + track.modify()->setGenres(getOrCreateGenres(dbSession, _file->track.genres)); + track.modify()->setGroupings(getOrCreateGroupings(dbSession, _file->track.groupings)); + track.modify()->setLanguages(getOrCreateLanguages(dbSession, _file->track.languages)); + track.modify()->setMoods(getOrCreateMoods(dbSession, _file->track.moods)); track.modify()->setName(title); track.modify()->setTrackNumber(_file->track.position); track.modify()->setDate(_file->track.date); diff --git a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp b/src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.cpp similarity index 56% rename from src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp rename to src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.cpp index e8655afc..be1fdb18 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.cpp @@ -17,68 +17,59 @@ * along with LMS. If not, see . */ -#include "ScanStepComputeClusterStats.hpp" - -#include "core/ILogger.hpp" +#include "ScanStepComputeGenreStats.hpp" #include "database/IDb.hpp" #include "database/Session.hpp" -#include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" #include "ScanContext.hpp" namespace lms::scanner { - bool ScanStepComputeClusterStats::needProcess(const ScanContext& context) const + bool ScanStepComputeGenreStats::needProcess(const ScanContext& context) const { return context.stats.getChangesCount() > 0; } - void ScanStepComputeClusterStats::process(ScanContext& context) + void ScanStepComputeGenreStats::process(ScanContext& context) { using namespace db; Session& dbSession{ _db.getTLSSession() }; - const std::size_t clusterCount{ [&] { + const std::size_t genreCount{ [&] { auto transaction{ dbSession.createReadTransaction() }; - return Cluster::getCount(dbSession); + return Genre::getCount(dbSession); }() }; - context.currentStepStats.totalElems = clusterCount; + context.currentStepStats.totalElems = genreCount; - foreachSubRange(Range{ 0, clusterCount }, 100, [&](Range range) { - const std::vector clusterIds{ [&] { - Cluster::FindParameters params; + foreachSubRange(Range{ 0, genreCount }, 100, [&](Range range) { + const std::vector genreIds{ [&] { + Genre::FindParameters params; params.setRange(range); - - { - auto transaction{ dbSession.createReadTransaction() }; - return std::move(Cluster::findIds(dbSession, params).results); - } + auto transaction{ dbSession.createReadTransaction() }; + return std::move(Genre::findIds(dbSession, params).results); }() }; - for (const ClusterId clusterId : clusterIds) + for (const GenreId genreId : genreIds) { if (_abortScan) break; std::size_t trackCount; std::size_t releaseCount; - { auto transaction{ dbSession.createReadTransaction() }; - - trackCount = Cluster::computeTrackCount(dbSession, clusterId); - releaseCount = Cluster::computeReleaseCount(dbSession, clusterId); + trackCount = Genre::computeTrackCount(dbSession, genreId); + releaseCount = Genre::computeReleaseCount(dbSession, genreId); } - { auto transaction{ dbSession.createWriteTransaction() }; - - auto cluster{ Cluster::find(dbSession, clusterId) }; - cluster.modify()->setTrackCount(trackCount); - cluster.modify()->setReleaseCount(releaseCount); + auto genre{ Genre::find(dbSession, genreId) }; + genre.modify()->setTrackCount(trackCount); + genre.modify()->setReleaseCount(releaseCount); } context.currentStepStats.processedElems++; @@ -87,7 +78,5 @@ namespace lms::scanner return true; }); - - LMS_LOG(DBUPDATER, DEBUG, "Recomputed stats for " << context.currentStepStats.processedElems << " clusters!"); } } // namespace lms::scanner diff --git a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.hpp b/src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.hpp similarity index 91% rename from src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.hpp rename to src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.hpp index 56e0788c..45bfc95e 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepComputeClusterStats.hpp +++ b/src/libs/services/scanner/impl/steps/ScanStepComputeGenreStats.hpp @@ -23,14 +23,14 @@ namespace lms::scanner { - class ScanStepComputeClusterStats : public ScanStepBase + class ScanStepComputeGenreStats : public ScanStepBase { public: using ScanStepBase::ScanStepBase; private: - ScanStep getStep() const override { return ScanStep::ComputeClusterStats; } - core::LiteralString getStepName() const override { return "Compute cluster stats"; } + ScanStep getStep() const override { return ScanStep::ComputeGenreStats; } + core::LiteralString getStepName() const override { return "Compute genre stats"; } bool needProcess(const ScanContext& context) const override; void process(ScanContext& context) override; }; diff --git a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp index 18cc6a70..3eb63d08 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.cpp @@ -25,7 +25,11 @@ #include "database/objects/Artist.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackEmbeddedImage.hpp" @@ -44,6 +48,10 @@ namespace lms::scanner { removeOrphanedClusters(context); removeOrphanedClusterTypes(context); + removeOrphanedGenres(context); + removeOrphanedGroupings(context); + removeOrphanedLanguages(context); + removeOrphanedMoods(context); removeOrphanedArtists(context); removeOrphanedReleases(context); removeOrphanedMediums(context); // after release so that most entries are removed using the medium foreign key @@ -66,6 +74,30 @@ namespace lms::scanner removeOrphanedEntries(context); } + void ScanStepRemoveOrphanedDbEntries::removeOrphanedGenres(ScanContext& context) + { + LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned genres..."); + removeOrphanedEntries(context); + } + + void ScanStepRemoveOrphanedDbEntries::removeOrphanedGroupings(ScanContext& context) + { + LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned groupings..."); + removeOrphanedEntries(context); + } + + void ScanStepRemoveOrphanedDbEntries::removeOrphanedLanguages(ScanContext& context) + { + LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned languages..."); + removeOrphanedEntries(context); + } + + void ScanStepRemoveOrphanedDbEntries::removeOrphanedMoods(ScanContext& context) + { + LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned moods..."); + removeOrphanedEntries(context); + } + void ScanStepRemoveOrphanedDbEntries::removeOrphanedArtists(ScanContext& context) { LMS_LOG(DBUPDATER, DEBUG, "Checking orphaned artists..."); diff --git a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.hpp b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.hpp index 0c99284e..3173414e 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.hpp +++ b/src/libs/services/scanner/impl/steps/ScanStepRemoveOrphanedDbEntries.hpp @@ -36,6 +36,10 @@ namespace lms::scanner void removeOrphanedClusters(ScanContext& context); void removeOrphanedClusterTypes(ScanContext& context); + void removeOrphanedGenres(ScanContext& context); + void removeOrphanedGroupings(ScanContext& context); + void removeOrphanedLanguages(ScanContext& context); + void removeOrphanedMoods(ScanContext& context); void removeOrphanedArtists(ScanContext& context); void removeOrphanedMediums(ScanContext& context); void removeOrphanedReleases(ScanContext& context); diff --git a/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp b/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp index 9dfa43e5..d8f7bc8e 100644 --- a/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp +++ b/src/libs/services/scanner/include/services/scanner/ScannerStats.hpp @@ -53,7 +53,7 @@ namespace lms::scanner AssociateTrackImages, CheckForDuplicatedFiles, CheckForRemovedFiles, - ComputeClusterStats, + ComputeGenreStats, Compact, ExtractMusicNNEmbeddings, Optimize, diff --git a/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp b/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp index 2ac52f1c..f5e8ff0f 100644 --- a/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp +++ b/src/libs/subsonic/impl/endpoints/AlbumSongLists.cpp @@ -25,7 +25,7 @@ #include "database/Session.hpp" #include "database/Types.hpp" #include "database/objects/Artist.hpp" -#include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/User.hpp" @@ -87,18 +87,15 @@ namespace lms::api::subsonic // Mandatory param const std::string genre{ getMandatoryParameterAs(context.getParameters(), "genre") }; - if (const ClusterType::pointer clusterType{ ClusterType::find(context.getDbSession(), "GENRE") }) + if (const Genre::pointer genreObj{ Genre::find(context.getDbSession(), genre) }) { - if (const Cluster::pointer cluster{ clusterType->getCluster(genre) }) - { - Release::FindParameters params; - params.filters.setMediaLibrary(mediaLibraryId); - params.filters.setClusters(std::initializer_list{ cluster->getId() }); - params.setSortMethod(ReleaseSortMethod::Name); - params.setRange(range); + Release::FindParameters params; + params.filters.setMediaLibrary(mediaLibraryId); + params.filters.setGenre(genreObj->getId()); + params.setSortMethod(ReleaseSortMethod::Name); + params.setRange(range); - releases = Release::findIds(context.getDbSession(), params); - } + releases = Release::findIds(context.getDbSession(), params); } } else if (type == "byYear") @@ -273,19 +270,15 @@ namespace lms::api::subsonic auto transaction{ context.getDbSession().createReadTransaction() }; - auto clusterType{ ClusterType::find(context.getDbSession(), "GENRE") }; - if (!clusterType) - throw RequestedDataNotFoundError{}; - - auto cluster{ clusterType->getCluster(genre) }; - if (!cluster) + const Genre::pointer genreObj{ Genre::find(context.getDbSession(), genre) }; + if (!genreObj) throw RequestedDataNotFoundError{}; Response response{ Response::createOkResponse(context.getServerProtocolVersion()) }; Response::Node& songsByGenreNode{ response.createNode("songsByGenre") }; Track::FindParameters params; - params.filters.setClusters(std::initializer_list{ cluster->getId() }); + params.filters.setGenre(genreObj->getId()); params.filters.setMediaLibrary(mediaLibrary); params.setRange(Range{ offset, count }); diff --git a/src/libs/subsonic/impl/endpoints/Browsing.cpp b/src/libs/subsonic/impl/endpoints/Browsing.cpp index 98c55b5e..2ebcb9a8 100644 --- a/src/libs/subsonic/impl/endpoints/Browsing.cpp +++ b/src/libs/subsonic/impl/endpoints/Browsing.cpp @@ -30,6 +30,7 @@ #include "database/objects/ArtistInfo.hpp" #include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" @@ -379,14 +380,9 @@ namespace lms::api::subsonic auto transaction{ context.getDbSession().createReadTransaction() }; - const ClusterType::pointer clusterType{ ClusterType::find(context.getDbSession(), "GENRE") }; - if (clusterType) - { - const auto clusters{ clusterType->getClusters() }; - - for (const Cluster::pointer& cluster : clusters) - genresNode.addArrayChild("genre", createGenreNode(context, cluster)); - } + db::Genre::find(context.getDbSession(), db::Genre::FindParameters{}.setSortMethod(db::GenreSortMethod::Name), [&](const db::Genre::pointer& genre) { + genresNode.addArrayChild("genre", createGenreNode(context, genre)); + }); return response; } diff --git a/src/libs/subsonic/impl/responses/Album.cpp b/src/libs/subsonic/impl/responses/Album.cpp index 7d7fa1d6..8677b4c4 100644 --- a/src/libs/subsonic/impl/responses/Album.cpp +++ b/src/libs/subsonic/impl/responses/Album.cpp @@ -25,9 +25,11 @@ #include "database/Types.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Artwork.hpp" -#include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/Track.hpp" @@ -134,13 +136,14 @@ namespace lms::api::subsonic albumNode.setAttribute("playCount", core::Service::get()->getCount(context.getUser()->getId(), release->getId())); - // Report the first GENRE for this track - const ClusterType::pointer genreClusterType{ ClusterType::find(context.getDbSession(), "GENRE") }; - if (genreClusterType) + // Report the first genre for this release { - const auto clusters{ release->getClusters(genreClusterType->getId(), 1) }; - if (!clusters.empty()) - albumNode.setAttribute("genre", clusters.front()->getName()); + Genre::FindParameters p; + p.setRelease(release->getId()); + p.setRange(Range{ 0, 1 }); + const auto genres{ Genre::find(context.getDbSession(), p).results }; + if (!genres.empty()) + albumNode.setAttribute("genre", genres.front()->getName()); } if (const Wt::WDateTime dateTime{ core::Service::get()->getStarredDateTime(context.getUser()->getId(), release->getId()) }; dateTime.isValid()) @@ -168,31 +171,31 @@ namespace lms::api::subsonic albumNode.setAttribute("musicBrainzId", mbid ? mbid->toString() : ""); } - auto addClusters{ [&](Response::Node::Key field, std::string_view clusterTypeName) { - albumNode.createEmptyArrayValue(field); - - Cluster::FindParameters params; + albumNode.createEmptyArrayValue("moods"); + { + Mood::FindParameters params; params.setRelease(release->getId()); - params.setClusterTypeName(clusterTypeName); - - Cluster::find(context.getDbSession(), params, [&](const Cluster::pointer& cluster) { - albumNode.addArrayValue(field, cluster->getName()); + Mood::find(context.getDbSession(), params, [&](const Mood::pointer& mood) { + albumNode.addArrayValue("moods", mood->getName()); }); - } }; + } - addClusters("moods", "MOOD"); - addClusters("groupings", "GROUPING"); + albumNode.createEmptyArrayValue("groupings"); + { + Grouping::FindParameters params; + params.setRelease(release->getId()); + Grouping::find(context.getDbSession(), params, [&](const Grouping::pointer& grouping) { + albumNode.addArrayValue("groupings", grouping->getName()); + }); + } // Genres albumNode.createEmptyArrayChild("genres"); - if (genreClusterType) { - Cluster::FindParameters params; + Genre::FindParameters params; params.setRelease(release->getId()); - params.setClusterType(genreClusterType->getId()); - - Cluster::find(context.getDbSession(), params, [&](const Cluster::pointer& cluster) { - albumNode.addArrayChild("genres", createItemGenreNode(cluster->getName())); + Genre::find(context.getDbSession(), params, [&](const Genre::pointer& genre) { + albumNode.addArrayChild("genres", createItemGenreNode(genre->getName())); }); } diff --git a/src/libs/subsonic/impl/responses/Genre.cpp b/src/libs/subsonic/impl/responses/Genre.cpp index 9bc491fe..4a73b6c6 100644 --- a/src/libs/subsonic/impl/responses/Genre.cpp +++ b/src/libs/subsonic/impl/responses/Genre.cpp @@ -19,28 +19,28 @@ #include "responses/Genre.hpp" -#include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" #include "RequestContext.hpp" namespace lms::api::subsonic { - Response::Node createGenreNode(RequestContext& context, const db::Cluster::pointer& cluster) + Response::Node createGenreNode(RequestContext& context, const db::Genre::pointer& genre) { - Response::Node clusterNode; + Response::Node genreNode; switch (context.getResponseFormat()) { case ResponseFormat::json: - clusterNode.setAttribute("value", cluster->getName()); + genreNode.setAttribute("value", genre->getName()); break; case ResponseFormat::xml: - clusterNode.setValue(cluster->getName()); + genreNode.setValue(genre->getName()); break; } - clusterNode.setAttribute("songCount", cluster->getTrackCount()); - clusterNode.setAttribute("albumCount", cluster->getReleasesCount()); + genreNode.setAttribute("songCount", genre->getTrackCount()); + genreNode.setAttribute("albumCount", genre->getReleaseCount()); - return clusterNode; + return genreNode; } -} // namespace lms::api::subsonic \ No newline at end of file +} // namespace lms::api::subsonic diff --git a/src/libs/subsonic/impl/responses/Genre.hpp b/src/libs/subsonic/impl/responses/Genre.hpp index cd34c9dd..8d9cd469 100644 --- a/src/libs/subsonic/impl/responses/Genre.hpp +++ b/src/libs/subsonic/impl/responses/Genre.hpp @@ -25,12 +25,12 @@ namespace lms::db { - class Cluster; + class Genre; } namespace lms::api::subsonic { class RequestContext; - Response::Node createGenreNode(RequestContext& context, const db::ObjectPtr& cluster); + Response::Node createGenreNode(RequestContext& context, const db::ObjectPtr& genre); } // namespace lms::api::subsonic diff --git a/src/libs/subsonic/impl/responses/Song.cpp b/src/libs/subsonic/impl/responses/Song.cpp index fb8c7281..ba5997a9 100644 --- a/src/libs/subsonic/impl/responses/Song.cpp +++ b/src/libs/subsonic/impl/responses/Song.cpp @@ -31,10 +31,12 @@ #include "database/Types.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Artwork.hpp" -#include "database/objects/Cluster.hpp" #include "database/objects/Directory.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/Track.hpp" @@ -162,17 +164,10 @@ namespace lms::api::subsonic if (const Wt::WDateTime dateTime{ core::Service::get()->getStarredDateTime(context.getUser()->getId(), track->getId()) }; dateTime.isValid()) trackResponse.setAttribute("starred", core::stringUtils::toISO8601String(dateTime)); - // Report the first GENRE for this track - std::vector genres; - { - db::Cluster::FindParameters params; - params.setTrack(track->getId()); - params.setClusterTypeName("GENRE"); - - genres = db::Cluster::find(context.getDbSession(), params).results; - if (!genres.empty()) - trackResponse.setAttribute("genre", genres.front()->getName()); - } + // Report the first genre for this track + const auto genres{ track->getGenres() }; + if (!genres.empty()) + trackResponse.setAttribute("genre", genres.front()->getName()); // OpenSubsonic specific fields (must always be set) if (!context.isOpenSubsonicEnabled()) @@ -223,19 +218,13 @@ namespace lms::api::subsonic if (release) trackResponse.setAttribute("displayAlbumArtist", release->getArtistDisplayName()); - auto addClusters{ [&](Response::Node::Key field, std::string_view clusterTypeName) { - trackResponse.createEmptyArrayValue(field); + trackResponse.createEmptyArrayValue("moods"); + for (const auto& mood : track->getMoods()) + trackResponse.addArrayValue("moods", mood->getName()); - db::Cluster::FindParameters params; - params.setTrack(track->getId()); - params.setClusterTypeName(clusterTypeName); - - for (const auto& cluster : db::Cluster::find(context.getDbSession(), params).results) - trackResponse.addArrayValue(field, cluster->getName()); - } }; - - addClusters("moods", "MOOD"); - addClusters("groupings", "GROUPING"); + trackResponse.createEmptyArrayValue("groupings"); + for (const auto& grouping : track->getGroupings()) + trackResponse.addArrayValue("groupings", grouping->getName()); // Genres trackResponse.createEmptyArrayChild("genres"); diff --git a/src/lms/ui/Utils.cpp b/src/lms/ui/Utils.cpp index 4ac236a5..0b94f8f1 100644 --- a/src/lms/ui/Utils.cpp +++ b/src/lms/ui/Utils.cpp @@ -30,7 +30,11 @@ #include "database/Session.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" #include "database/objects/Image.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/ScanSettings.hpp" @@ -175,6 +179,50 @@ namespace lms::ui::utils return createFilter(Wt::WString::fromUTF8(std::string{ cluster->getName() }), Wt::WString::fromUTF8(std::string{ cluster->getType()->getName() }), getStyleClass(cluster), canDelete); } + std::unique_ptr createFilterGenre(db::GenreId genreId, bool canDelete) + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + + const db::Genre::pointer genre{ db::Genre::find(LmsApp->getDbSession(), genreId) }; + if (!genre) + return {}; + + return createFilter(Wt::WString::fromUTF8(std::string{ genre->getName() }), Wt::WString::trn("Lms.Explore.genre", 1), "bg-info text-dark", canDelete); + } + + std::unique_ptr createFilterGrouping(db::GroupingId groupingId, bool canDelete) + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + + const db::Grouping::pointer grouping{ db::Grouping::find(LmsApp->getDbSession(), groupingId) }; + if (!grouping) + return {}; + + return createFilter(Wt::WString::fromUTF8(std::string{ grouping->getName() }), Wt::WString::trn("Lms.Explore.grouping", 1), "bg-secondary", canDelete); + } + + std::unique_ptr createFilterLanguage(db::LanguageId languageId, bool canDelete) + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + + const db::Language::pointer language{ db::Language::find(LmsApp->getDbSession(), languageId) }; + if (!language) + return {}; + + return createFilter(Wt::WString::fromUTF8(std::string{ language->getName() }), Wt::WString::trn("Lms.Explore.language", 1), "bg-primary", canDelete); + } + + std::unique_ptr createFilterMood(db::MoodId moodId, bool canDelete) + { + auto transaction{ LmsApp->getDbSession().createReadTransaction() }; + + const db::Mood::pointer mood{ db::Mood::find(LmsApp->getDbSession(), moodId) }; + if (!mood) + return {}; + + return createFilter(Wt::WString::fromUTF8(std::string{ mood->getName() }), Wt::WString::trn("Lms.Explore.mood", 1), "bg-warning text-dark", canDelete); + } + std::unique_ptr createFilterClustersForTrack(db::Track::pointer track, Filters& filters) { using namespace db; diff --git a/src/lms/ui/Utils.hpp b/src/lms/ui/Utils.hpp index 7d285692..a43a0146 100644 --- a/src/lms/ui/Utils.hpp +++ b/src/lms/ui/Utils.hpp @@ -34,6 +34,10 @@ #include "database/Object.hpp" #include "database/objects/ClusterId.hpp" +#include "database/objects/GenreId.hpp" +#include "database/objects/GroupingId.hpp" +#include "database/objects/LanguageId.hpp" +#include "database/objects/MoodId.hpp" #include "database/objects/Types.hpp" #include "resource/ArtworkResource.hpp" @@ -63,6 +67,10 @@ namespace lms::ui::utils std::unique_ptr createFilter(const Wt::WString& name, const Wt::WString& tooltip, std::string_view colorStyleClass, bool canDelete = false); std::unique_ptr createFilterCluster(db::ClusterId clusterId, bool canDelete = false); + std::unique_ptr createFilterGenre(db::GenreId genreId, bool canDelete = false); + std::unique_ptr createFilterGrouping(db::GroupingId groupingId, bool canDelete = false); + std::unique_ptr createFilterLanguage(db::LanguageId languageId, bool canDelete = false); + std::unique_ptr createFilterMood(db::MoodId moodId, bool canDelete = false); std::unique_ptr createFilterClustersForTrack(db::ObjectPtr track, Filters& filters); std::unique_ptr createArtistAnchor(db::ObjectPtr artist, bool setText = true); diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index ad87ae72..df53b75b 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -244,8 +244,8 @@ namespace lms::ui _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-compact")); break; - case ScanStep::ComputeClusterStats: - _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-compute-cluster-stats") + case ScanStep::ComputeGenreStats: + _stepStatus->setText(Wt::WString::tr("Lms.Admin.ScannerController.step-compute-genre-stats") .arg(stepStats.progress())); break; diff --git a/src/lms/ui/explore/ArtistView.cpp b/src/lms/ui/explore/ArtistView.cpp index 8883fbd7..92bc2d9f 100644 --- a/src/lms/ui/explore/ArtistView.cpp +++ b/src/lms/ui/explore/ArtistView.cpp @@ -31,6 +31,10 @@ #include "database/objects/ArtistInfo.hpp" #include "database/objects/ArtworkId.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ScanSettings.hpp" #include "database/objects/Track.hpp" @@ -56,6 +60,8 @@ namespace lms::ui { namespace { + constexpr std::size_t maxTagCloudItems{ 3 }; + std::optional extractArtistIdFromInternalPath() { if (wApp->internalPathMatches("/artist/mbid/")) @@ -137,6 +143,38 @@ namespace lms::ui Wt::WContainerWidget* clusterContainers{ bindNew("clusters") }; { + db::Genre::find(LmsApp->getDbSession(), db::Genre::FindParameters{}.setArtist(_artistId).setSortMethod(db::GenreSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItems }), [&](const db::Genre::pointer& genre) { + const db::GenreId genreId{ genre->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterGenre(genreId)) }; + entry->clicked().connect([this, genreId] { + _filters.set(genreId); + }); + }); + + db::Grouping::find(LmsApp->getDbSession(), db::Grouping::FindParameters{}.setArtist(_artistId).setSortMethod(db::GroupingSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItems }), [&](const db::Grouping::pointer& grouping) { + const db::GroupingId groupingId{ grouping->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterGrouping(groupingId)) }; + entry->clicked().connect([this, groupingId] { + _filters.set(groupingId); + }); + }); + + db::Language::find(LmsApp->getDbSession(), db::Language::FindParameters{}.setArtist(_artistId).setSortMethod(db::LanguageSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItems }), [&](const db::Language::pointer& language) { + const db::LanguageId languageId{ language->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterLanguage(languageId)) }; + entry->clicked().connect([this, languageId] { + _filters.set(languageId); + }); + }); + + db::Mood::find(LmsApp->getDbSession(), db::Mood::FindParameters{}.setArtist(_artistId).setSortMethod(db::MoodSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItems }), [&](const db::Mood::pointer& mood) { + const db::MoodId moodId{ mood->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterMood(moodId)) }; + entry->clicked().connect([this, moodId] { + _filters.set(moodId); + }); + }); + auto clusterTypes{ db::ClusterType::findIds(LmsApp->getDbSession()).results }; auto clusterGroups{ artist->getClusterGroups(clusterTypes, 3) }; diff --git a/src/lms/ui/explore/Filters.cpp b/src/lms/ui/explore/Filters.cpp index 696c7795..0c35c65d 100644 --- a/src/lms/ui/explore/Filters.cpp +++ b/src/lms/ui/explore/Filters.cpp @@ -31,8 +31,12 @@ #include "core/media/Codec.hpp" #include "database/Session.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" #include "database/objects/LabelId.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseTypeId.hpp" @@ -62,13 +66,34 @@ namespace lms::ui { }; - using TypeVariant = std::variant; + struct GenreTag + { + }; + + struct GroupingTag + { + }; + + struct LanguageTag + { + }; + + struct MoodTag + { + }; + + using TypeVariant = std::variant; using TypeModel = ValueStringModel; std::unique_ptr createTypeModel() { auto typeModel{ std::make_unique() }; + typeModel->add(Wt::WString::trn("Lms.Explore.genre", 1), GenreTag{}); + typeModel->add(Wt::WString::trn("Lms.Explore.grouping", 1), GroupingTag{}); + typeModel->add(Wt::WString::trn("Lms.Explore.language", 1), LanguageTag{}); + typeModel->add(Wt::WString::trn("Lms.Explore.mood", 1), MoodTag{}); + { auto transaction{ LmsApp->getDbSession().createReadTransaction() }; db::ClusterType::find(LmsApp->getDbSession(), [&](const db::ClusterType::pointer& clusterType) { @@ -84,7 +109,7 @@ namespace lms::ui return typeModel; } - using ValueVariant = std::variant; + using ValueVariant = std::variant; using ValueModel = ValueStringModel; std::unique_ptr createValueModel(TypeVariant type) @@ -116,6 +141,26 @@ namespace lms::ui valueModel->add(Wt::WString::fromUTF8(desc.longName.c_str()), desc.type); }); }, + [&](const GenreTag&) { + db::Genre::find(session, db::Genre::FindParameters{}.setSortMethod(db::GenreSortMethod::Name), [&](const db::Genre::pointer& genre) { + valueModel->add(Wt::WString::fromUTF8(std::string{ genre->getName() }), genre->getId()); + }); + }, + [&](const GroupingTag&) { + db::Grouping::find(session, db::Grouping::FindParameters{}.setSortMethod(db::GroupingSortMethod::Name), [&](const db::Grouping::pointer& grouping) { + valueModel->add(Wt::WString::fromUTF8(std::string{ grouping->getName() }), grouping->getId()); + }); + }, + [&](const LanguageTag&) { + db::Language::find(session, db::Language::FindParameters{}.setSortMethod(db::LanguageSortMethod::Name), [&](const db::Language::pointer& language) { + valueModel->add(Wt::WString::fromUTF8(std::string{ language->getName() }), language->getId()); + }); + }, + [&](const MoodTag&) { + db::Mood::find(session, db::Mood::FindParameters{}.setSortMethod(db::MoodSortMethod::Name), [&](const db::Mood::pointer& mood) { + valueModel->add(Wt::WString::fromUTF8(std::string{ mood->getName() }), mood->getId()); + }); + }, [&](db::ClusterTypeId clusterTypeId) { db::Cluster::FindParameters params; params.setClusterType(clusterTypeId); @@ -151,22 +196,30 @@ namespace lms::ui std::visit(core::utils::overloads{ [&](db::MediaLibraryId mediaLibraryId) { set(mediaLibraryId); - state::writeValue("filters_media_library_id", mediaLibraryId.getValue()); }, [&](db::LabelId labelId) { set(labelId); - state::writeValue("filters_label_id", labelId.getValue()); }, [&](db::ReleaseTypeId releaseTypeId) { set(releaseTypeId); - state::writeValue("filters_release_type_id", releaseTypeId.getValue()); }, [&](db::ClusterId clusterId) { add(clusterId); }, [&](core::media::Codec codec) { set(codec); - state::writeValue("filters_codec", codec); + }, + [&](db::GenreId genreId) { + set(genreId); + }, + [&](db::GroupingId groupingId) { + set(groupingId); + }, + [&](db::LanguageId languageId) { + set(languageId); + }, + [&](db::MoodId moodId) { + set(moodId); }, }, value); @@ -212,6 +265,14 @@ namespace lms::ui set(db::ReleaseTypeId{ *releaseTypeId }); if (const std::optional codec{ state::readValue("filters_codec") }) set(*codec); + if (const std::optional genreId{ state::readValue("filters_genre_id") }) + set(db::GenreId{ *genreId }); + if (const std::optional groupingId{ state::readValue("filters_grouping_id") }) + set(db::GroupingId{ *groupingId }); + if (const std::optional languageId{ state::readValue("filters_language_id") }) + set(db::LanguageId{ *languageId }); + if (const std::optional moodId{ state::readValue("filters_mood_id") }) + set(db::MoodId{ *moodId }); } void Filters::add(db::ClusterId clusterId) @@ -240,6 +301,142 @@ namespace lms::ui emitFilterAddedNotification(); } + void Filters::set(db::GenreId genreId) + { + if (_dbFilters.genre == genreId) + return; + + if (_genreFilter) + { + _filters->removeWidget(_genreFilter); + _genreFilter = nullptr; + _dbFilters.genre = db::GenreId{}; + } + + auto genre{ utils::createFilterGenre(genreId, true) }; + if (!genre) + { + _sigUpdated.emit(); + return; + } + + _dbFilters.genre = genreId; + state::writeValue("filters_genre_id", genreId.getValue()); + + _genreFilter = _filters->addWidget(std::move(genre)); + _genreFilter->clicked().connect([this] { + _filters->removeWidget(_genreFilter); + _genreFilter = nullptr; + _dbFilters.genre = db::GenreId{}; + state::writeValue("filters_genre_id", std::nullopt); + _sigUpdated.emit(); + }); + + emitFilterAddedNotification(); + } + + void Filters::set(db::GroupingId groupingId) + { + if (_dbFilters.grouping == groupingId) + return; + + if (_groupingFilter) + { + _filters->removeWidget(_groupingFilter); + _groupingFilter = nullptr; + _dbFilters.grouping = db::GroupingId{}; + } + + auto grouping{ utils::createFilterGrouping(groupingId, true) }; + if (!grouping) + { + _sigUpdated.emit(); + return; + } + + _dbFilters.grouping = groupingId; + state::writeValue("filters_grouping_id", groupingId.getValue()); + + _groupingFilter = _filters->addWidget(std::move(grouping)); + _groupingFilter->clicked().connect([this] { + _filters->removeWidget(_groupingFilter); + _groupingFilter = nullptr; + _dbFilters.grouping = db::GroupingId{}; + state::writeValue("filters_grouping_id", std::nullopt); + _sigUpdated.emit(); + }); + + emitFilterAddedNotification(); + } + + void Filters::set(db::LanguageId languageId) + { + if (_dbFilters.language == languageId) + return; + + if (_languageFilter) + { + _filters->removeWidget(_languageFilter); + _languageFilter = nullptr; + _dbFilters.language = db::LanguageId{}; + } + + auto language{ utils::createFilterLanguage(languageId, true) }; + if (!language) + { + _sigUpdated.emit(); + return; + } + + _dbFilters.language = languageId; + state::writeValue("filters_language_id", languageId.getValue()); + + _languageFilter = _filters->addWidget(std::move(language)); + _languageFilter->clicked().connect([this] { + _filters->removeWidget(_languageFilter); + _languageFilter = nullptr; + _dbFilters.language = db::LanguageId{}; + state::writeValue("filters_language_id", std::nullopt); + _sigUpdated.emit(); + }); + + emitFilterAddedNotification(); + } + + void Filters::set(db::MoodId moodId) + { + if (_dbFilters.mood == moodId) + return; + + if (_moodFilter) + { + _filters->removeWidget(_moodFilter); + _moodFilter = nullptr; + _dbFilters.mood = db::MoodId{}; + } + + auto mood{ utils::createFilterMood(moodId, true) }; + if (!mood) + { + _sigUpdated.emit(); + return; + } + + _dbFilters.mood = moodId; + state::writeValue("filters_mood_id", moodId.getValue()); + + _moodFilter = _filters->addWidget(std::move(mood)); + _moodFilter->clicked().connect([this] { + _filters->removeWidget(_moodFilter); + _moodFilter = nullptr; + _dbFilters.mood = db::MoodId{}; + state::writeValue("filters_mood_id", std::nullopt); + _sigUpdated.emit(); + }); + + emitFilterAddedNotification(); + } + void Filters::set(db::MediaLibraryId mediaLibraryId) { if (_mediaLibraryFilter) @@ -261,6 +458,8 @@ namespace lms::ui } _dbFilters.mediaLibrary = mediaLibraryId; + state::writeValue("filters_media_library_id", mediaLibraryId.getValue()); + _mediaLibraryFilter = _filters->addWidget(utils::createFilter(Wt::WString::fromUTF8(libraryName), Wt::WString::tr("Lms.Explore.media-library"), "bg-primary", true)); _mediaLibraryFilter->clicked().connect(_mediaLibraryFilter, [this] { _filters->removeWidget(_mediaLibraryFilter); @@ -294,6 +493,8 @@ namespace lms::ui } _dbFilters.label = labelId; + state::writeValue("filters_label_id", labelId.getValue()); + _labelFilter = _filters->addWidget(utils::createFilter(Wt::WString::fromUTF8(name), Wt::WString::tr("Lms.Explore.label"), "bg-secondary", true)); _labelFilter->clicked().connect(_labelFilter, [this] { _filters->removeWidget(_labelFilter); @@ -327,6 +528,8 @@ namespace lms::ui } _dbFilters.releaseType = releaseTypeId; + state::writeValue("filters_release_type_id", releaseTypeId.getValue()); + _releaseTypeFilter = _filters->addWidget(utils::createFilter(Wt::WString::fromUTF8(name), Wt::WString::tr("Lms.Explore.release-type"), "bg-dark", true)); _releaseTypeFilter->clicked().connect(_releaseTypeFilter, [this] { _filters->removeWidget(_releaseTypeFilter); @@ -349,6 +552,8 @@ namespace lms::ui } _dbFilters.codec = codec; + state::writeValue("filters_codec", codec); + _codecFilter = _filters->addWidget(utils::createFilter(Wt::WString::fromUTF8(core::media::getCodecDesc(codec).longName.c_str()), Wt::WString::tr("Lms.Explore.codec"), "bg-success", true)); _codecFilter->clicked().connect(_codecFilter, [this] { _filters->removeWidget(_codecFilter); diff --git a/src/lms/ui/explore/Filters.hpp b/src/lms/ui/explore/Filters.hpp index 99cdcf35..c5b20372 100644 --- a/src/lms/ui/explore/Filters.hpp +++ b/src/lms/ui/explore/Filters.hpp @@ -26,6 +26,10 @@ #include "core/media/Codec.hpp" #include "database/objects/Filters.hpp" +#include "database/objects/GenreId.hpp" +#include "database/objects/GroupingId.hpp" +#include "database/objects/LanguageId.hpp" +#include "database/objects/MoodId.hpp" namespace lms::ui { @@ -37,6 +41,10 @@ namespace lms::ui const db::Filters& getDbFilters() const { return _dbFilters; } void add(db::ClusterId clusterId); + void set(db::GenreId genreId); + void set(db::GroupingId groupingId); + void set(db::LanguageId languageId); + void set(db::MoodId moodId); Wt::Signal<>& updated() { return _sigUpdated; } @@ -53,6 +61,10 @@ namespace lms::ui Wt::WInteractWidget* _labelFilter{}; Wt::WInteractWidget* _releaseTypeFilter{}; Wt::WInteractWidget* _codecFilter{}; + Wt::WInteractWidget* _genreFilter{}; + Wt::WInteractWidget* _groupingFilter{}; + Wt::WInteractWidget* _languageFilter{}; + Wt::WInteractWidget* _moodFilter{}; Wt::Signal<> _sigUpdated; diff --git a/src/lms/ui/explore/ReleaseView.cpp b/src/lms/ui/explore/ReleaseView.cpp index d11ed45c..170ef5a5 100644 --- a/src/lms/ui/explore/ReleaseView.cpp +++ b/src/lms/ui/explore/ReleaseView.cpp @@ -35,7 +35,11 @@ #include "database/Types.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ScanSettings.hpp" #include "database/objects/Track.hpp" @@ -273,10 +277,44 @@ namespace lms::ui refreshReleaseArtists(release); refreshArtwork(release->getPreferredArtworkId()); + constexpr std::size_t maxTagCloudItemCount{ 3 }; + Wt::WContainerWidget* clusterContainers{ bindNew("clusters") }; { + db::Genre::find(session, db::Genre::FindParameters{}.setRelease(release->getId()).setSortMethod(db::GenreSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItemCount }), [&](const db::Genre::pointer& genre) { + const db::GenreId genreId{ genre->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterGenre(genreId)) }; + entry->clicked().connect([this, genreId] { + _filters.set(genreId); + }); + }); + + db::Grouping::find(session, db::Grouping::FindParameters{}.setRelease(release->getId()).setSortMethod(db::GroupingSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItemCount }), [&](const db::Grouping::pointer& grouping) { + const db::GroupingId groupingId{ grouping->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterGrouping(groupingId)) }; + entry->clicked().connect([this, groupingId] { + _filters.set(groupingId); + }); + }); + + db::Language::find(session, db::Language::FindParameters{}.setRelease(release->getId()).setSortMethod(db::LanguageSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItemCount }), [&](const db::Language::pointer& language) { + const db::LanguageId languageId{ language->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterLanguage(languageId)) }; + entry->clicked().connect([this, languageId] { + _filters.set(languageId); + }); + }); + + db::Mood::find(session, db::Mood::FindParameters{}.setRelease(release->getId()).setSortMethod(db::MoodSortMethod::TrackCountDesc).setRange(db::Range{ 0, maxTagCloudItemCount }), [&](const db::Mood::pointer& mood) { + const db::MoodId moodId{ mood->getId() }; + Wt::WInteractWidget* entry{ clusterContainers->addWidget(utils::createFilterMood(moodId)) }; + entry->clicked().connect([this, moodId] { + _filters.set(moodId); + }); + }); + const auto clusterTypeIds{ db::ClusterType::findIds(session).results }; - const auto clusterGroups{ release->getClusterGroups(clusterTypeIds, 3) }; + const auto clusterGroups{ release->getClusterGroups(clusterTypeIds, maxTagCloudItemCount) }; for (const auto& clusters : clusterGroups) { diff --git a/src/lms/ui/explore/TrackListHelpers.cpp b/src/lms/ui/explore/TrackListHelpers.cpp index d33d36d7..3677f2ea 100644 --- a/src/lms/ui/explore/TrackListHelpers.cpp +++ b/src/lms/ui/explore/TrackListHelpers.cpp @@ -28,6 +28,10 @@ #include "database/Session.hpp" #include "database/Types.hpp" #include "database/objects/Artist.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/Track.hpp" #include "database/objects/TrackArtistLink.hpp" @@ -41,6 +45,7 @@ #include "ModalManager.hpp" #include "Utils.hpp" #include "common/Template.hpp" +#include "explore/Filters.hpp" #include "explore/PlayQueueController.hpp" #include "resource/ArtworkResource.hpp" #include "resource/DownloadResource.hpp" @@ -102,6 +107,66 @@ namespace lms::ui::TrackListHelpers trackInfo->bindWidget("copyright", std::move(copyrightWidget)); } + { + Wt::WContainerWidget* genreContainer{ trackInfo->bindNew("genres") }; + for (const db::Genre::pointer& genre : track->getGenres()) + { + const db::GenreId genreId{ genre->getId() }; + Wt::WInteractWidget* entry{ genreContainer->addWidget(utils::createFilterGenre(genreId)) }; + entry->clicked().connect([&filters, genreId] { filters.set(genreId); }); + } + if (const int count{ genreContainer->count() }; count > 0) + { + trackInfo->bindString("genres-label", Wt::WString::trn("Lms.Explore.genre", count)); + trackInfo->setCondition("if-has-genres", true); + } + } + + { + Wt::WContainerWidget* groupingContainer{ trackInfo->bindNew("groupings") }; + for (const db::Grouping::pointer& grouping : track->getGroupings()) + { + const db::GroupingId groupingId{ grouping->getId() }; + Wt::WInteractWidget* entry{ groupingContainer->addWidget(utils::createFilterGrouping(groupingId)) }; + entry->clicked().connect([&filters, groupingId] { filters.set(groupingId); }); + } + if (const int count{ groupingContainer->count() }; count > 0) + { + trackInfo->bindString("groupings-label", Wt::WString::trn("Lms.Explore.grouping", count)); + trackInfo->setCondition("if-has-groupings", true); + } + } + + { + Wt::WContainerWidget* languageContainer{ trackInfo->bindNew("languages") }; + for (const db::Language::pointer& language : track->getLanguages()) + { + const db::LanguageId languageId{ language->getId() }; + Wt::WInteractWidget* entry{ languageContainer->addWidget(utils::createFilterLanguage(languageId)) }; + entry->clicked().connect([&filters, languageId] { filters.set(languageId); }); + } + if (const int count{ languageContainer->count() }; count > 0) + { + trackInfo->bindString("languages-label", Wt::WString::trn("Lms.Explore.language", count)); + trackInfo->setCondition("if-has-languages", true); + } + } + + { + Wt::WContainerWidget* moodContainer{ trackInfo->bindNew("moods") }; + for (const db::Mood::pointer& mood : track->getMoods()) + { + const db::MoodId moodId{ mood->getId() }; + Wt::WInteractWidget* entry{ moodContainer->addWidget(utils::createFilterMood(moodId)) }; + entry->clicked().connect([&filters, moodId] { filters.set(moodId); }); + } + if (const int count{ moodContainer->count() }; count > 0) + { + trackInfo->bindString("moods-label", Wt::WString::trn("Lms.Explore.mood", count)); + trackInfo->setCondition("if-has-moods", true); + } + } + Wt::WContainerWidget* clusterContainer{ trackInfo->bindWidget("clusters", utils::createFilterClustersForTrack(track, filters)) }; if (clusterContainer->count() > 0) trackInfo->setCondition("if-has-clusters", true); diff --git a/src/tools/db-generator/LmsDbGenerator.cpp b/src/tools/db-generator/LmsDbGenerator.cpp index 0d2a8054..c27db8a5 100644 --- a/src/tools/db-generator/LmsDbGenerator.cpp +++ b/src/tools/db-generator/LmsDbGenerator.cpp @@ -17,9 +17,11 @@ * along with LMS. If not, see . */ +#include #include #include #include +#include #include #include #include @@ -38,8 +40,12 @@ #include "database/Session.hpp" #include "database/objects/Artist.hpp" #include "database/objects/Cluster.hpp" +#include "database/objects/Genre.hpp" +#include "database/objects/Grouping.hpp" +#include "database/objects/Language.hpp" #include "database/objects/MediaLibrary.hpp" #include "database/objects/Medium.hpp" +#include "database/objects/Mood.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/Track.hpp" @@ -58,9 +64,13 @@ namespace lms std::size_t trackCountPerRelease{ 10 }; float compilationRatio{ 0.1 }; std::size_t genreCountPerTrack{ 3 }; + std::size_t groupingCountPerTrack{ 1 }; + std::size_t languageCountPerTrack{ 1 }; std::size_t moodCountPerTrack{ 3 }; std::size_t trackEmbeddedImagePerRelease{ 1 }; // usual case: one same image saved on each track std::size_t genreCount{ 50 }; + std::size_t groupingCount{ 10 }; + std::size_t languageCount{ 10 }; std::size_t moodCount{ 25 }; bool generateMusicNNEmbeddings{ false }; std::filesystem::path trackPath; @@ -70,18 +80,14 @@ namespace lms { db::Session& session; std::vector mediaLibraries; - std::vector genres; - std::vector moods; + std::vector genres; + std::vector groupings; + std::vector languages; + std::vector moods; GenerationContext(db::Session& _session) : session{ _session } {} }; - db::Cluster::pointer generateCluster(db::Session& session, db::ClusterType::pointer clusterType) - { - const std::string clusterName{ std::string{ clusterType->getName() } + "-" + core::UUID::generate().toString() }; - return session.create(clusterType, clusterName); - } - db::Artist::pointer generateArtist(db::Session& session) { const core::UUID artistMBID{ core::UUID::generate() }; @@ -129,12 +135,27 @@ namespace lms if (!trackEmbeddedImages.empty()) context.session.create(track, *core::random::pickRandom(trackEmbeddedImages)); - std::vector> clusters; + auto pickN = [](const auto& pool, std::size_t n) { + using T = typename std::decay_t::value_type; + std::vector indices(pool.size()); + std::iota(indices.begin(), indices.end(), std::size_t{}); + std::shuffle(indices.begin(), indices.end(), core::random::getRandGenerator()); + const std::size_t count{ std::min(n, pool.size()) }; + std::vector picked; + picked.reserve(count); + for (std::size_t k{}; k < count; ++k) + picked.push_back(pool[indices[k]]); + return picked; + }; + if (!context.genres.empty()) - clusters.push_back(*core::random::pickRandom(context.genres)); + track.modify()->setGenres(pickN(context.genres, params.genreCountPerTrack)); + if (!context.groupings.empty()) + track.modify()->setGroupings(pickN(context.groupings, params.groupingCountPerTrack)); + if (!context.languages.empty()) + track.modify()->setLanguages(pickN(context.languages, params.languageCountPerTrack)); if (!context.moods.empty()) - clusters.push_back(*core::random::pickRandom(context.moods)); - track.modify()->setClusters(clusters); + track.modify()->setMoods(pickN(context.moods, params.moodCountPerTrack)); if (params.generateMusicNNEmbeddings) { @@ -172,24 +193,18 @@ namespace lms for (std::size_t i{}; i < params.mediaLibraryCount; ++i) context.mediaLibraries.push_back(context.session.create("Library" + std::to_string(i), "/root" + std::to_string(i))); - // create some random genres/moods - { - db::ClusterType::pointer genre{ db::ClusterType::find(context.session, "GENRE") }; - if (!genre) - genre = context.session.create("GENRE"); + // create some random genres/groupings/languages/moods + for (std::size_t i{}; i < params.genreCount; ++i) + context.genres.push_back(context.session.create("Genre-" + core::UUID::generate().toString())); - for (std::size_t i{}; i < params.genreCount; ++i) - context.genres.push_back(generateCluster(context.session, genre)); - } + for (std::size_t i{}; i < params.groupingCount; ++i) + context.groupings.push_back(context.session.create("Grouping-" + core::UUID::generate().toString())); - { - db::ClusterType::pointer mood{ db::ClusterType::find(context.session, "MOOD") }; - if (!mood) - mood = context.session.create("MOOD"); + for (std::size_t i{}; i < params.languageCount; ++i) + context.languages.push_back(context.session.create("Language-" + core::UUID::generate().toString())); - for (std::size_t i{}; i < params.moodCount; ++i) - context.moods.push_back(generateCluster(context.session, mood)); - } + for (std::size_t i{}; i < params.moodCount; ++i) + context.moods.push_back(context.session.create("Mood-" + core::UUID::generate().toString())); } } // namespace lms @@ -219,6 +234,10 @@ int main(int argc, char* argv[]) ("track-path",program_options::value()->required(), "Path of a valid track file, that will be used for all generated tracks") ("genre-count", program_options::value()->default_value(defaultParams.genreCount), "Number of genres to generate") ("genre-count-per-track", program_options::value()->default_value(defaultParams.genreCountPerTrack), "Number of genres to assign to each track") + ("grouping-count", program_options::value()->default_value(defaultParams.groupingCount), "Number of groupings to generate") + ("grouping-count-per-track", program_options::value()->default_value(defaultParams.groupingCountPerTrack), "Number of groupings to assign to each track") + ("language-count", program_options::value()->default_value(defaultParams.languageCount), "Number of languages to generate") + ("language-count-per-track", program_options::value()->default_value(defaultParams.languageCountPerTrack), "Number of languages to assign to each track") ("mood-count", program_options::value()->default_value(defaultParams.moodCount), "Number of moods to generate") ("mood-count-per-track", program_options::value()->default_value(defaultParams.moodCountPerTrack), "Number of moods to assign to each track") ("musicnn-embeddings", program_options::bool_switch()->default_value(false), "Generate fake MusicNN embeddings for each track") @@ -246,6 +265,14 @@ int main(int argc, char* argv[]) genParams.trackEmbeddedImagePerRelease = vm["track-embedded-image-count"].as(); genParams.generateMusicNNEmbeddings = vm["musicnn-embeddings"].as(); genParams.trackPath = std::filesystem::path{ vm["track-path"].as() }; + genParams.genreCount = vm["genre-count"].as(); + genParams.genreCountPerTrack = vm["genre-count-per-track"].as(); + genParams.groupingCount = vm["grouping-count"].as(); + genParams.groupingCountPerTrack = vm["grouping-count-per-track"].as(); + genParams.languageCount = vm["language-count"].as(); + genParams.languageCountPerTrack = vm["language-count-per-track"].as(); + genParams.moodCount = vm["mood-count"].as(); + genParams.moodCountPerTrack = vm["mood-count-per-track"].as(); if (!std::filesystem::exists(genParams.trackPath)) throw std::runtime_error{ "File '" + genParams.trackPath.string() + "' does not exist!" }; From cf6ad12a44529a3c3d2e96107e527a5140830085 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 17 Jun 2026 22:00:52 +0200 Subject: [PATCH 15/38] Sort profiled db queries by total time desc --- src/lms/ui/admin/debug/Database.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/lms/ui/admin/debug/Database.cpp b/src/lms/ui/admin/debug/Database.cpp index b87cc1d9..fb56c154 100644 --- a/src/lms/ui/admin/debug/Database.cpp +++ b/src/lms/ui/admin/debug/Database.cpp @@ -19,6 +19,9 @@ #include "Database.hpp" +#include +#include + #include #include #include @@ -62,14 +65,24 @@ namespace lms::ui const std::string cdp{ encodeHttpHeaderField("filename", "LMS_db_query_profiling_" + core::stringUtils::toISO8601String(Wt::WDateTime::currentDateTime()) + ".txt") }; response.addHeader("Content-Disposition", "attachment; " + cdp); + std::vector entries; _recorder.visitQueries([&](const db::IQueryProfiler::QueryStats& stats) { + entries.push_back(stats); + }); + + std::sort(entries.begin(), entries.end(), [](const db::IQueryProfiler::QueryStats& a, const db::IQueryProfiler::QueryStats& b) { + return a.totalTime > b.totalTime; + }); + + for (const db::IQueryProfiler::QueryStats& stats : entries) + { response.out() << stats.query << '\n'; response.out() << "Calls: " << stats.callCount << " | Total: " << stats.totalTime.count() << " µs" << " | Mean: " << stats.meanTime.count() << " µs" << " | StdDev: " << stats.stdDevTime.count() << " µs\n"; response.out() << stats.plan << "\n-------------------------\n"; - }); + } } const db::IQueryProfiler& _recorder; From 5ecdc58b9733656b38293326dac2e889062acfbd Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 00:17:16 +0200 Subject: [PATCH 16/38] Removed useless joins --- src/libs/database/impl/objects/Track.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libs/database/impl/objects/Track.cpp b/src/libs/database/impl/objects/Track.cpp index 028b68f9..2e95d3ce 100644 --- a/src/libs/database/impl/objects/Track.cpp +++ b/src/libs/database/impl/objects/Track.cpp @@ -768,8 +768,7 @@ namespace lms::db std::ostringstream oss; oss << "SELECT a from artist a" - " INNER JOIN track_artist_link t_a_l ON a.id = t_a_l.artist_id" - " INNER JOIN track t ON t.id = t_a_l.track_id"; + " INNER JOIN track_artist_link t_a_l ON a.id = t_a_l.artist_id"; if (!linkTypes.empty()) { @@ -780,6 +779,7 @@ namespace lms::db { if (!first) oss << ", "; + oss << "?"; first = false; } @@ -790,7 +790,7 @@ namespace lms::db for (TrackArtistLinkType type : linkTypes) query.bind(type); - query.where("t.id = ?").bind(getId()); + query.where("t_a_l.track_id = ?").bind(getId()); query.groupBy("t_a_l.artist_id"); query.orderBy("t_a_l.id"); @@ -802,30 +802,30 @@ namespace lms::db assert(self()); assert(session()); - std::ostringstream oss; - oss << "SELECT t_a_l.artist_id FROM track_artist_link t_a_l" - " INNER JOIN track t ON t.id = t_a_l.track_id"; + auto query{ session()->query("SELECT t_a_l.artist_id FROM track_artist_link t_a_l") }; if (!linkTypes.empty()) { - oss << " AND t_a_l.type IN ("; + std::ostringstream oss; + oss << "t_a_l.type IN ("; bool first{ true }; for ([[maybe_unused]] TrackArtistLinkType type : linkTypes) { if (!first) oss << ", "; + oss << "?"; first = false; } oss << ")"; + + query.where(oss.str()); + for (TrackArtistLinkType type : linkTypes) + query.bind(type); } - auto query{ session()->query(oss.str()) }; - for (TrackArtistLinkType type : linkTypes) - query.bind(type); - - query.where("t.id = ?").bind(getId()); + query.where("t_a_l.track_id = ?").bind(getId()); query.groupBy("t_a_l.artist_id"); query.orderBy("t_a_l.id"); From 2da0e98b9f39d0960dea2c8d3ea09c95c48d1a59 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 18:41:06 +0200 Subject: [PATCH 17/38] Optimized get most recent listen query --- src/libs/database/impl/objects/Listen.cpp | 5 +- .../include/database/objects/Listen.hpp | 2 +- src/libs/database/test/Listen.cpp | 59 +++++++++++++++++-- .../scrobbling/impl/ScrobblingService.cpp | 6 +- 4 files changed, 60 insertions(+), 12 deletions(-) diff --git a/src/libs/database/impl/objects/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp index 9b13c0c6..34758c41 100644 --- a/src/libs/database/impl/objects/Listen.cpp +++ b/src/libs/database/impl/objects/Listen.cpp @@ -470,10 +470,11 @@ namespace lms::db return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT l from listen l").join("track t ON l.track_id = t.id").where("t.release_id = ?").bind(releaseId).where("l.user_id = ?").bind(userId).where("l.backend = ?").bind(backend).orderBy("l.date_time DESC").limit(1)); } - Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, ScrobblingBackend backend, TrackId trackId) + Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, TrackId trackId) { session.checkReadTransaction(); + // TODO not pending remove? - return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT l from listen l").where("l.track_id = ?").bind(trackId).where("l.user_id = ?").bind(userId).where("l.backend = ?").bind(backend).orderBy("l.date_time DESC").limit(1)); + return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT l from listen l").join("user u ON u.id = l.user_id").where("l.track_id = ?").bind(trackId).where("l.user_id = ?").bind(userId).where("l.backend = u.scrobbling_backend").orderBy("l.date_time DESC").limit(1)); } } // namespace lms::db diff --git a/src/libs/database/include/database/objects/Listen.hpp b/src/libs/database/include/database/objects/Listen.hpp index cf63e24c..084a3b65 100644 --- a/src/libs/database/include/database/objects/Listen.hpp +++ b/src/libs/database/include/database/objects/Listen.hpp @@ -151,7 +151,7 @@ namespace lms::db static std::size_t getCount(Session& session, UserId userId, ReleaseId trackId); // for the current backend static pointer getMostRecentListen(Session& session, UserId userId, ScrobblingBackend backend, ReleaseId releaseId); - static pointer getMostRecentListen(Session& session, UserId userId, ScrobblingBackend backend, TrackId releaseId); + static pointer getMostRecentListen(Session& session, UserId userId, TrackId trackId); // uses current scrobbling backend SyncState getSyncState() const { return _syncState; } ObjectPtr getUser() const { return _user; } diff --git a/src/libs/database/test/Listen.cpp b/src/libs/database/test/Listen.cpp index ddc27c96..b18c731c 100644 --- a/src/libs/database/test/Listen.cpp +++ b/src/libs/database/test/Listen.cpp @@ -1592,7 +1592,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, track.getId()) }; + auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; EXPECT_FALSE(listen); } @@ -1602,7 +1602,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, track.getId()) }; + auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime1); } @@ -1613,7 +1613,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, track.getId()) }; + auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime1); } @@ -1624,7 +1624,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, track.getId()) }; + auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime3); } @@ -1698,6 +1698,57 @@ namespace lms::db::tests } } + TEST_F(DatabaseFixture, Listen_getMostRecentTrack_byUserBackend) + { + ScopedTrack track{ session }; + ScopedUser user{ session, "MyUser" }; + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_FALSE(Listen::getMostRecentListen(session, user->getId(), track.getId())); + } + + const Wt::WDateTime dateTime1{ Wt::WDate{ 2000, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen1{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime1 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime1); + } + + const Wt::WDateTime dateTime2{ Wt::WDate{ 1999, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen2{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime2 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime1); + } + + const Wt::WDateTime dateTime3{ Wt::WDate{ 2001, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen3{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime3 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), track.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime3); + } + + { + auto transaction{ session.createWriteTransaction() }; + user.get().modify()->setScrobblingBackend(ScrobblingBackend::ListenBrainz); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_FALSE(Listen::getMostRecentListen(session, user->getId(), track.getId())); + } + } + TEST_F(DatabaseFixture, Listen_getRecentTracks_cluster) { ScopedTrack track{ session }; diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp index af528d38..b8dc5d98 100644 --- a/src/libs/services/scrobbling/impl/ScrobblingService.cpp +++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp @@ -236,14 +236,10 @@ namespace lms::scrobbling Wt::WDateTime ScrobblingService::getLastListenDateTime(db::UserId userId, db::TrackId trackId) { - const auto backend{ getUserBackend(userId) }; - if (!backend) - return {}; - Session& session{ _db.getTLSSession() }; auto transaction{ session.createReadTransaction() }; - const db::Listen::pointer listen{ db::Listen::getMostRecentListen(session, userId, *backend, trackId) }; + const db::Listen::pointer listen{ db::Listen::getMostRecentListen(session, userId, trackId) }; return listen ? listen->getDateTime() : Wt::WDateTime{}; } From 7b0039ab855854352e863bc09884ee9b95bcf393 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 18:45:42 +0200 Subject: [PATCH 18/38] Removed useless redundant query --- src/libs/database/test/TrackArtistLink.cpp | 83 +++++++++++++++++++++ src/libs/subsonic/impl/responses/Artist.cpp | 14 ++-- src/libs/subsonic/impl/responses/Artist.hpp | 2 +- src/libs/subsonic/impl/responses/Song.cpp | 23 ++++-- 4 files changed, 107 insertions(+), 15 deletions(-) diff --git a/src/libs/database/test/TrackArtistLink.cpp b/src/libs/database/test/TrackArtistLink.cpp index 8e021367..8807891d 100644 --- a/src/libs/database/test/TrackArtistLink.cpp +++ b/src/libs/database/test/TrackArtistLink.cpp @@ -306,4 +306,87 @@ namespace lms::db::tests } } + TEST_F(DatabaseFixture, Track_getArtistIds_typeFilter) + { + ScopedTrack track{ session }; + ScopedArtist artist1{ session, "Artist1" }; + ScopedArtist artist2{ session, "Artist2" }; + + { + auto transaction{ session.createWriteTransaction() }; + session.create(track.get(), artist1.get(), TrackArtistLinkType::Artist, false); + session.create(track.get(), artist2.get(), TrackArtistLinkType::Artist, false); + session.create(track.get(), artist1.get(), TrackArtistLinkType::Mixer, false); + } + + { + auto transaction{ session.createReadTransaction() }; + + const auto artistIds{ track->getArtistIds({ TrackArtistLinkType::Artist }) }; + ASSERT_EQ(artistIds.size(), 2); + EXPECT_EQ(artistIds[0], artist1.getId()); + EXPECT_EQ(artistIds[1], artist2.getId()); + + const auto mixerIds{ track->getArtistIds({ TrackArtistLinkType::Mixer }) }; + ASSERT_EQ(mixerIds.size(), 1); + EXPECT_EQ(mixerIds[0], artist1.getId()); + + const auto noFilter{ track->getArtistIds({}) }; + EXPECT_EQ(noFilter.size(), 2); + } + } + + TEST_F(DatabaseFixture, Track_visitArtistLinks_orderedById) + { + ScopedTrack track{ session }; + ScopedArtist artist1{ session, "Artist1" }; + ScopedArtist artist2{ session, "Artist2" }; + + TrackArtistLinkId link1Id; + + { + auto transaction{ session.createWriteTransaction() }; + auto link1{ session.create(track.get(), artist1.get(), TrackArtistLinkType::Artist, false) }; + link1Id = link1->getId(); + session.create(track.get(), artist2.get(), TrackArtistLinkType::Artist, false); + } + + { + auto transaction{ session.createReadTransaction() }; + + std::vector links; + track->visitArtistLinks([&](const db::TrackArtistLink::pointer& link) { + links.push_back(link); + }); + + ASSERT_EQ(links.size(), 2); + EXPECT_EQ(links[0]->getArtistId(), artist1.getId()); + EXPECT_EQ(links[1]->getArtistId(), artist2.getId()); + } + + { + auto transaction{ session.createWriteTransaction() }; + TrackArtistLink::find(session, link1Id).remove(); + } + + { + auto transaction{ session.createWriteTransaction() }; + session.create(track.get(), artist1.get(), TrackArtistLinkType::Artist, false); + } + + // artist2's link has lower id, artist1's re-created link has higher id. + { + auto transaction{ session.createReadTransaction() }; + + std::vector links; + track->visitArtistLinks([&](const db::TrackArtistLink::pointer& link) { + links.push_back(link); + }); + + ASSERT_EQ(links.size(), 2); + EXPECT_EQ(links[0]->getArtistId(), artist2.getId()); + EXPECT_EQ(links[1]->getArtistId(), artist1.getId()); + } + } + } // namespace lms::db::tests \ No newline at end of file diff --git a/src/libs/subsonic/impl/responses/Artist.cpp b/src/libs/subsonic/impl/responses/Artist.cpp index 297e6ad0..43283780 100644 --- a/src/libs/subsonic/impl/responses/Artist.cpp +++ b/src/libs/subsonic/impl/responses/Artist.cpp @@ -41,17 +41,17 @@ namespace lms::api::subsonic namespace utils { - std::string joinArtistNames(const std::vector& artists) + std::string joinArtistNames(const std::vector& links) { - if (artists.size() == 1) - return artists.front()->getName(); + if (links.size() == 1) + return std::string{ links.front()->getArtistName() }; std::vector names; - names.resize(artists.size()); + names.resize(links.size()); - std::transform(std::cbegin(artists), std::cend(artists), std::begin(names), - [](const Artist::pointer& artist) { - return artist->getName(); + std::transform(std::cbegin(links), std::cend(links), std::begin(names), + [](const TrackArtistLink::pointer& link) { + return std::string{ link->getArtistName() }; }); return core::stringUtils::joinStrings(names, ", "); diff --git a/src/libs/subsonic/impl/responses/Artist.hpp b/src/libs/subsonic/impl/responses/Artist.hpp index 50612d76..bcbfe4eb 100644 --- a/src/libs/subsonic/impl/responses/Artist.hpp +++ b/src/libs/subsonic/impl/responses/Artist.hpp @@ -42,7 +42,7 @@ namespace lms::api::subsonic namespace utils { - std::string joinArtistNames(const std::vector>& artists); + std::string joinArtistNames(const std::vector>& links); std::string_view toString(db::TrackArtistLinkType type); } // namespace utils diff --git a/src/libs/subsonic/impl/responses/Song.cpp b/src/libs/subsonic/impl/responses/Song.cpp index ba5997a9..7c36bc15 100644 --- a/src/libs/subsonic/impl/responses/Song.cpp +++ b/src/libs/subsonic/impl/responses/Song.cpp @@ -134,16 +134,24 @@ namespace lms::api::subsonic trackResponse.setAttribute("coverArt", idToString(coverArtId)); } - const std::vector& artists{ track->getArtists({ db::TrackArtistLinkType::Artist }) }; - if (!artists.empty()) + std::vector artistLinks; + std::vector trackArtistLinks; + track->visitArtistLinks([&](const db::TrackArtistLink::pointer& link) { + artistLinks.push_back(link); + + if (link->getType() == db::TrackArtistLinkType::Artist) + trackArtistLinks.push_back(link); + }); + + if (!trackArtistLinks.empty()) { if (!track->getArtistDisplayName().empty()) trackResponse.setAttribute("artist", track->getArtistDisplayName()); else - trackResponse.setAttribute("artist", utils::joinArtistNames(artists)); + trackResponse.setAttribute("artist", utils::joinArtistNames(trackArtistLinks)); - if (artists.size() == 1) - trackResponse.setAttribute("artistId", idToString(artists.front()->getId())); + if (trackArtistLinks.size() == 1) + trackResponse.setAttribute("artistId", idToString(trackArtistLinks.front()->getArtistId())); } const db::Release::pointer release{ track->getRelease() }; @@ -195,7 +203,8 @@ namespace lms::api::subsonic trackResponse.createEmptyArrayChild("artists"); trackResponse.createEmptyArrayChild("contributors"); - track->visitArtistLinks([&](const db::TrackArtistLink::pointer& artistLink) { + for (const auto& artistLink : artistLinks) + { switch (artistLink->getType()) { case db::TrackArtistLinkType::Artist: @@ -204,7 +213,7 @@ namespace lms::api::subsonic default: trackResponse.addArrayChild("contributors", createContributorNode(artistLink)); } - }); + } if (release) { From df8f8377c6e7a85d23ec6f3eb02ab3b27733491e Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 21:35:11 +0200 Subject: [PATCH 19/38] Optimized get most recent listen query for release --- src/libs/database/impl/objects/Listen.cpp | 31 ++++++++- .../include/database/objects/Listen.hpp | 4 +- src/libs/database/test/Listen.cpp | 65 +++++++++++++++++-- .../scrobbling/impl/ScrobblingService.cpp | 6 +- 4 files changed, 92 insertions(+), 14 deletions(-) diff --git a/src/libs/database/impl/objects/Listen.cpp b/src/libs/database/impl/objects/Listen.cpp index 34758c41..1736dd90 100644 --- a/src/libs/database/impl/objects/Listen.cpp +++ b/src/libs/database/impl/objects/Listen.cpp @@ -462,12 +462,25 @@ namespace lms::db .bind(releaseId)); } - Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, ScrobblingBackend backend, ReleaseId releaseId) + Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, ReleaseId releaseId) { session.checkReadTransaction(); // TODO not pending remove? - return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT l from listen l").join("track t ON l.track_id = t.id").where("t.release_id = ?").bind(releaseId).where("l.user_id = ?").bind(userId).where("l.backend = ?").bind(backend).orderBy("l.date_time DESC").limit(1)); + + // clang-format off + auto query{ session.getDboSession()->query>("SELECT l from listen l") + .join("user u ON u.id = l.user_id") + .join("track t ON l.track_id = t.id") + .where("t.release_id = ?").bind(releaseId) + .where("l.user_id = ?").bind(userId) + .where("l.backend = u.scrobbling_backend") + .orderBy("l.date_time DESC") + .limit(1) + }; + // clang-format on + + return utils::fetchQuerySingleResult(query); } Listen::pointer Listen::getMostRecentListen(Session& session, UserId userId, TrackId trackId) @@ -475,6 +488,18 @@ namespace lms::db session.checkReadTransaction(); // TODO not pending remove? - return utils::fetchQuerySingleResult(session.getDboSession()->query>("SELECT l from listen l").join("user u ON u.id = l.user_id").where("l.track_id = ?").bind(trackId).where("l.user_id = ?").bind(userId).where("l.backend = u.scrobbling_backend").orderBy("l.date_time DESC").limit(1)); + + // clang-format off + auto query{ session.getDboSession()->query>("SELECT l from listen l") + .join("user u ON u.id = l.user_id") + .where("l.track_id = ?").bind(trackId) + .where("l.user_id = ?").bind(userId) + .where("l.backend = u.scrobbling_backend") + .orderBy("l.date_time DESC") + .limit(1) + }; + // clang-format on + + return utils::fetchQuerySingleResult(query); } } // namespace lms::db diff --git a/src/libs/database/include/database/objects/Listen.hpp b/src/libs/database/include/database/objects/Listen.hpp index 084a3b65..15863d49 100644 --- a/src/libs/database/include/database/objects/Listen.hpp +++ b/src/libs/database/include/database/objects/Listen.hpp @@ -150,8 +150,8 @@ namespace lms::db static std::size_t getCount(Session& session, UserId userId, TrackId trackId); // for the current backend static std::size_t getCount(Session& session, UserId userId, ReleaseId trackId); // for the current backend - static pointer getMostRecentListen(Session& session, UserId userId, ScrobblingBackend backend, ReleaseId releaseId); - static pointer getMostRecentListen(Session& session, UserId userId, TrackId trackId); // uses current scrobbling backend + static pointer getMostRecentListen(Session& session, UserId userId, ReleaseId releaseId); // uses current scrobbling backend + static pointer getMostRecentListen(Session& session, UserId userId, TrackId trackId); // uses current scrobbling backend SyncState getSyncState() const { return _syncState; } ObjectPtr getUser() const { return _user; } diff --git a/src/libs/database/test/Listen.cpp b/src/libs/database/test/Listen.cpp index b18c731c..2b7dfbdb 100644 --- a/src/libs/database/test/Listen.cpp +++ b/src/libs/database/test/Listen.cpp @@ -1207,7 +1207,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - const auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, release.getId()) }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; EXPECT_FALSE(listen); } @@ -1217,7 +1217,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - const auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, release.getId()) }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime1); } @@ -1228,7 +1228,7 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - const auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, release.getId()) }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime1); } @@ -1239,12 +1239,69 @@ namespace lms::db::tests { auto transaction{ session.createReadTransaction() }; - const auto listen{ Listen::getMostRecentListen(session, user->getId(), ScrobblingBackend::Internal, release.getId()) }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; EXPECT_TRUE(listen); EXPECT_EQ(listen->getDateTime(), dateTime3); } } + TEST_F(DatabaseFixture, Listen_getMostRecentRelease_byUserBackend) + { + ScopedTrack track{ session }; + ScopedUser user{ session, "MyUser" }; + ScopedRelease release{ session, "MyRelease" }; + + { + auto transaction{ session.createWriteTransaction() }; + track.get().modify()->setRelease(release.get()); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_FALSE(Listen::getMostRecentListen(session, user->getId(), release.getId())); + } + + const Wt::WDateTime dateTime1{ Wt::WDate{ 2000, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen1{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime1 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime1); + } + + const Wt::WDateTime dateTime2{ Wt::WDate{ 1999, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen2{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime2 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime1); + } + + const Wt::WDateTime dateTime3{ Wt::WDate{ 2001, 1, 2 }, Wt::WTime{ 12, 0, 1 } }; + ScopedListen listen3{ session, user.lockAndGet(), track.lockAndGet(), ScrobblingBackend::Internal, dateTime3 }; + + { + auto transaction{ session.createReadTransaction() }; + const auto listen{ Listen::getMostRecentListen(session, user->getId(), release.getId()) }; + ASSERT_TRUE(listen); + EXPECT_EQ(listen->getDateTime(), dateTime3); + } + + { + auto transaction{ session.createWriteTransaction() }; + user.get().modify()->setScrobblingBackend(ScrobblingBackend::ListenBrainz); + } + + { + auto transaction{ session.createReadTransaction() }; + EXPECT_FALSE(Listen::getMostRecentListen(session, user->getId(), release.getId())); + } + } + TEST_F(DatabaseFixture, Listen_getRecentReleases_multi) { ScopedTrack track1{ session }; diff --git a/src/libs/services/scrobbling/impl/ScrobblingService.cpp b/src/libs/services/scrobbling/impl/ScrobblingService.cpp index b8dc5d98..a03c0069 100644 --- a/src/libs/services/scrobbling/impl/ScrobblingService.cpp +++ b/src/libs/services/scrobbling/impl/ScrobblingService.cpp @@ -223,14 +223,10 @@ namespace lms::scrobbling Wt::WDateTime ScrobblingService::getLastListenDateTime(db::UserId userId, db::ReleaseId releaseId) { - const auto backend{ getUserBackend(userId) }; - if (!backend) - return {}; - Session& session{ _db.getTLSSession() }; auto transaction{ session.createReadTransaction() }; - const db::Listen::pointer listen{ db::Listen::getMostRecentListen(session, userId, *backend, releaseId) }; + const db::Listen::pointer listen{ db::Listen::getMostRecentListen(session, userId, releaseId) }; return listen ? listen->getDateTime() : Wt::WDateTime{}; } From a37cde0fba8ffed220bfc4964db78473d007e172 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 22:19:59 +0200 Subject: [PATCH 20/38] Removed useless query --- src/libs/subsonic/impl/responses/Album.cpp | 25 +++++++--------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/libs/subsonic/impl/responses/Album.cpp b/src/libs/subsonic/impl/responses/Album.cpp index 8677b4c4..e166266c 100644 --- a/src/libs/subsonic/impl/responses/Album.cpp +++ b/src/libs/subsonic/impl/responses/Album.cpp @@ -136,15 +136,12 @@ namespace lms::api::subsonic albumNode.setAttribute("playCount", core::Service::get()->getCount(context.getUser()->getId(), release->getId())); - // Report the first genre for this release - { - Genre::FindParameters p; - p.setRelease(release->getId()); - p.setRange(Range{ 0, 1 }); - const auto genres{ Genre::find(context.getDbSession(), p).results }; - if (!genres.empty()) - albumNode.setAttribute("genre", genres.front()->getName()); - } + Genre::FindParameters genreParams; + genreParams.setRelease(release->getId()); + genreParams.setSortMethod(GenreSortMethod::TrackCountDesc); + const auto genres{ Genre::find(context.getDbSession(), genreParams).results }; + if (!genres.empty()) + albumNode.setAttribute("genre", genres.front()->getName()); if (const Wt::WDateTime dateTime{ core::Service::get()->getStarredDateTime(context.getUser()->getId(), release->getId()) }; dateTime.isValid()) albumNode.setAttribute("starred", core::stringUtils::toISO8601String(dateTime)); @@ -189,15 +186,9 @@ namespace lms::api::subsonic }); } - // Genres albumNode.createEmptyArrayChild("genres"); - { - Genre::FindParameters params; - params.setRelease(release->getId()); - Genre::find(context.getDbSession(), params, [&](const Genre::pointer& genre) { - albumNode.addArrayChild("genres", createItemGenreNode(genre->getName())); - }); - } + for (const auto& genre : genres) + albumNode.addArrayChild("genres", createItemGenreNode(genre->getName())); if (id3) { From b5e9660778ceab81b8bef5e0699dd497f223b2d0 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 23:17:09 +0200 Subject: [PATCH 21/38] Removed bad error message --- .../scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp index 2cc78db1..aef28aa0 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp @@ -92,8 +92,11 @@ namespace lms::scanner const std::filesystem::directory_entry fileEntry{ p, ec }; if (ec) { - // TODO store error? - LMS_LOG(DBUPDATER, ERROR, "Error while checking file " << p << ": " << ec.message()); + // no_such_file_or_directory may be triggered if the mount point changed + if (ec == std::errc::no_such_file_or_directory) + LMS_LOG(DBUPDATER, DEBUG, "Removing " << p << ": missing"); + else + LMS_LOG(DBUPDATER, ERROR, "Error while checking file " << p << ": " << ec.message()); return false; } From be178e2632e5888ef20b555fa111ebe0849fd82d Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 18 Jun 2026 23:53:02 +0200 Subject: [PATCH 22/38] Fixed bad migration --- src/libs/database/impl/Migration.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index ba9d3a67..6b00e9b5 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -1794,9 +1794,10 @@ FROM track)"); ))"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO genre (version, name, track_count, release_count) -SELECT 0, c.name, c.track_count, c.release_count FROM cluster c +SELECT 0, c.name, SUM(c.track_count), SUM(c.release_count) FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id -WHERE ct.name = 'GENRE')"); +WHERE ct.name = 'GENRE' +GROUP BY c.name)"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_genre (track_id, genre_id) SELECT tc.track_id, g.id FROM track_cluster tc INNER JOIN cluster c ON c.id = tc.cluster_id @@ -1821,7 +1822,7 @@ WHERE ct.name = 'GENRE')"); ))"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO mood (version, name) -SELECT 0, c.name FROM cluster c +SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'MOOD')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_mood (track_id, mood_id) @@ -1848,7 +1849,7 @@ WHERE ct.name = 'MOOD')"); ))"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO language (version, name) -SELECT 0, c.name FROM cluster c +SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'LANGUAGE')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_language (track_id, language_id) @@ -1875,7 +1876,7 @@ WHERE ct.name = 'LANGUAGE')"); ))"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO grouping (version, name) -SELECT 0, c.name FROM cluster c +SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'GROUPING')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_grouping (track_id, grouping_id) From 8fa58f1775af4c68c0999910dbab40a58bbb0e44 Mon Sep 17 00:00:00 2001 From: emeric Date: Fri, 19 Jun 2026 00:14:12 +0200 Subject: [PATCH 23/38] Fixed bad migration --- src/libs/database/impl/Migration.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index 6b00e9b5..fe858eda 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -1799,7 +1799,7 @@ INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'GENRE' GROUP BY c.name)"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_genre (track_id, genre_id) -SELECT tc.track_id, g.id FROM track_cluster tc +SELECT DISTINCT tc.track_id, g.id FROM track_cluster tc INNER JOIN cluster c ON c.id = tc.cluster_id INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id INNER JOIN genre g ON g.name = c.name @@ -1826,7 +1826,7 @@ SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'MOOD')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_mood (track_id, mood_id) -SELECT tc.track_id, m.id FROM track_cluster tc +SELECT DISTINCT tc.track_id, m.id FROM track_cluster tc INNER JOIN cluster c ON c.id = tc.cluster_id INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id INNER JOIN mood m ON m.name = c.name @@ -1853,7 +1853,7 @@ SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'LANGUAGE')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_language (track_id, language_id) -SELECT tc.track_id, l.id FROM track_cluster tc +SELECT DISTINCT tc.track_id, l.id FROM track_cluster tc INNER JOIN cluster c ON c.id = tc.cluster_id INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id INNER JOIN language l ON l.name = c.name @@ -1880,7 +1880,7 @@ SELECT DISTINCT 0, c.name FROM cluster c INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id WHERE ct.name = 'GROUPING')"); utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_grouping (track_id, grouping_id) -SELECT tc.track_id, g.id FROM track_cluster tc +SELECT DISTINCT tc.track_id, g.id FROM track_cluster tc INNER JOIN cluster c ON c.id = tc.cluster_id INNER JOIN cluster_type ct ON ct.id = c.cluster_type_id INNER JOIN grouping g ON g.name = c.name From 62f4766f82d055f2f6f97feaf6519f687990260c Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 20 Jun 2026 10:24:58 +0200 Subject: [PATCH 24/38] Added a small builtin benchmark to decode files to PCM --- approot/admin-debugtools.xml | 15 + approot/main.xml | 2 - approot/messages.xml | 7 + approot/messages_es.xml | 7 + approot/messages_fr.xml | 7 + approot/messages_it.xml | 7 + approot/messages_pl.xml | 7 + approot/messages_zh.xml | 7 + src/lms/CMakeLists.txt | 2 + src/lms/ui/LmsApplication.cpp | 9 +- src/lms/ui/admin/DebugToolsView.cpp | 2 + .../ui/admin/debug/PcmDecodingBenchmark.cpp | 272 ++++++++++++++++++ .../ui/admin/debug/PcmDecodingBenchmark.hpp | 88 ++++++ src/lms/ui/admin/debug/PcmDecodingStats.cpp | 200 +++++++++++++ src/lms/ui/admin/debug/PcmDecodingStats.hpp | 53 ++++ 15 files changed, 675 insertions(+), 10 deletions(-) create mode 100644 src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp create mode 100644 src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp create mode 100644 src/lms/ui/admin/debug/PcmDecodingStats.cpp create mode 100644 src/lms/ui/admin/debug/PcmDecodingStats.hpp diff --git a/approot/admin-debugtools.xml b/approot/admin-debugtools.xml index 83025d9f..b7d380ea 100644 --- a/approot/admin-debugtools.xml +++ b/approot/admin-debugtools.xml @@ -8,8 +8,23 @@
${tr:Lms.Admin.DebugTools.Db.db} ${db} +
+ ${tr:Lms.Admin.DebugTools.PcmDecodingStats.pcm-decoding-stats} + ${pcm-decoding-stats} + +
+
+
+ ${run-btn class="btn btn-primary"} + ${download-btn class="btn btn-secondary ms-2"} + ${status} +
+
+
+ + diff --git a/approot/main.xml b/approot/main.xml index 1fb31ea5..a3fb4c71 100644 --- a/approot/main.xml +++ b/approot/main.xml @@ -45,10 +45,8 @@
  • ${scanner class="dropdown-item"}
  • ${users class="dropdown-item"}
  • ${about class="dropdown-item"}
    • - ${}
  • ${debug-tools class="dropdown-item"}
    • - ${    } ${} diff --git a/approot/messages.xml b/approot/messages.xml index 732e805b..146bfdbe 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -169,6 +169,13 @@ Export query profiling data Database + +PCM decoding stats +Run bench +Download results +Running… +PCM decoding benchmark completed in {1} + Export traces Tracing diff --git a/approot/messages_es.xml b/approot/messages_es.xml index c14b8491..21ba6ad6 100644 --- a/approot/messages_es.xml +++ b/approot/messages_es.xml @@ -169,6 +169,13 @@ Exportar datos de perfil de consultas Base de datos + +Estadísticas de decodificación PCM +Ejecutar benchmark +Descargar resultados +Ejecutando… +Benchmark de decodificación PCM completado en {1} + Exportar las trazas Trazas diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index 97f392b4..44a7f588 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -169,6 +169,13 @@ Exporter les données de profilage des requêtes Base de données + +Statistiques de décodage PCM +Lancer le bench +Télécharger les résultats +En cours… +Benchmark de décodage PCM terminé en {1} + Exporter les traces Traces diff --git a/approot/messages_it.xml b/approot/messages_it.xml index da46dd5d..1ec58f23 100644 --- a/approot/messages_it.xml +++ b/approot/messages_it.xml @@ -169,6 +169,13 @@ Esporta i dati di profilazione delle query Database + +Statistiche di decodifica PCM +Avvia benchmark +Scarica risultati +In esecuzione… +Benchmark di decodifica PCM completato in {1} + Esporta tracce Tracing diff --git a/approot/messages_pl.xml b/approot/messages_pl.xml index 16523ae9..f35671cd 100644 --- a/approot/messages_pl.xml +++ b/approot/messages_pl.xml @@ -186,6 +186,13 @@ Eksportuj dane profilowania zapytań Baza danych + +Statystyki dekodowania PCM +Uruchom benchmark +Pobierz wyniki +Trwa… +Test wydajności dekodowania PCM zakończony w {1} + Eksportuj ślady Śledzenie diff --git a/approot/messages_zh.xml b/approot/messages_zh.xml index 2da4a425..c0bc9f44 100644 --- a/approot/messages_zh.xml +++ b/approot/messages_zh.xml @@ -167,6 +167,13 @@ 导出查询分析数据 数据库 + +PCM解码统计 +运行基准测试 +下载结果 +运行中… +PCM解码基准测试已在{1}内完成 + 导出跟踪 跟踪 diff --git a/src/lms/CMakeLists.txt b/src/lms/CMakeLists.txt index 6ac4bc93..13ecb5b8 100644 --- a/src/lms/CMakeLists.txt +++ b/src/lms/CMakeLists.txt @@ -22,6 +22,8 @@ add_executable(lms ui/Utils.cpp ui/admin/AdminView.cpp ui/admin/debug/Database.cpp + ui/admin/debug/PcmDecodingBenchmark.cpp + ui/admin/debug/PcmDecodingStats.cpp ui/admin/debug/Tracing.cpp ui/admin/About.cpp ui/admin/DebugToolsView.cpp diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp index 36a27d66..a2523e88 100644 --- a/src/lms/ui/LmsApplication.cpp +++ b/src/lms/ui/LmsApplication.cpp @@ -40,7 +40,6 @@ #include "database/objects/Release.hpp" #include "database/objects/TrackList.hpp" #include "database/objects/User.hpp" -#include "database/profiling/IQueryProfiler.hpp" #include "services/artwork/IArtworkService.hpp" #include "services/auth/IAuthTokenService.hpp" #include "services/auth/IEnvService.hpp" @@ -448,13 +447,7 @@ namespace lms::ui navbar->bindNew("scan-settings", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scan-settings" }, Wt::WString::tr("Lms.Admin.menu-scan-settings")); navbar->bindNew("scanner", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/scanner" }, Wt::WString::tr("Lms.Admin.menu-scanner")); navbar->bindNew("users", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/users" }, Wt::WString::tr("Lms.Admin.menu-users")); - // Hide the entry if no debug service is enabled - if (core::Service::get() - || core::Service::get()) - { - navbar->setCondition("if-debug-tools", true); - navbar->bindNew("debug-tools", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/debug-tools" }, Wt::WString::tr("Lms.Admin.menu-debug-tools")); - } + navbar->bindNew("debug-tools", Wt::WLink{ Wt::LinkType::InternalPath, "/admin/debug-tools" }, Wt::WString::tr("Lms.Admin.menu-debug-tools")); } PathRouter* mainRouter{ main->bindNew("contents") }; diff --git a/src/lms/ui/admin/DebugToolsView.cpp b/src/lms/ui/admin/DebugToolsView.cpp index 570c97fa..d83f8198 100644 --- a/src/lms/ui/admin/DebugToolsView.cpp +++ b/src/lms/ui/admin/DebugToolsView.cpp @@ -21,6 +21,7 @@ #include "admin/debug/Database.hpp" #include "debug/Database.hpp" +#include "debug/PcmDecodingStats.hpp" #include "debug/Tracing.hpp" namespace lms::ui @@ -32,5 +33,6 @@ namespace lms::ui bindNew("tracing"); bindNew("db"); + bindNew("pcm-decoding-stats"); } } // namespace lms::ui diff --git a/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp b/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp new file mode 100644 index 00000000..a34f0ac1 --- /dev/null +++ b/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp @@ -0,0 +1,272 @@ +/* + * Copyright (C) 2025 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 "PcmDecodingBenchmark.hpp" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "audio/Exception.hpp" +#include "audio/IPcmDecoder.hpp" +#include "audio/PcmTypes.hpp" +#include "core/String.hpp" +#include "core/media/Codec.hpp" +#include "database/IDb.hpp" +#include "database/Session.hpp" +#include "database/objects/Filters.hpp" +#include "database/objects/Track.hpp" +#include "database/objects/Types.hpp" + +#include "LmsApplication.hpp" + +namespace lms::ui +{ + namespace + { + using Clock = std::chrono::steady_clock; + + struct DecodeResult + { + std::size_t fileSize{}; + std::size_t decodedSampleCount{}; + Clock::duration decodeDuration{}; + }; + + constexpr std::chrono::milliseconds minTrackDuration{ std::chrono::minutes{ 3 } }; + constexpr std::chrono::milliseconds maxTrackDuration{ std::chrono::minutes{ 5 } }; + constexpr std::size_t maxTracksPerCodec{ 10 }; + constexpr std::size_t queryBatchSize{ 100 }; + + struct TrackEntry + { + std::filesystem::path path; + std::chrono::milliseconds duration; + std::size_t fileSize{}; + std::size_t bitrate{}; + }; + + std::vector pickTracksForCodec(db::Session& session, core::media::Codec codec) + { + auto transaction{ session.createReadTransaction() }; + + db::Track::FindParameters params; + params.setFilters(db::Filters{}.setCodec(codec)); + params.setSortMethod(db::TrackSortMethod::Random); + params.setRange(db::Range{ .offset = 0, .size = queryBatchSize }); + + const auto results{ db::Track::find(session, params) }; + + std::vector entries; + for (const db::Track::pointer& track : results.results) + { + const auto trackDuration{ track->getDuration() }; + if (trackDuration >= minTrackDuration && trackDuration <= maxTrackDuration) + { + entries.push_back({ track->getAbsoluteFilePath(), trackDuration, static_cast(track->getFileSize()), track->getBitrate() }); + if (entries.size() == maxTracksPerCodec) + break; + } + } + + return entries; + } + + DecodeResult decodeFile(const std::filesystem::path& path, std::size_t fileSize, const audio::PcmParameters& params) + { + constexpr std::size_t bufferSamples{ 4096 }; + const std::size_t bufferSize{ bufferSamples * params.channelCount * audio::getSampleSize(params.sampleType) }; + + std::vector buffer(bufferSize); + std::array outputBuffers{ audio::IPcmDecoder::WritableBuffer{ buffer } }; + + const auto start{ Clock::now() }; + + auto decoder{ audio::createPcmDecoder(path, std::chrono::microseconds{ 0 }, params) }; + + std::size_t sampleCount{}; + while (!decoder->finished()) + sampleCount += decoder->readSamples(outputBuffers); + + return DecodeResult{ + .fileSize = fileSize, + .decodedSampleCount = sampleCount, + .decodeDuration = Clock::now() - start, + }; + } + + std::vector runBench(db::IDb& db) + { + constexpr audio::PcmParameters params{ + .channelCount = 2, + .sampleRate = 48000, + .sampleType = audio::PcmSampleType::Signed16, + .byteOrder = std::endian::native, + .planar = false, + }; + + std::vector allResults; + + core::media::visitCodecs([&](const core::media::CodecDesc& codecDesc) { + const std::vector tracks{ pickTracksForCodec(db.getTLSSession(), codecDesc.type) }; + if (tracks.empty()) + return; + + std::vector trackResults; + for (const TrackEntry& entry : tracks) + { + try + { + const DecodeResult res{ decodeFile(entry.path, entry.fileSize, params) }; + const float elapsedSeconds{ std::chrono::duration{ res.decodeDuration }.count() }; + if (elapsedSeconds <= 0.F || res.decodedSampleCount == 0) + continue; + + const float decodedAudioSeconds{ static_cast(res.decodedSampleCount) / params.sampleRate }; + trackResults.push_back(PcmDecodingBenchmark::TrackDecodeResult{ + .path = entry.path, + .bitrate = entry.bitrate, + .duration = entry.duration, + .realTimeFactor = decodedAudioSeconds / elapsedSeconds, + .speedKBs = (static_cast(res.fileSize) / 1024.F) / elapsedSeconds, + }); + } + catch (const audio::Exception&) + { + } + } + + if (trackResults.empty()) + return; + + std::vector rtFactors; + rtFactors.reserve(trackResults.size()); + for (const auto& t : trackResults) + rtFactors.push_back(t.realTimeFactor); + + const float mean{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F) / static_cast(rtFactors.size()) }; + const float variance{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F, [mean](float acc, float v) { + return acc + (v - mean) * (v - mean); + }) / static_cast(rtFactors.size()) }; + + const auto [minIt, maxIt]{ std::minmax_element(rtFactors.begin(), rtFactors.end()) }; + allResults.push_back(PcmDecodingBenchmark::CodecResult{ + .codecName = std::string{ codecDesc.name.str() }, + .tracks = std::move(trackResults), + .minRealTimeFactor = *minIt, + .maxRealTimeFactor = *maxIt, + .meanRealTimeFactor = mean, + .stdDevRealTimeFactor = std::sqrt(variance), + }); + }); + + return allResults; + } + } // namespace + + PcmDecodingBenchmark& PcmDecodingBenchmark::instance() + { + static PcmDecodingBenchmark s_instance; + return s_instance; + } + + PcmDecodingBenchmark::State PcmDecodingBenchmark::getState() const + { + std::scoped_lock lock{ _mutex }; + return _state; + } + + void PcmDecodingBenchmark::start(db::IDb& db) + { + { + State prevState; + { + std::scoped_lock lock{ _mutex }; + + if (_state == State::Running) + return; + + _reportFilename = "LMS_pcm_decoding_stats_" + core::stringUtils::toISO8601String(Wt::WDateTime::currentDateTime()) + ".txt"; + prevState = _state; + _state = State::Running; + } + + postStateToAllSessions(prevState, State::Running); + } + + std::thread{ [this, &db] { + const auto start{ Clock::now() }; + std::vector results{ runBench(db) }; + const auto elapsed{ std::chrono::duration_cast(Clock::now() - start) }; + + State prevState; + { + std::scoped_lock lock{ _mutex }; + + _results = std::move(results); + _elapsed = elapsed; + prevState = _state; + _state = State::Completed; + } + + postStateToAllSessions(prevState, State::Completed); + } }.detach(); + } + + void PcmDecodingBenchmark::registerOnStateChanged(const std::string& sessionId, std::function f) + { + std::scoped_lock lock{ _signalMutex }; + _sessionSignals[sessionId].connect(std::move(f)); + } + + void PcmDecodingBenchmark::unregisterOnStateChanged(const std::string& sessionId) + { + std::scoped_lock lock{ _signalMutex }; + _sessionSignals.erase(sessionId); + } + + void PcmDecodingBenchmark::postStateToAllSessions(State oldState, State newState) + { + Wt::WServer::instance()->postAll([this, oldState, newState] { + if (!LmsApp) + return; + + Wt::Signal* sig{ nullptr }; + { + std::scoped_lock lock{ _signalMutex }; + auto it{ _sessionSignals.find(wApp->sessionId()) }; + if (it != _sessionSignals.end()) + sig = &it->second; + } + + if (sig) + { + sig->emit(oldState, newState); + LmsApp->triggerUpdate(); + } + }); + } +} // namespace lms::ui diff --git a/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp b/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp new file mode 100644 index 00000000..3a18e238 --- /dev/null +++ b/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2025 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 +#include +#include +#include +#include +#include +#include + +#include + +namespace lms::db +{ + class IDb; +} + +namespace lms::ui +{ + class PcmDecodingBenchmark + { + public: + enum class State { Idle, Running, Completed }; + + struct TrackDecodeResult + { + std::filesystem::path path; + std::size_t bitrate{}; + std::chrono::milliseconds duration; + float realTimeFactor{}; + float speedKBs{}; + }; + + struct CodecResult + { + std::string codecName; + std::vector tracks; + float minRealTimeFactor{}; + float maxRealTimeFactor{}; + float meanRealTimeFactor{}; + float stdDevRealTimeFactor{}; + }; + + static PcmDecodingBenchmark& instance(); + + State getState() const; + std::span getResults() const { return _results; } + std::chrono::milliseconds getElapsed() const { return _elapsed; } + std::string_view getReportFilename() const { return _reportFilename; } + + void start(db::IDb& db); + + void registerOnStateChanged(const std::string& sessionId, std::function f); + void unregisterOnStateChanged(const std::string& sessionId); + + private: + void postStateToAllSessions(State oldState, State newState); + + State _state{ State::Idle }; + mutable std::mutex _mutex; + std::vector _results; + std::chrono::milliseconds _elapsed{}; + std::string _reportFilename; + + std::mutex _signalMutex; + std::unordered_map> _sessionSignals; + }; +} // namespace lms::ui diff --git a/src/lms/ui/admin/debug/PcmDecodingStats.cpp b/src/lms/ui/admin/debug/PcmDecodingStats.cpp new file mode 100644 index 00000000..6c13eb29 --- /dev/null +++ b/src/lms/ui/admin/debug/PcmDecodingStats.cpp @@ -0,0 +1,200 @@ +/* + * Copyright (C) 2025 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 "PcmDecodingStats.hpp" + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "LmsApplication.hpp" +#include "Notification.hpp" +#include "PcmDecodingBenchmark.hpp" + +namespace lms::ui +{ + namespace + { + class PcmDecodingStatsResource : public Wt::WResource + { + public: + PcmDecodingStatsResource(std::span results, std::chrono::milliseconds elapsed, std::string filename) + : _results{ results.begin(), results.end() } + , _elapsed{ elapsed } + , _filename{ std::move(filename) } + { + } + + ~PcmDecodingStatsResource() override + { + beingDeleted(); + } + + PcmDecodingStatsResource(const PcmDecodingStatsResource&) = delete; + PcmDecodingStatsResource& operator=(const PcmDecodingStatsResource&) = delete; + + private: + void handleRequest(const Wt::Http::Request&, Wt::Http::Response& response) override + { + response.setMimeType("text/plain; charset=utf-8"); + + auto encodeHttpHeaderField = [](const std::string& fieldName, const std::string& fieldValue) { + return fieldName + "*=UTF-8''" + Wt::Utils::urlEncode(fieldValue); + }; + + const std::string cdp{ encodeHttpHeaderField("filename", _filename) }; + response.addHeader("Content-Disposition", "attachment; " + cdp); + + response.out() << "PCM decoding bench (elapsed: " << std::chrono::duration_cast(_elapsed).count() << "s)\n\n"; + + std::vector allRtFactors; + for (const PcmDecodingBenchmark::CodecResult& r : _results) + { + response.out() << "=== " << r.codecName << " (" << r.tracks.size() << " track(s)) ===\n"; + + for (const PcmDecodingBenchmark::TrackDecodeResult& t : r.tracks) + { + const long durationSec{ static_cast(t.duration.count() / 1000) }; + response.out() << " " << t.path + << " bitrate=" << t.bitrate / 1000 << " kbps" + << " duration=" << durationSec / 60 << "m" << durationSec % 60 << "s" + << " real_time_factor=" << static_cast(t.realTimeFactor) << "x" + << " speed=" << static_cast(t.speedKBs) << " KB/s\n"; + allRtFactors.push_back(t.realTimeFactor); + } + + response.out() << " real_time_factor summary:" + << " min=" << static_cast(r.minRealTimeFactor) << "x" + << " max=" << static_cast(r.maxRealTimeFactor) << "x" + << " mean=" << static_cast(r.meanRealTimeFactor) << "x" + << " stddev=" << static_cast(r.stdDevRealTimeFactor) << "x\n\n"; + } + + if (!allRtFactors.empty()) + { + const float mean{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F) / static_cast(allRtFactors.size()) }; + const float variance{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F, [mean](float acc, float v) { + return acc + (v - mean) * (v - mean); + }) / static_cast(allRtFactors.size()) }; + + response.out() << "=== OVERALL (" << allRtFactors.size() << " track(s)) ===\n"; + const auto [minIt, maxIt]{ std::minmax_element(allRtFactors.begin(), allRtFactors.end()) }; + response.out() << " real_time_factor summary:" + << " min=" << static_cast(*minIt) << "x" + << " max=" << static_cast(*maxIt) << "x" + << " mean=" << static_cast(mean) << "x" + << " stddev=" << static_cast(std::sqrtf(variance)) << "x\n"; + } + } + + std::vector _results; + std::chrono::milliseconds _elapsed{}; + std::string _filename; + }; + } // namespace + + PcmDecodingStats::PcmDecodingStats() + : Wt::WTemplate{ Wt::WString::tr("Lms.Admin.DebugTools.PcmDecodingStats.template") } + , _db{ LmsApp->getDb() } + { + addFunction("tr", &Wt::WTemplate::Functions::tr); + + _runBtn = bindNew("run-btn", Wt::WString::tr("Lms.Admin.DebugTools.PcmDecodingStats.run")); + _downloadBtn = bindNew("download-btn"); + _downloadBtn->setText(Wt::WString::tr("Lms.Admin.DebugTools.PcmDecodingStats.download")); + _statusText = bindNew("status"); + + _runBtn->clicked().connect(this, &PcmDecodingStats::onRunClicked); + + processState(PcmDecodingBenchmark::instance().getState()); + + PcmDecodingBenchmark::instance().registerOnStateChanged(wApp->sessionId(), [this](PcmDecodingBenchmark::State oldState, PcmDecodingBenchmark::State newState) { + onStateChanged(oldState, newState); + }); + } + + PcmDecodingStats::~PcmDecodingStats() + { + PcmDecodingBenchmark::instance().unregisterOnStateChanged(wApp->sessionId()); + } + + void PcmDecodingStats::onRunClicked() + { + PcmDecodingBenchmark::instance().start(_db); + } + + void PcmDecodingStats::processState(PcmDecodingBenchmark::State state) + { + switch (state) + { + case PcmDecodingBenchmark::State::Idle: + _runBtn->setEnabled(true); + _downloadBtn->hide(); + _statusText->setText({}); + break; + case PcmDecodingBenchmark::State::Running: + _runBtn->setEnabled(false); + _downloadBtn->hide(); + _statusText->setText(Wt::WString::tr("Lms.Admin.DebugTools.PcmDecodingStats.running")); + break; + case PcmDecodingBenchmark::State::Completed: + _runBtn->setEnabled(true); + _statusText->setText({}); + setupDownloadButton(); + break; + } + } + + void PcmDecodingStats::onStateChanged(PcmDecodingBenchmark::State oldState, PcmDecodingBenchmark::State newState) + { + processState(newState); + + if (oldState == PcmDecodingBenchmark::State::Running && newState == PcmDecodingBenchmark::State::Completed) + { + std::ostringstream oss; + oss << std::chrono::duration_cast(PcmDecodingBenchmark::instance().getElapsed()).count() << "s"; + LmsApp->notifyMsg(Notification::Type::Info, Wt::WString::tr("Lms.Admin.DebugTools.PcmDecodingStats.benchmark-completed").arg(oss.str())); + } + } + + void PcmDecodingStats::setupDownloadButton() + { + auto& bench{ PcmDecodingBenchmark::instance() }; + auto resource{ std::make_shared(bench.getResults(), bench.getElapsed(), std::string{ bench.getReportFilename() } ) }; + + Wt::WLink link{ resource }; + link.setTarget(Wt::LinkTarget::NewWindow); + _downloadBtn->setLink(link); + _downloadBtn->show(); + } +} // namespace lms::ui diff --git a/src/lms/ui/admin/debug/PcmDecodingStats.hpp b/src/lms/ui/admin/debug/PcmDecodingStats.hpp new file mode 100644 index 00000000..a894fe15 --- /dev/null +++ b/src/lms/ui/admin/debug/PcmDecodingStats.hpp @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 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 +#include +#include + +#include "PcmDecodingBenchmark.hpp" + +namespace lms::db +{ + class IDb; +} + +namespace lms::ui +{ + class PcmDecodingStats : public Wt::WTemplate + { + public: + PcmDecodingStats(); + ~PcmDecodingStats() override; + + private: + void onRunClicked(); + void onStateChanged(PcmDecodingBenchmark::State oldState, PcmDecodingBenchmark::State newState); + void processState(PcmDecodingBenchmark::State state); + void setupDownloadButton(); + + db::IDb& _db; + Wt::WPushButton* _runBtn{}; + Wt::WAnchor* _downloadBtn{}; + Wt::WText* _statusText{}; + }; +} // namespace lms::ui From 52b6af434da0ebf42ccf97dad0f9617bd468d725 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 13:34:18 +0200 Subject: [PATCH 25/38] Minor cleanup --- .../audio/impl/musicnn/MusicNNEmbeddings.cpp | 6 +- .../ui/admin/debug/PcmDecodingBenchmark.cpp | 53 +++++++++++----- .../ui/admin/debug/PcmDecodingBenchmark.hpp | 14 +++-- src/lms/ui/admin/debug/PcmDecodingStats.cpp | 60 +++++++++++-------- 4 files changed, 86 insertions(+), 47 deletions(-) diff --git a/src/libs/audio/impl/musicnn/MusicNNEmbeddings.cpp b/src/libs/audio/impl/musicnn/MusicNNEmbeddings.cpp index 59eb1cbb..e2066957 100644 --- a/src/libs/audio/impl/musicnn/MusicNNEmbeddings.cpp +++ b/src/libs/audio/impl/musicnn/MusicNNEmbeddings.cpp @@ -32,7 +32,7 @@ namespace lms::audio namespace { - constexpr uint32_t byteswap32(uint32_t x) + constexpr std::uint32_t byteswap32(uint32_t x) { return (x >> 24) | ((x >> 8) & 0x0000FF00u) | ((x << 8) & 0x00FF0000u) | (x << 24); } @@ -44,7 +44,7 @@ namespace lms::audio for (std::size_t i{}; i < data.size(); ++i) { - uint32_t bits{ std::bit_cast(data[i]) }; + std::uint32_t bits{ std::bit_cast(data[i]) }; if constexpr (std::endian::native == std::endian::little) bits = byteswap32(bits); std::memcpy(blob.data() + i * 4, &bits, 4); @@ -58,7 +58,7 @@ namespace lms::audio for (std::size_t i{}; i < data.size(); ++i) { - uint32_t bits{}; + std::uint32_t bits{}; std::memcpy(&bits, blob.data() + i * 4, 4); if constexpr (std::endian::native == std::endian::little) bits = byteswap32(bits); diff --git a/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp b/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp index a34f0ac1..329a3f33 100644 --- a/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp +++ b/src/lms/ui/admin/debug/PcmDecodingBenchmark.cpp @@ -162,22 +162,23 @@ namespace lms::ui if (trackResults.empty()) return; - std::vector rtFactors; - rtFactors.reserve(trackResults.size()); - for (const auto& t : trackResults) - rtFactors.push_back(t.realTimeFactor); - - const float mean{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F) / static_cast(rtFactors.size()) }; - const float variance{ std::accumulate(rtFactors.begin(), rtFactors.end(), 0.F, [mean](float acc, float v) { - return acc + (v - mean) * (v - mean); - }) / static_cast(rtFactors.size()) }; - - const auto [minIt, maxIt]{ std::minmax_element(rtFactors.begin(), rtFactors.end()) }; + const std::size_t n{ trackResults.size() }; + const float mean{ std::accumulate(trackResults.begin(), trackResults.end(), 0.F, [](float acc, const PcmDecodingBenchmark::TrackDecodeResult& t) { + return acc + t.realTimeFactor; + }) + / static_cast(n) }; + const float variance{ std::accumulate(trackResults.begin(), trackResults.end(), 0.F, [mean](float acc, const PcmDecodingBenchmark::TrackDecodeResult& t) { + return acc + (t.realTimeFactor - mean) * (t.realTimeFactor - mean); + }) + / static_cast(n) }; + const auto [minIt, maxIt]{ std::minmax_element(trackResults.begin(), trackResults.end(), [](const PcmDecodingBenchmark::TrackDecodeResult& a, const PcmDecodingBenchmark::TrackDecodeResult& b) { + return a.realTimeFactor < b.realTimeFactor; + }) }; allResults.push_back(PcmDecodingBenchmark::CodecResult{ .codecName = std::string{ codecDesc.name.str() }, .tracks = std::move(trackResults), - .minRealTimeFactor = *minIt, - .maxRealTimeFactor = *maxIt, + .minRealTimeFactor = minIt->realTimeFactor, + .maxRealTimeFactor = maxIt->realTimeFactor, .meanRealTimeFactor = mean, .stdDevRealTimeFactor = std::sqrt(variance), }); @@ -199,6 +200,24 @@ namespace lms::ui return _state; } + std::vector PcmDecodingBenchmark::getResults() const + { + std::scoped_lock lock{ _mutex }; + return _results; + } + + std::chrono::milliseconds PcmDecodingBenchmark::getElapsed() const + { + std::scoped_lock lock{ _mutex }; + return _elapsed; + } + + std::string PcmDecodingBenchmark::getReportFilename() const + { + std::scoped_lock lock{ _mutex }; + return _reportFilename; + } + void PcmDecodingBenchmark::start(db::IDb& db) { { @@ -208,7 +227,7 @@ namespace lms::ui if (_state == State::Running) return; - + _reportFilename = "LMS_pcm_decoding_stats_" + core::stringUtils::toISO8601String(Wt::WDateTime::currentDateTime()) + ".txt"; prevState = _state; _state = State::Running; @@ -250,7 +269,11 @@ namespace lms::ui void PcmDecodingBenchmark::postStateToAllSessions(State oldState, State newState) { - Wt::WServer::instance()->postAll([this, oldState, newState] { + auto* server{ Wt::WServer::instance() }; + if (!server) + return; + + server->postAll([this, oldState, newState] { if (!LmsApp) return; diff --git a/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp b/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp index 3a18e238..8c096438 100644 --- a/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp +++ b/src/lms/ui/admin/debug/PcmDecodingBenchmark.hpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -40,7 +39,12 @@ namespace lms::ui class PcmDecodingBenchmark { public: - enum class State { Idle, Running, Completed }; + enum class State + { + Idle, + Running, + Completed + }; struct TrackDecodeResult { @@ -64,9 +68,9 @@ namespace lms::ui static PcmDecodingBenchmark& instance(); State getState() const; - std::span getResults() const { return _results; } - std::chrono::milliseconds getElapsed() const { return _elapsed; } - std::string_view getReportFilename() const { return _reportFilename; } + std::vector getResults() const; + std::chrono::milliseconds getElapsed() const; + std::string getReportFilename() const; void start(db::IDb& db); diff --git a/src/lms/ui/admin/debug/PcmDecodingStats.cpp b/src/lms/ui/admin/debug/PcmDecodingStats.cpp index 6c13eb29..4b906d27 100644 --- a/src/lms/ui/admin/debug/PcmDecodingStats.cpp +++ b/src/lms/ui/admin/debug/PcmDecodingStats.cpp @@ -21,9 +21,9 @@ #include #include -#include #include -#include +#include +#include #include #include @@ -48,8 +48,8 @@ namespace lms::ui class PcmDecodingStatsResource : public Wt::WResource { public: - PcmDecodingStatsResource(std::span results, std::chrono::milliseconds elapsed, std::string filename) - : _results{ results.begin(), results.end() } + PcmDecodingStatsResource(std::vector results, std::chrono::milliseconds elapsed, std::string filename) + : _results{ std::move(results) } , _elapsed{ elapsed } , _filename{ std::move(filename) } { @@ -75,9 +75,14 @@ namespace lms::ui const std::string cdp{ encodeHttpHeaderField("filename", _filename) }; response.addHeader("Content-Disposition", "attachment; " + cdp); + response.out() << std::fixed << std::setprecision(1); response.out() << "PCM decoding bench (elapsed: " << std::chrono::duration_cast(_elapsed).count() << "s)\n\n"; - std::vector allRtFactors; + std::size_t totalTracks{}; + float globalMin{ std::numeric_limits::max() }; + float globalMax{ std::numeric_limits::lowest() }; + float weightedMeanSum{}; + for (const PcmDecodingBenchmark::CodecResult& r : _results) { response.out() << "=== " << r.codecName << " (" << r.tracks.size() << " track(s)) ===\n"; @@ -88,32 +93,39 @@ namespace lms::ui response.out() << " " << t.path << " bitrate=" << t.bitrate / 1000 << " kbps" << " duration=" << durationSec / 60 << "m" << durationSec % 60 << "s" - << " real_time_factor=" << static_cast(t.realTimeFactor) << "x" - << " speed=" << static_cast(t.speedKBs) << " KB/s\n"; - allRtFactors.push_back(t.realTimeFactor); + << " real_time_factor=" << t.realTimeFactor << "x" + << " speed=" << t.speedKBs << " KB/s\n"; } response.out() << " real_time_factor summary:" - << " min=" << static_cast(r.minRealTimeFactor) << "x" - << " max=" << static_cast(r.maxRealTimeFactor) << "x" - << " mean=" << static_cast(r.meanRealTimeFactor) << "x" - << " stddev=" << static_cast(r.stdDevRealTimeFactor) << "x\n\n"; + << " min=" << r.minRealTimeFactor << "x" + << " max=" << r.maxRealTimeFactor << "x" + << " mean=" << r.meanRealTimeFactor << "x" + << " stddev=" << r.stdDevRealTimeFactor << "x\n\n"; + + totalTracks += r.tracks.size(); + globalMin = std::min(globalMin, r.minRealTimeFactor); + globalMax = std::max(globalMax, r.maxRealTimeFactor); + weightedMeanSum += r.meanRealTimeFactor * static_cast(r.tracks.size()); } - if (!allRtFactors.empty()) + if (totalTracks > 0) { - const float mean{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F) / static_cast(allRtFactors.size()) }; - const float variance{ std::accumulate(allRtFactors.begin(), allRtFactors.end(), 0.F, [mean](float acc, float v) { - return acc + (v - mean) * (v - mean); - }) / static_cast(allRtFactors.size()) }; + const float globalMean{ weightedMeanSum / static_cast(totalTracks) }; - response.out() << "=== OVERALL (" << allRtFactors.size() << " track(s)) ===\n"; - const auto [minIt, maxIt]{ std::minmax_element(allRtFactors.begin(), allRtFactors.end()) }; + float weightedVarianceSum{}; + for (const PcmDecodingBenchmark::CodecResult& r : _results) + { + const float d{ r.meanRealTimeFactor - globalMean }; + weightedVarianceSum += static_cast(r.tracks.size()) * (r.stdDevRealTimeFactor * r.stdDevRealTimeFactor + d * d); + } + + response.out() << "=== OVERALL (" << totalTracks << " track(s)) ===\n"; response.out() << " real_time_factor summary:" - << " min=" << static_cast(*minIt) << "x" - << " max=" << static_cast(*maxIt) << "x" - << " mean=" << static_cast(mean) << "x" - << " stddev=" << static_cast(std::sqrtf(variance)) << "x\n"; + << " min=" << globalMin << "x" + << " max=" << globalMax << "x" + << " mean=" << globalMean << "x" + << " stddev=" << std::sqrt(weightedVarianceSum / static_cast(totalTracks)) << "x\n"; } } @@ -190,7 +202,7 @@ namespace lms::ui void PcmDecodingStats::setupDownloadButton() { auto& bench{ PcmDecodingBenchmark::instance() }; - auto resource{ std::make_shared(bench.getResults(), bench.getElapsed(), std::string{ bench.getReportFilename() } ) }; + auto resource{ std::make_shared(bench.getResults(), bench.getElapsed(), bench.getReportFilename()) }; Wt::WLink link{ resource }; link.setTarget(Wt::LinkTarget::NewWindow); From eca418d2bc8e6a2a033656f635bbcb2a9b78d661 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 13:35:50 +0200 Subject: [PATCH 26/38] Fixed crash with some corrupted files, ref #857 --- src/libs/audio/impl/ffmpeg/PcmDecoder.cpp | 167 +++++++++++++--------- src/libs/audio/impl/ffmpeg/PcmDecoder.hpp | 13 ++ 2 files changed, 116 insertions(+), 64 deletions(-) diff --git a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp index 499db0e2..035bf12e 100644 --- a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp +++ b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp @@ -67,6 +67,37 @@ namespace lms::audio::ffmpeg throw Exception("Unsupported PcmSampleType"); } + + SwrContextPtr createResampler(const PcmParameters& params, const AVChannelLayout& inLayout, AVSampleFormat inFmt, int inSampleRate) + { + const ::AVSampleFormat outFmt{ toAvSampleFormat(params.sampleType, params.planar) }; + AVChannelLayout outLayout; + ::av_channel_layout_default(&outLayout, static_cast(params.channelCount)); + + ::SwrContext* context{}; + const int err{ ::swr_alloc_set_opts2( + &context, + &outLayout, + outFmt, + static_cast(params.sampleRate), + &inLayout, + inFmt, + inSampleRate, + 0, + nullptr) }; + ::av_channel_layout_uninit(&outLayout); + + if (err < 0 || !context) + throw FFmpegException{ "Cannot allocate resampler context", err }; + + SwrContextPtr resampleContext{ context }; + + const int initErr{ ::swr_init(resampleContext.get()) }; + if (initErr < 0) + throw FFmpegException{ "Cannot initialize resampler", initErr }; + + return resampleContext; + } } // namespace PcmDecoder::PcmDecoder(const std::filesystem::path& filePath, std::chrono::microseconds offset, const PcmParameters& parameters) @@ -159,36 +190,14 @@ namespace lms::audio::ffmpeg if (!_inputPacket) throw Exception{ "Cannot allocate input packet" }; - // Resampler - const ::AVSampleFormat outFmt{ toAvSampleFormat(_parameters.sampleType, _parameters.planar) }; - AVChannelLayout outLayout; - ::av_channel_layout_default(&outLayout, _parameters.channelCount); - - { - ::SwrContext* context{}; - ::swr_alloc_set_opts2( - &context, // existing context - &outLayout, // out layout - outFmt, // out format - static_cast(_parameters.sampleRate), // out rate - &_decoderContext->ch_layout, // in layout - _decoderContext->sample_fmt, // in format - _decoderContext->sample_rate, // in rate - 0, // log offset - nullptr); - ::av_channel_layout_uninit(&outLayout); - - if (!context) - throw Exception{ "Cannot allocate resampler context" }; - - _resampleContext = SwrContextPtr{ context }; - } - - { - int error{ ::swr_init(_resampleContext.get()) }; - if (error < 0) - throw FFmpegException{ "Cannot initialize resampler", error }; - } + _resampleContext = createResampler(_parameters, _decoderContext->ch_layout, _decoderContext->sample_fmt, _decoderContext->sample_rate); + _resamplerInputConfig = { + _decoderContext->sample_rate, + static_cast(_decoderContext->sample_fmt), + _decoderContext->ch_layout.nb_channels, + static_cast(_decoderContext->ch_layout.order), + _decoderContext->ch_layout.u.mask, + }; } PcmDecoder::~PcmDecoder() = default; @@ -232,34 +241,28 @@ namespace lms::audio::ffmpeg } else { - std::array outData{}; - for (std::size_t i{}; i < outputChannelBuffers.size(); ++i) - outData[i] = reinterpret_cast(outputChannelBuffers[i].data()); - - // Resample decoded audio - const int outSampleCount{ ::swr_convert( - _resampleContext.get(), - outData.data(), - static_cast(maxSamplesPerChannel), - (const uint8_t**)_decodedFrame->data, - _decodedFrame->nb_samples) }; + const std::size_t outSampleCount{ resampleFrame(outputChannelBuffers, maxSamplesPerChannel, _decodedFrame.get()) }; ::av_frame_unref(_decodedFrame.get()); - if (outSampleCount < 0) - throw FFmpegException{ "swr_convert failed", outSampleCount }; - if (outSampleCount > 0) - return static_cast(outSampleCount); + return outSampleCount; - continue; // Rare but legal: frame produced no output (delay accumulation) + continue; // delay accumulation: resampler is buffering, no output yet } // Drain resampler once decoder is drained if (_draining) { - const std::size_t outSampleCount{ drainResampler(outputChannelBuffers, maxSamplesPerChannel) }; - if (outSampleCount > 0) - return outSampleCount; + try + { + const std::size_t outSampleCount{ drainResampler(outputChannelBuffers, maxSamplesPerChannel) }; + if (outSampleCount > 0) + return outSampleCount; + } + catch (const Exception& e) + { + LMS_LOG(AUDIO, ERROR, "Failed to drain resampler: " << e.what()); + } _finished = true; break; @@ -286,7 +289,6 @@ namespace lms::audio::ffmpeg if (outputChannelBuffers.size() != _parameters.channelCount) throw Exception{ "Expected " + std::to_string(_parameters.channelCount) + " buffers for planar output" }; - // Each planar buffer holds samples for one channel only const int bytesPerSample{ av_get_bytes_per_sample(toAvSampleFormat(_parameters.sampleType, true)) }; if (bytesPerSample <= 0) throw Exception{ "Invalid bytes per sample for output format" }; @@ -306,7 +308,6 @@ namespace lms::audio::ffmpeg if (bytesPerSample <= 0) throw Exception{ "Invalid bytes per sample for output format" }; - // Divide by (bytes per sample * number of channels) for interleaved const std::size_t sampleCount = outputChannelBuffers[0].size() / (bytesPerSample * _parameters.channelCount); return sampleCount; @@ -353,28 +354,66 @@ namespace lms::audio::ffmpeg } } - std::size_t PcmDecoder::drainResampler(std::span outputChannelBuffers, std::size_t maxSamplesPerChannel) + bool PcmDecoder::inputFormatChanged(const AVFrame* frame) const { - std::array outData{}; - for (std::size_t i{}; i < outputChannelBuffers.size(); ++i) - outData[i] = reinterpret_cast(outputChannelBuffers[i].data()); + const auto& c{ _resamplerInputConfig }; + if (frame->sample_rate != c.sampleRate + || frame->format != c.sampleFormat + || frame->ch_layout.nb_channels != c.nbChannels + || static_cast(frame->ch_layout.order) != c.channelOrder) + return true; + if (frame->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) + return frame->ch_layout.u.mask != c.channelMask; + return false; + } - const int outSampleCount{ ::swr_convert(_resampleContext.get(), - outData.data(), - static_cast(maxSamplesPerChannel), - nullptr, - 0) }; + void PcmDecoder::reinitResamplerForFrame(const AVFrame* frame) + { + // The format change is caused by a corrupt/non-standard frame so the lost samples are likely garbled audio anyway. + _resampleContext = createResampler(_parameters, frame->ch_layout, static_cast(frame->format), frame->sample_rate); + _resamplerInputConfig = { + frame->sample_rate, + frame->format, + frame->ch_layout.nb_channels, + static_cast(frame->ch_layout.order), + frame->ch_layout.u.mask, + }; + } + + std::size_t PcmDecoder::resampleFrame(std::span outputChannelBuffers, std::size_t maxSamplesPerChannel, const AVFrame* inputFrame) + { + if (inputFrame && inputFormatChanged(inputFrame)) + { + LMS_LOG(AUDIO, DEBUG, "Input format changed"); + reinitResamplerForFrame(inputFrame); + } + + std::array outData{}; + for (std::size_t i{}; i < outputChannelBuffers.size(); ++i) + outData[i] = static_cast(static_cast(outputChannelBuffers[i].data())); + + const int outSampleCount{ ::swr_convert( + _resampleContext.get(), + outData.data(), + static_cast(maxSamplesPerChannel), + inputFrame ? reinterpret_cast(inputFrame->data) : nullptr, + inputFrame ? inputFrame->nb_samples : 0) }; if (outSampleCount < 0) - throw FFmpegException{ "swr_convert (drain) failed", outSampleCount }; + throw FFmpegException{ inputFrame ? "swr_convert failed" : "swr_convert (drain) failed", outSampleCount }; - return outSampleCount; + return static_cast(outSampleCount); + } + + std::size_t PcmDecoder::drainResampler(std::span outputChannelBuffers, std::size_t maxSamplesPerChannel) + { + return resampleFrame(outputChannelBuffers, maxSamplesPerChannel, nullptr); } std::size_t PcmDecoder::getEstimatedResamplerAvailableSamples() const { - const int64_t delayedInputSampleCount{ ::swr_get_delay(_resampleContext.get(), _decoderContext->sample_rate) }; - const int64_t sampleCount{ av_rescale_rnd(delayedInputSampleCount, _parameters.sampleRate, _decoderContext->sample_rate, AV_ROUND_UP) }; + const int64_t delayedInputSampleCount{ ::swr_get_delay(_resampleContext.get(), _resamplerInputConfig.sampleRate) }; + const int64_t sampleCount{ av_rescale_rnd(delayedInputSampleCount, _parameters.sampleRate, _resamplerInputConfig.sampleRate, AV_ROUND_UP) }; return sampleCount; } diff --git a/src/libs/audio/impl/ffmpeg/PcmDecoder.hpp b/src/libs/audio/impl/ffmpeg/PcmDecoder.hpp index 8c7d5c3f..a2515527 100644 --- a/src/libs/audio/impl/ffmpeg/PcmDecoder.hpp +++ b/src/libs/audio/impl/ffmpeg/PcmDecoder.hpp @@ -44,6 +44,9 @@ namespace lms::audio::ffmpeg std::size_t computeSampleCountPerChannel(std::span outputChannelBuffers) const; void feedDecoder(); + bool inputFormatChanged(const AVFrame* frame) const; + void reinitResamplerForFrame(const AVFrame* frame); + std::size_t resampleFrame(std::span outputChannelBuffers, std::size_t maxSamplesPerChannel, const AVFrame* inputFrame); std::size_t drainResampler(std::span outputChannelBuffers, std::size_t maxSamplesPerChannel); std::size_t getEstimatedResamplerAvailableSamples() const; @@ -60,5 +63,15 @@ namespace lms::audio::ffmpeg AVFramePtr _decodedFrame; AVPacketPtr _inputPacket; SwrContextPtr _resampleContext; + + struct ResamplerInputConfig + { + int sampleRate{}; + int sampleFormat{}; + int nbChannels{}; + int channelOrder{}; + std::uint64_t channelMask{}; + }; + ResamplerInputConfig _resamplerInputConfig; }; } // namespace lms::audio::ffmpeg \ No newline at end of file From f53d4b5f24310b69b01ca4a815a8a0c014a946e4 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 13:57:04 +0200 Subject: [PATCH 27/38] Fixed build --- src/libs/audio/impl/ffmpeg/PcmDecoder.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp index 035bf12e..b77290f9 100644 --- a/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp +++ b/src/libs/audio/impl/ffmpeg/PcmDecoder.cpp @@ -392,11 +392,18 @@ namespace lms::audio::ffmpeg for (std::size_t i{}; i < outputChannelBuffers.size(); ++i) outData[i] = static_cast(static_cast(outputChannelBuffers[i].data())); + std::array inData{}; + if (inputFrame) + { + for (int i{}; i < AV_NUM_DATA_POINTERS; ++i) + inData[i] = inputFrame->data[i]; + } + const int outSampleCount{ ::swr_convert( _resampleContext.get(), outData.data(), static_cast(maxSamplesPerChannel), - inputFrame ? reinterpret_cast(inputFrame->data) : nullptr, + inputFrame ? inData.data() : nullptr, inputFrame ? inputFrame->nb_samples : 0) }; if (outSampleCount < 0) From 0d6dbcc29159a7e5e4d317ec4797c6d17b230f48 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 14:25:28 +0200 Subject: [PATCH 28/38] Fixed bad label display --- src/lms/ui/Utils.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lms/ui/Utils.cpp b/src/lms/ui/Utils.cpp index 0b94f8f1..61ad0e8e 100644 --- a/src/lms/ui/Utils.cpp +++ b/src/lms/ui/Utils.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include "core/String.hpp" @@ -135,11 +136,15 @@ namespace lms::ui::utils std::unique_ptr createFilter(const Wt::WString& name, const Wt::WString& tooltip, std::string_view colorStyleClass, bool canDelete) { - auto res{ std::make_unique(Wt::WString{ canDelete ? " " : "" } + name, Wt::TextFormat::XHTML) }; - + auto res{ std::make_unique() }; + res->setInline(true); res->setStyleClass("Lms-badge-cluster badge me-1 " + std::string{ colorStyleClass }); // HACK res->setToolTip(tooltip, Wt::TextFormat::Plain); - res->setInline(true); + + if (canDelete) + res->addNew(" ", Wt::TextFormat::XHTML); + + res->addNew(name, Wt::TextFormat::Plain); return res; } From fd338dabc704d30d3c8b367e3cff33307829293b Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 16:25:41 +0200 Subject: [PATCH 29/38] Simplified artwork handling: create a brand new artwork when an image changed. Simplifies subsonic element retrievals --- src/libs/database/impl/objects/Artwork.cpp | 13 --- .../include/database/objects/Artwork.hpp | 3 - src/libs/database/test/Artwork.cpp | 24 ++---- .../impl/scanners/ImageFileScanner.cpp | 11 ++- src/libs/subsonic/CMakeLists.txt | 1 - src/libs/subsonic/impl/CoverArtId.cpp | 79 ------------------- src/libs/subsonic/impl/CoverArtId.hpp | 43 ---------- src/libs/subsonic/impl/SubsonicId.cpp | 18 +++++ src/libs/subsonic/impl/SubsonicId.hpp | 6 ++ .../impl/endpoints/MediaRetrieval.cpp | 5 +- src/libs/subsonic/impl/responses/Album.cpp | 9 +-- src/libs/subsonic/impl/responses/Artist.cpp | 9 +-- .../subsonic/impl/responses/DiscTitle.cpp | 10 +-- src/libs/subsonic/impl/responses/Playlist.cpp | 10 +-- src/libs/subsonic/impl/responses/Podcast.cpp | 16 +--- src/libs/subsonic/impl/responses/Song.cpp | 14 +--- 16 files changed, 56 insertions(+), 215 deletions(-) delete mode 100644 src/libs/subsonic/impl/CoverArtId.cpp delete mode 100644 src/libs/subsonic/impl/CoverArtId.hpp diff --git a/src/libs/database/impl/objects/Artwork.cpp b/src/libs/database/impl/objects/Artwork.cpp index 2dda27ee..34e4f61e 100644 --- a/src/libs/database/impl/objects/Artwork.cpp +++ b/src/libs/database/impl/objects/Artwork.cpp @@ -20,7 +20,6 @@ #include "database/objects/Artwork.hpp" #include -#include #include "database/Session.hpp" #include "database/objects/Image.hpp" @@ -92,18 +91,6 @@ namespace lms::db return res; } - Wt::WDateTime Artwork::getLastWrittenTime() const - { - auto query{ session()->query("SELECT MAX(COALESCE(image.file_last_write, track.file_last_write)) AS last_written_datetime FROM artwork") }; - query.leftJoin("image ON artwork.image_id = image.id"); - query.leftJoin("track_embedded_image ON artwork.track_embedded_image_id = track_embedded_image.id"); - query.leftJoin("track_embedded_image_link ON track_embedded_image.id = track_embedded_image_link.track_embedded_image_id"); - query.leftJoin("track ON track.id = track_embedded_image_link.track_id"); - query.where("artwork.id = ?").bind(getId()); - - return utils::fetchQuerySingleResult(query); - } - std::filesystem::path Artwork::getAbsoluteFilePath() const { auto query{ session()->query("SELECT COALESCE(image.absolute_file_path, track.absolute_file_path) AS absolute_file_path FROM artwork") }; diff --git a/src/libs/database/include/database/objects/Artwork.hpp b/src/libs/database/include/database/objects/Artwork.hpp index 284594f2..d05a1292 100644 --- a/src/libs/database/include/database/objects/Artwork.hpp +++ b/src/libs/database/include/database/objects/Artwork.hpp @@ -23,7 +23,6 @@ #include #include -#include #include "database/Object.hpp" #include "database/objects/ArtworkId.hpp" @@ -50,7 +49,6 @@ namespace lms::db // getters using UnderlyingId = std::variant; UnderlyingId getUnderlyingId() const; - Wt::WDateTime getLastWrittenTime() const; std::filesystem::path getAbsoluteFilePath() const; ObjectPtr getImage() const; ImageId getImageId() const; @@ -68,7 +66,6 @@ namespace lms::db Artwork(ObjectPtr image); static pointer create(Session& session, ObjectPtr trackEmbeddedImage); static pointer create(Session& session, ObjectPtr image); - Wt::Dbo::ptr _trackEmbeddedImage; Wt::Dbo::ptr _image; }; diff --git a/src/libs/database/test/Artwork.cpp b/src/libs/database/test/Artwork.cpp index 1a9306c5..25073524 100644 --- a/src/libs/database/test/Artwork.cpp +++ b/src/libs/database/test/Artwork.cpp @@ -36,24 +36,15 @@ namespace lms::db::tests } ScopedImage image{ session, "/MyImage" }; + { + auto transaction{ session.createWriteTransaction() }; + image.get().modify()->setAbsoluteFilePath("/tmp/foo"); + } ScopedArtwork artwork{ session, image.lockAndGet() }; - const Wt::WDateTime dateTime{ Wt::WDate{ 2025, 1, 1 } }; - { auto transaction{ session.createReadTransaction() }; EXPECT_EQ(Artwork::getCount(session), 1); - } - - { - auto transaction{ session.createWriteTransaction() }; - image.get().modify()->setLastWriteTime(dateTime); - image.get().modify()->setAbsoluteFilePath("/tmp/foo"); - } - - { - auto transaction{ session.createReadTransaction() }; - EXPECT_EQ(artwork.get()->getLastWrittenTime(), dateTime); EXPECT_EQ(artwork.get()->getAbsoluteFilePath(), "/tmp/foo"); } } @@ -67,20 +58,15 @@ namespace lms::db::tests ScopedTrackEmbeddedImage image{ session }; ScopedTrack track{ session }; - ScopedArtwork artwork{ session, image.lockAndGet() }; - - const Wt::WDateTime dateTime{ Wt::WDate{ 2025, 1, 1 } }; - { auto transaction{ session.createWriteTransaction() }; session.create(track.get(), image.get()); - track.get().modify()->setLastWriteTime(dateTime); track.get().modify()->setAbsoluteFilePath("/tmp/foo"); } + ScopedArtwork artwork{ session, image.lockAndGet() }; { auto transaction{ session.createReadTransaction() }; - EXPECT_EQ(artwork.get()->getLastWrittenTime(), dateTime); EXPECT_EQ(artwork.get()->getAbsoluteFilePath(), "/tmp/foo"); } } diff --git a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp index 166a43fd..cc5f3061 100644 --- a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp +++ b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp @@ -85,11 +85,20 @@ namespace lms::scanner } const bool added{ !image }; - if (!image) + if (added) { image = dbSession.create(getFilePath()); dbSession.create(image); } + else if (image->getLastWriteTime() != getLastWriteTime() + || image->getFileSize() != getFileSize() + || image->getHeight() != _parsedImageProperties->height + || image->getWidth() != _parsedImageProperties->width) + { + if (auto artwork{ db::Artwork::find(dbSession, image->getId()) }) + artwork.remove(); + dbSession.create(image); + } image.modify()->setLastWriteTime(getLastWriteTime()); image.modify()->setFileSize(getFileSize()); diff --git a/src/libs/subsonic/CMakeLists.txt b/src/libs/subsonic/CMakeLists.txt index 2fd1576d..c3c27e6e 100644 --- a/src/libs/subsonic/CMakeLists.txt +++ b/src/libs/subsonic/CMakeLists.txt @@ -34,7 +34,6 @@ add_library(lmssubsonic STATIC impl/responses/ReplayGain.cpp impl/responses/Song.cpp impl/responses/User.cpp - impl/CoverArtId.cpp impl/RequestContext.cpp impl/ResponseFormat.cpp impl/ProtocolVersion.cpp diff --git a/src/libs/subsonic/impl/CoverArtId.cpp b/src/libs/subsonic/impl/CoverArtId.cpp deleted file mode 100644 index 9f184a21..00000000 --- a/src/libs/subsonic/impl/CoverArtId.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (C) 2024 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 "CoverArtId.hpp" - -#include - -#include "core/String.hpp" -#include "database/objects/ArtworkId.hpp" - -namespace lms::api::subsonic -{ - namespace - { - constexpr char timestampSeparatorChar{ '-' }; - - std::string idToString(db::ArtworkId id) - { - return "art-" + id.toString(); - } - } // namespace - - std::string idToString(CoverArtId coverId) - { - std::string res; - - // produce "art-id-timestamp" - res = idToString(coverId.id); - res += timestampSeparatorChar; - res += std::to_string(coverId.timestamp); - - assert(!res.empty()); - return res; - } -} // namespace lms::api::subsonic - -// Used to parse parameters -namespace lms::core::stringUtils -{ - template<> - std::optional readAs(std::string_view str) - { - std::optional res; - - std::vector values{ core::stringUtils::splitString(str, '-') }; - - // expect "art-id-timestamp" - if (values.size() != 3) - return res; - - if (values[0] != "art") - return res; - - const auto value{ core::stringUtils::readAs(values[1]) }; - const auto timestamp{ core::stringUtils::readAs(values[2]) }; - if (!value || !timestamp) - return std::nullopt; - - res.emplace(api::subsonic::CoverArtId{ *value, *timestamp }); - - return res; - } -} // namespace lms::core::stringUtils diff --git a/src/libs/subsonic/impl/CoverArtId.hpp b/src/libs/subsonic/impl/CoverArtId.hpp deleted file mode 100644 index ec0c3ccb..00000000 --- a/src/libs/subsonic/impl/CoverArtId.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2024 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 "core/String.hpp" -#include "database/objects/ArtworkId.hpp" - -namespace lms::api::subsonic -{ - struct CoverArtId - { - db::ArtworkId id; - std::time_t timestamp; - }; - - std::string idToString(CoverArtId coverId); -} // namespace lms::api::subsonic - -// Used to parse parameters -namespace lms::core::stringUtils -{ - template<> - std::optional readAs(std::string_view str); -} // namespace lms::core::stringUtils diff --git a/src/libs/subsonic/impl/SubsonicId.cpp b/src/libs/subsonic/impl/SubsonicId.cpp index 11afc904..7226ccdf 100644 --- a/src/libs/subsonic/impl/SubsonicId.cpp +++ b/src/libs/subsonic/impl/SubsonicId.cpp @@ -26,6 +26,11 @@ namespace lms::api::subsonic return "ar-" + id.toString(); } + std::string idToString(db::ArtworkId id) + { + return "art-" + id.toString(); + } + std::string idToString(db::DirectoryId id) { return "dir-" + id.toString(); @@ -59,6 +64,19 @@ namespace lms::api::subsonic namespace lms::core::stringUtils { + template<> + std::optional readAs(std::string_view str) + { + std::vector values{ core::stringUtils::splitString(str, '-') }; + if (values.size() != 2 || values[0] != "art") + return std::nullopt; + + if (const auto value{ core::stringUtils::readAs(values[1]) }) + return db::ArtworkId{ *value }; + + return std::nullopt; + } + template<> std::optional readAs(std::string_view str) { diff --git a/src/libs/subsonic/impl/SubsonicId.hpp b/src/libs/subsonic/impl/SubsonicId.hpp index 4f1983e4..483c8eeb 100644 --- a/src/libs/subsonic/impl/SubsonicId.hpp +++ b/src/libs/subsonic/impl/SubsonicId.hpp @@ -20,7 +20,9 @@ #pragma once #include "core/String.hpp" + #include "database/objects/ArtistId.hpp" +#include "database/objects/ArtworkId.hpp" #include "database/objects/DirectoryId.hpp" #include "database/objects/MediaLibraryId.hpp" #include "database/objects/PodcastEpisodeId.hpp" @@ -32,6 +34,7 @@ namespace lms::api::subsonic { std::string idToString(db::ArtistId id); + std::string idToString(db::ArtworkId id); std::string idToString(db::DirectoryId id); std::string idToString(db::PodcastEpisodeId id); std::string idToString(db::PodcastId id); @@ -46,6 +49,9 @@ namespace lms::core::stringUtils template<> std::optional readAs(std::string_view str); + template<> + std::optional readAs(std::string_view str); + template<> std::optional readAs(std::string_view str); diff --git a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp index 954d2523..47446d26 100644 --- a/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp +++ b/src/libs/subsonic/impl/endpoints/MediaRetrieval.cpp @@ -39,7 +39,6 @@ #include "services/artwork/IArtworkService.hpp" #include "services/transcoding/ITranscodeService.hpp" -#include "CoverArtId.hpp" #include "ParameterParsing.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" @@ -359,13 +358,13 @@ namespace lms::api::subsonic void handleGetCoverArt(RequestContext& context, const Wt::Http::Request& /*request*/, Wt::Http::Response& response) { // Mandatory params - const CoverArtId coverArtId{ getMandatoryParameterAs(context.getParameters(), "id") }; + const db::ArtworkId artworkId{ getMandatoryParameterAs(context.getParameters(), "id") }; std::optional size{ getParameterAs(context.getParameters(), "size") }; if (size) *size = std::clamp(*size, std::size_t{ 32 }, std::size_t{ 2048 }); - std::shared_ptr image{ core::Service::get()->getImage(coverArtId.id, size) }; + std::shared_ptr image{ core::Service::get()->getImage(artworkId, size) }; if (!image) { response.setStatus(404); diff --git a/src/libs/subsonic/impl/responses/Album.cpp b/src/libs/subsonic/impl/responses/Album.cpp index e166266c..c76b8f7b 100644 --- a/src/libs/subsonic/impl/responses/Album.cpp +++ b/src/libs/subsonic/impl/responses/Album.cpp @@ -24,7 +24,6 @@ #include "core/String.hpp" #include "database/Types.hpp" #include "database/objects/Artist.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/Directory.hpp" #include "database/objects/Genre.hpp" #include "database/objects/Grouping.hpp" @@ -37,7 +36,6 @@ #include "services/feedback/IFeedbackService.hpp" #include "services/scrobbling/IScrobblingService.hpp" -#include "CoverArtId.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" #include "responses/Artist.hpp" @@ -91,11 +89,8 @@ namespace lms::api::subsonic albumNode.setAttribute("created", core::stringUtils::toISO8601String(release->getAddedTime())); - if (const auto artwork{ release->getPreferredArtwork() }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - albumNode.setAttribute("coverArt", idToString(coverArtId)); - } + if (const db::ArtworkId artworkId{ release->getPreferredArtworkId() }; artworkId.isValid()) + albumNode.setAttribute("coverArt", idToString(artworkId)); if (const auto originalYear{ release->getOriginalYear() }) albumNode.setAttribute("year", *originalYear); diff --git a/src/libs/subsonic/impl/responses/Artist.cpp b/src/libs/subsonic/impl/responses/Artist.cpp index 43283780..5dbd597b 100644 --- a/src/libs/subsonic/impl/responses/Artist.cpp +++ b/src/libs/subsonic/impl/responses/Artist.cpp @@ -24,14 +24,12 @@ #include "core/String.hpp" #include "database/objects/Artist.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/Release.hpp" #include "database/objects/ReleaseArtistLink.hpp" #include "database/objects/TrackArtistLink.hpp" #include "database/objects/User.hpp" #include "services/feedback/IFeedbackService.hpp" -#include "CoverArtId.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" @@ -69,11 +67,8 @@ namespace lms::api::subsonic Response::Node artistNode{ createMinimalArtistNode(artist) }; - if (const auto artwork{ artist->getPreferredArtwork() }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - artistNode.setAttribute("coverArt", idToString(coverArtId)); - } + if (const db::ArtworkId artworkId{ artist->getPreferredArtworkId() }; artworkId.isValid()) + artistNode.setAttribute("coverArt", idToString(artworkId)); bool hasAlbums{}; { diff --git a/src/libs/subsonic/impl/responses/DiscTitle.cpp b/src/libs/subsonic/impl/responses/DiscTitle.cpp index 355409c5..056155ae 100644 --- a/src/libs/subsonic/impl/responses/DiscTitle.cpp +++ b/src/libs/subsonic/impl/responses/DiscTitle.cpp @@ -19,10 +19,9 @@ #include "responses/DiscTitle.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/Medium.hpp" -#include "CoverArtId.hpp" +#include "SubsonicId.hpp" namespace lms::api::subsonic { @@ -32,11 +31,8 @@ namespace lms::api::subsonic discTitleNode.setAttribute("disc", medium->getPosition() ? *medium->getPosition() : 0); discTitleNode.setAttribute("title", medium->getName()); - if (const auto artwork{ medium->getPreferredArtwork() }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - discTitleNode.setAttribute("coverArt", idToString(coverArtId)); - } + if (const db::ArtworkId artworkId{ medium->getPreferredArtworkId() }; artworkId.isValid()) + discTitleNode.setAttribute("coverArt", idToString(artworkId)); return discTitleNode; } diff --git a/src/libs/subsonic/impl/responses/Playlist.cpp b/src/libs/subsonic/impl/responses/Playlist.cpp index 9e4c6871..b56dd31d 100644 --- a/src/libs/subsonic/impl/responses/Playlist.cpp +++ b/src/libs/subsonic/impl/responses/Playlist.cpp @@ -21,12 +21,10 @@ #include "core/Service.hpp" #include "core/String.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/TrackList.hpp" #include "database/objects/User.hpp" #include "services/artwork/IArtworkService.hpp" -#include "CoverArtId.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" @@ -49,13 +47,7 @@ namespace lms::api::subsonic playlistNode.setAttribute("owner", trackListUser->getLoginName()); if (const db::ArtworkId artworkId{ core::Service::get()->findTrackListImage(tracklist->getId()) }; artworkId.isValid()) - { - if (const auto artwork{ db::Artwork::find(context.getDbSession(), artworkId) }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - playlistNode.setAttribute("coverArt", idToString(coverArtId)); - } - } + playlistNode.setAttribute("coverArt", idToString(artworkId)); if (context.isOpenSubsonicEnabled()) { diff --git a/src/libs/subsonic/impl/responses/Podcast.cpp b/src/libs/subsonic/impl/responses/Podcast.cpp index 4f89d1f0..5862edab 100644 --- a/src/libs/subsonic/impl/responses/Podcast.cpp +++ b/src/libs/subsonic/impl/responses/Podcast.cpp @@ -24,11 +24,9 @@ #include #include "core/String.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/Podcast.hpp" #include "database/objects/PodcastEpisode.hpp" -#include "CoverArtId.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" @@ -69,11 +67,8 @@ namespace lms::api::subsonic // estimated bitrate if (episode->getEnclosureLength() > 0 && episode->getDuration() > std::chrono::milliseconds::zero()) episodeNode.setAttribute("bitrate", episode->getEnclosureLength() * 8 / std::chrono::duration_cast(episode->getDuration()).count()); - if (const auto artwork{ episode->getArtwork() }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - episodeNode.setAttribute("coverArt", idToString(coverArtId)); - } + if (const db::ArtworkId artworkId{ episode->getArtworkId() }; artworkId.isValid()) + episodeNode.setAttribute("coverArt", idToString(artworkId)); // Podcast specific attributes // Expose the streamId only if the episode is actually downloaded @@ -111,11 +106,8 @@ namespace lms::api::subsonic podcastNode.setAttribute("status", getStatus(podcast)); - if (const auto artwork{ podcast->getArtwork() }) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - podcastNode.setAttribute("coverArt", idToString(coverArtId)); - } + if (const db::ArtworkId artworkId{ podcast->getArtworkId() }; artworkId.isValid()) + podcastNode.setAttribute("coverArt", idToString(artworkId)); if (includeEpisodes) { diff --git a/src/libs/subsonic/impl/responses/Song.cpp b/src/libs/subsonic/impl/responses/Song.cpp index 7c36bc15..5289a7fc 100644 --- a/src/libs/subsonic/impl/responses/Song.cpp +++ b/src/libs/subsonic/impl/responses/Song.cpp @@ -30,7 +30,6 @@ #include "database/Types.hpp" #include "database/objects/Artist.hpp" -#include "database/objects/Artwork.hpp" #include "database/objects/Directory.hpp" #include "database/objects/Genre.hpp" #include "database/objects/Grouping.hpp" @@ -45,7 +44,6 @@ #include "services/feedback/IFeedbackService.hpp" #include "services/scrobbling/IScrobblingService.hpp" -#include "CoverArtId.hpp" #include "RequestContext.hpp" #include "SubsonicId.hpp" #include "responses/Artist.hpp" @@ -124,15 +122,9 @@ namespace lms::api::subsonic trackResponse.setAttribute("transcodedContentType", core::getMimeType(std::filesystem::path{ "." + fileSuffix })); } - auto artwork{ track->getPreferredMediaArtwork() }; - if (!artwork) - artwork = track->getPreferredArtwork(); - - if (artwork) - { - CoverArtId coverArtId{ artwork->getId(), artwork->getLastWrittenTime().toTime_t() }; - trackResponse.setAttribute("coverArt", idToString(coverArtId)); - } + const db::ArtworkId artworkId{ track->getPreferredMediaArtworkId().isValid() ? track->getPreferredMediaArtworkId() : track->getPreferredArtworkId() }; + if (artworkId.isValid()) + trackResponse.setAttribute("coverArt", idToString(artworkId)); std::vector artistLinks; std::vector trackArtistLinks; From 75c3b302cedbb63ac1940bbe5e449093030449fe Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 16:32:47 +0200 Subject: [PATCH 30/38] Fixed warning --- .../recommendation/test/ConstraintsTest.cpp | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/libs/services/recommendation/test/ConstraintsTest.cpp b/src/libs/services/recommendation/test/ConstraintsTest.cpp index f9fc7b38..5356eeb3 100644 --- a/src/libs/services/recommendation/test/ConstraintsTest.cpp +++ b/src/libs/services/recommendation/test/ConstraintsTest.cpp @@ -77,8 +77,8 @@ namespace lms::recommendation::tests TEST(SameArtistConstraint, zeroScoreWhenNoSharedArtist) { const TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, + { T1, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, + { T2, { .releaseId = {}, .artistIds = { A2 }, .recordingMBID = {} } }, }; const SameArtistConstraint constraint{ meta }; const std::vector selected{ T2 }; @@ -89,8 +89,8 @@ namespace lms::recommendation::tests TEST(SameArtistConstraint, fullScoreWhenMostRecentMatchesArtist) { TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A1 } } }, + { T1, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, + { T2, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, }; const SameArtistConstraint constraint{ meta }; const std::vector selected{ T2 }; @@ -102,9 +102,9 @@ namespace lms::recommendation::tests TEST(SameArtistConstraint, halfScoreWhenSecondMostRecentMatchesArtist) { TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, - { T3, { .releaseId = {}, .artistIds = { A1 } } }, + { T1, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, + { T2, { .releaseId = {}, .artistIds = { A2 }, .recordingMBID = {} } }, + { T3, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, }; const SameArtistConstraint constraint{ meta }; @@ -117,9 +117,9 @@ namespace lms::recommendation::tests TEST(SameArtistConstraint, trackOutsideWindowIsIgnored) { TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = { A1 } } }, - { T2, { .releaseId = {}, .artistIds = { A2 } } }, - { T3, { .releaseId = {}, .artistIds = { A1 } } }, + { T1, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, + { T2, { .releaseId = {}, .artistIds = { A2 }, .recordingMBID = {} } }, + { T3, { .releaseId = {}, .artistIds = { A1 }, .recordingMBID = {} } }, }; const SameArtistConstraint constraint{ meta, /*window=*/1 }; @@ -140,8 +140,8 @@ namespace lms::recommendation::tests TEST(SameReleaseConstraint, zeroScoreWhenNoSharedRelease) { TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R2, .artistIds = {} } }, + { T1, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, + { T2, { .releaseId = R2, .artistIds = {}, .recordingMBID = {} } }, }; const SameReleaseConstraint constraint{ meta }; const std::vector selected{ T2 }; @@ -152,8 +152,8 @@ namespace lms::recommendation::tests TEST(SameReleaseConstraint, fullScoreWhenMostRecentMatchesRelease) { TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, + { T1, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, + { T2, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, }; const SameReleaseConstraint constraint{ meta }; const std::vector selected{ T2 }; @@ -164,8 +164,8 @@ namespace lms::recommendation::tests TEST(SameReleaseConstraint, zeroScoreWhenCandidateHasNoRelease) { TrackMetadataMap meta{ - { T1, { .releaseId = {}, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, + { T1, { .releaseId = {}, .artistIds = {}, .recordingMBID = {} } }, + { T2, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, }; const SameReleaseConstraint constraint{ meta }; const std::vector selected{ T2 }; @@ -193,8 +193,8 @@ namespace lms::recommendation::tests TEST(TrackCandidateEvaluator, softConstraintScoreIsWeighted) { TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, + { T1, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, + { T2, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, }; TrackCandidateEvaluator evaluator; evaluator.addSoftConstraint(std::make_unique(meta), 2.F); @@ -208,8 +208,8 @@ namespace lms::recommendation::tests TEST(TrackCandidateEvaluator, multipleSoftConstraintsAreAccumulated) { TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = { A1 } } }, - { T2, { .releaseId = R1, .artistIds = { A1 } } }, + { T1, { .releaseId = R1, .artistIds = { A1 }, .recordingMBID = {} } }, + { T2, { .releaseId = R1, .artistIds = { A1 }, .recordingMBID = {} } }, }; TrackCandidateEvaluator evaluator; evaluator.addSoftConstraint(std::make_unique(meta), 1.F); @@ -224,8 +224,8 @@ namespace lms::recommendation::tests TEST(TrackCandidateEvaluator, hardConstraintPassesEvenWithSoftConstraints) { TrackMetadataMap meta{ - { T1, { .releaseId = R1, .artistIds = {} } }, - { T2, { .releaseId = R1, .artistIds = {} } }, + { T1, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, + { T2, { .releaseId = R1, .artistIds = {}, .recordingMBID = {} } }, }; TrackCandidateEvaluator evaluator; evaluator.addHardConstraint(std::make_unique()); From d25233f7cc122a2363cf550bd557fd092c5aa880 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 16:33:03 +0200 Subject: [PATCH 31/38] Fixed blob warning --- .../scrobbling/impl/lastfm/LastFmBackend.cpp | 18 ++++----- .../impl/lastfm/ScrobblingsSynchronizer.cpp | 14 +++---- .../services/scrobbling/impl/lastfm/Utils.cpp | 6 +-- .../services/scrobbling/impl/lastfm/Utils.hpp | 2 +- .../impl/listenbrainz/ListenBrainzBackend.cpp | 6 +-- .../impl/listenbrainz/ListensParser.cpp | 8 ++-- .../impl/listenbrainz/ListensSynchronizer.cpp | 40 +++++++++---------- .../scrobbling/impl/listenbrainz/Utils.cpp | 4 +- .../scrobbling/impl/listenbrainz/Utils.hpp | 2 +- 9 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp index 665ffaa8..b9a9ee24 100644 --- a/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp +++ b/src/libs/services/scrobbling/impl/lastfm/LastFmBackend.cpp @@ -45,7 +45,7 @@ namespace lms::scrobbling::lastFm const bool res{ track->getDuration() >= std::chrono::seconds{ 30 } && (playedDuration >= std::chrono::minutes{ 4 } || playedDuration >= track->getDuration() / 2) }; if (!res) - LOG(DEBUG, "Track cannot be scrobbled: played duration too short (" << playedDuration.count() << "s, total = " << std::chrono::duration_cast(track->getDuration()).count() << "s)"); + LMS_LOG_LASTFM(DEBUG, "Track cannot be scrobbled: played duration too short (" << playedDuration.count() << "s, total = " << std::chrono::duration_cast(track->getDuration()).count() << "s)"); return res; } @@ -57,12 +57,12 @@ namespace lms::scrobbling::lastFm , _client{ core::http::createClient(ioContext, core::Service::get()->getString("lastfm-api-base-url", "https://ws.audioscrobbler.com")) } , _synchronizer{ ioContext, db, *_client } { - LOG(INFO, "Starting Last.fm backend"); + LMS_LOG_LASTFM(INFO, "Starting Last.fm backend"); } LastFmBackend::~LastFmBackend() { - LOG(INFO, "Stopped Last.fm backend"); + LMS_LOG_LASTFM(INFO, "Stopped Last.fm backend"); } void LastFmBackend::listenStarted(const Listen& listen) @@ -106,7 +106,7 @@ namespace lms::scrobbling::lastFm const std::string token{ utils::parseAuthToken(msg.body()) }; if (token.empty()) { - LOG(WARNING, "auth.getToken: failed to parse token"); + LMS_LOG_LASTFM(WARNING, "auth.getToken: failed to parse token"); onFailure(); return; } @@ -120,7 +120,7 @@ namespace lms::scrobbling::lastFm onSuccess(authUrl); }; request.onFailureFunc = [onFailure = std::move(onFailure)] { - LOG(WARNING, "auth.getToken: HTTP request failed"); + LMS_LOG_LASTFM(WARNING, "auth.getToken: HTTP request failed"); onFailure(); }; _client->sendGETRequest(std::move(request)); @@ -136,7 +136,7 @@ namespace lms::scrobbling::lastFm auto it{ _pendingAuths.find(userId) }; if (it == _pendingAuths.end()) { - LOG(WARNING, "continueLastFmLink: no pending auth for user"); + LMS_LOG_LASTFM(WARNING, "continueLastFmLink: no pending auth for user"); onFailure(); return; } @@ -157,7 +157,7 @@ namespace lms::scrobbling::lastFm const std::string sessionKey{ utils::parseSessionKey(msg.body()) }; if (sessionKey.empty()) { - LOG(WARNING, "auth.getSession: failed to parse session key"); + LMS_LOG_LASTFM(WARNING, "auth.getSession: failed to parse session key"); onFailure(); return; } @@ -178,11 +178,11 @@ namespace lms::scrobbling::lastFm _pendingAuths.erase(userId); } - LOG(INFO, "Last.fm account linked for user " << userId.toString()); + LMS_LOG_LASTFM(INFO, "Last.fm account linked for user " << userId.toString()); onSuccess(); }; request.onFailureFunc = [onFailure = std::move(onFailure)] { - LOG(WARNING, "auth.getSession: HTTP request failed"); + LMS_LOG_LASTFM(WARNING, "auth.getSession: HTTP request failed"); onFailure(); }; diff --git a/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp index e13d7060..07e7751c 100644 --- a/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/lastfm/ScrobblingsSynchronizer.cpp @@ -62,7 +62,7 @@ namespace lms::scrobbling::lastFm const std::string artistName{ track->getArtistDisplayName() }; if (artistName.empty()) { - LOG(DEBUG, "Track '" << track->getAbsoluteFilePath() << "' cannot be scrobbled: no artist name"); + LMS_LOG_LASTFM(DEBUG, "Track '" << track->getAbsoluteFilePath() << "' cannot be scrobbled: no artist name"); return std::nullopt; } @@ -118,7 +118,7 @@ namespace lms::scrobbling::lastFm , _submitPeriod{ core::Service::get()->getULong("lastfm-submit-period-hours", 1) } , _client{ client } { - LOG(INFO, "Starting Last.fm scrobblings synchronizer, submit period = " << _submitPeriod.count() << " hours"); + LMS_LOG_LASTFM(INFO, "Starting Last.fm scrobblings synchronizer, submit period = " << _submitPeriod.count() << " hours"); if (_submitPeriod.count() > 0) scheduleSubmit(std::chrono::seconds{ 30 }); } @@ -141,14 +141,14 @@ namespace lms::scrobbling::lastFm const utils::LastFmCredentials creds{ utils::getLastFmCredentials(_db.getTLSSession(), listen.userId) }; if (creds.apiKey.empty() || creds.apiSecret.empty() || creds.sessionKey.empty()) { - LOG(DEBUG, "Missing Last.fm credentials for user, skipping"); + LMS_LOG_LASTFM(DEBUG, "Missing Last.fm credentials for user, skipping"); return; } const std::optional info{ getTrackInfo(_db.getTLSSession(), listen) }; if (!info) { - LOG(DEBUG, "Cannot build scrobble params: skipping"); + LMS_LOG_LASTFM(DEBUG, "Cannot build scrobble params: skipping"); return; } @@ -244,7 +244,7 @@ namespace lms::scrobbling::lastFm const utils::LastFmCredentials creds{ utils::getLastFmCredentials(_db.getTLSSession(), userId) }; if (creds.apiKey.empty() || creds.apiSecret.empty() || creds.sessionKey.empty()) { - LOG(DEBUG, "Missing Last.fm credentials for user, skipping"); + LMS_LOG_LASTFM(DEBUG, "Missing Last.fm credentials for user, skipping"); continue; } @@ -280,7 +280,7 @@ namespace lms::scrobbling::lastFm if (validListens.empty()) return; - LOG(DEBUG, "Sending scrobble batch of " << validListens.size() << " listens"); + LMS_LOG_LASTFM(DEBUG, "Sending scrobble batch of " << validListens.size() << " listens"); params["api_key"] = creds.apiKey; params["sk"] = creds.sessionKey; @@ -304,7 +304,7 @@ namespace lms::scrobbling::lastFm void ScrobblingsSynchronizer::scheduleSubmit(std::chrono::seconds fromNow) { - LOG(DEBUG, "Scheduled pending retry in " << fromNow.count() << " seconds"); + LMS_LOG_LASTFM(DEBUG, "Scheduled pending retry in " << fromNow.count() << " seconds"); _submitTimer.expires_after(fromNow); _submitTimer.async_wait(boost::asio::bind_executor(_strand, [this](const boost::system::error_code& ec) { if (ec == boost::asio::error::operation_aborted) diff --git a/src/libs/services/scrobbling/impl/lastfm/Utils.cpp b/src/libs/services/scrobbling/impl/lastfm/Utils.cpp index 746e7bb6..d425d26e 100644 --- a/src/libs/services/scrobbling/impl/lastfm/Utils.cpp +++ b/src/libs/services/scrobbling/impl/lastfm/Utils.cpp @@ -93,7 +93,7 @@ namespace lms::scrobbling::lastFm::utils Wt::Json::Object root; if (!Wt::Json::parse(std::string{ msgBody }, root, error)) { - LOG(ERROR, "Cannot parse auth.getToken response: " << error.what()); + LMS_LOG_LASTFM(ERROR, "Cannot parse auth.getToken response: " << error.what()); return {}; } @@ -106,7 +106,7 @@ namespace lms::scrobbling::lastFm::utils Wt::Json::Object root; if (!Wt::Json::parse(std::string{ msgBody }, root, error)) { - LOG(ERROR, "Cannot parse auth.getSession response: " << error.what()); + LMS_LOG_LASTFM(ERROR, "Cannot parse auth.getSession response: " << error.what()); return {}; } @@ -117,7 +117,7 @@ namespace lms::scrobbling::lastFm::utils } catch (const Wt::WException& e) { - LOG(ERROR, "Cannot extract session key: " << e.what()); + LMS_LOG_LASTFM(ERROR, "Cannot extract session key: " << e.what()); return {}; } } diff --git a/src/libs/services/scrobbling/impl/lastfm/Utils.hpp b/src/libs/services/scrobbling/impl/lastfm/Utils.hpp index 29eeca7d..d8146c91 100644 --- a/src/libs/services/scrobbling/impl/lastfm/Utils.hpp +++ b/src/libs/services/scrobbling/impl/lastfm/Utils.hpp @@ -27,7 +27,7 @@ #include "database/objects/UserId.hpp" -#define LOG(sev, message) LMS_LOG(SCROBBLING, sev, "[lastfm] " << message) +#define LMS_LOG_LASTFM(sev, message) LMS_LOG(SCROBBLING, sev, "[lastfm] " << message) namespace lms::db { diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp index f241f01e..b91171e9 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListenBrainzBackend.cpp @@ -45,7 +45,7 @@ namespace lms::scrobbling::listenBrainz const bool res{ duration >= std::chrono::minutes(4) || (duration >= track->getDuration() / 2) }; if (!res) - LOG(DEBUG, "Track cannot be scrobbled since played duration is too short: " << duration.count() << "s, total duration = " << std::chrono::duration_cast(track->getDuration()).count() << "s"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Track cannot be scrobbled since played duration is too short: " << duration.count() << "s, total duration = " << std::chrono::duration_cast(track->getDuration()).count() << "s"); return res; } @@ -58,12 +58,12 @@ namespace lms::scrobbling::listenBrainz , _client{ core::http::createClient(_ioContext, _baseAPIUrl) } , _listensSynchronizer{ _ioContext, db, *_client } { - LOG(INFO, "Starting ListenBrainz backend... API endpoint = '" << _baseAPIUrl << "'"); + LMS_LOG_LISTENBRAINZ(INFO, "Starting ListenBrainz backend... API endpoint = '" << _baseAPIUrl << "'"); } ListenBrainzBackend::~ListenBrainzBackend() { - LOG(INFO, "Stopped ListenBrainz backend!"); + LMS_LOG_LISTENBRAINZ(INFO, "Stopped ListenBrainz backend!"); } void ListenBrainzBackend::listenStarted(const Listen& listen) diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensParser.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensParser.cpp index 7701a96d..2a82a365 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListensParser.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensParser.cpp @@ -46,7 +46,7 @@ namespace lms::scrobbling::listenBrainz if (listenObject.type("listened_at") == Wt::Json::Type::Number) listen.listenedAt = Wt::WDateTime::fromTime_t(static_cast(listenObject.get("listened_at"))); if (!listen.listenedAt.isValid()) - LOG(ERROR, "Invalid or missing 'listened_at' field!"); + LMS_LOG_LISTENBRAINZ(ERROR, "Invalid or missing 'listened_at' field!"); if (metadata.type("additional_info") == Wt::Json::Type::Object) { @@ -77,7 +77,7 @@ namespace lms::scrobbling::listenBrainz const Wt::Json::Object& payload = root.get("payload"); const Wt::Json::Array& listens = payload.get("listens"); - LOG(DEBUG, "Parsing " << listens.size() << " listens..."); + LMS_LOG_LISTENBRAINZ(DEBUG, "Parsing " << listens.size() << " listens..."); result.listenCount = listens.size(); if (listens.empty()) @@ -92,13 +92,13 @@ namespace lms::scrobbling::listenBrainz } catch (const Wt::WException& error) { - LOG(ERROR, "Cannot parse 'listen': " << error.what()); + LMS_LOG_LISTENBRAINZ(ERROR, "Cannot parse 'listen': " << error.what()); } } } catch (const Wt::WException& error) { - LOG(ERROR, "Cannot parse 'listens': " << error.what()); + LMS_LOG_LISTENBRAINZ(ERROR, "Cannot parse 'listens': " << error.what()); } return result; diff --git a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp index ac271a80..9c20ddeb 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp @@ -79,7 +79,7 @@ namespace lms::scrobbling::listenBrainz const std::vector artists{ getTrackArtists(track) }; if (artists.empty()) { - LOG(DEBUG, "Track cannot be scrobbled since it does not have any artist"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Track cannot be scrobbled since it does not have any artist"); return std::nullopt; } @@ -158,7 +158,7 @@ namespace lms::scrobbling::listenBrainz } catch (const Wt::WException& e) { - LOG(ERROR, "Cannot parse listen count response: " << e.what()); + LMS_LOG_LISTENBRAINZ(ERROR, "Cannot parse listen count response: " << e.what()); return std::nullopt; } } @@ -176,12 +176,12 @@ namespace lms::scrobbling::listenBrainz // if duplicated files, do not record it (let the user correct its database) if (tracks.size() == 1) { - LOG(DEBUG, "Matched listen '" << listen << "' using track MBID"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Matched listen '" << listen << "' using track MBID"); return tracks.front()->getId(); } else if (tracks.size() > 1) { - LOG(DEBUG, "Too many matches for listen '" << listen << "' using track MBID!"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Too many matches for listen '" << listen << "' using track MBID!"); return {}; } } @@ -192,12 +192,12 @@ namespace lms::scrobbling::listenBrainz // if duplicated files, do not record it (let the user correct its database) if (tracks.size() == 1) { - LOG(DEBUG, "Matched listen '" << listen << "' using recording MBID"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Matched listen '" << listen << "' using recording MBID"); return tracks.front()->getId(); } else if (tracks.size() > 1) { - LOG(DEBUG, "Too many matches for listen '" << listen << "' using recording MBID!"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Too many matches for listen '" << listen << "' using recording MBID!"); return {}; } } @@ -216,16 +216,16 @@ namespace lms::scrobbling::listenBrainz // conservative behavior: in case of multiple matches: reject if (tracks.results.size() == 1) { - LOG(DEBUG, "Matched listen '" << listen << "' using metadata"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Matched listen '" << listen << "' using metadata"); return tracks.results.front(); } else if (tracks.results.size() > 1) { - LOG(DEBUG, "Too many matches for listen '" << listen << "' using metadata"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Too many matches for listen '" << listen << "' using metadata"); return {}; } - LOG(DEBUG, "No match for listen '" << listen << "'"); + LMS_LOG_LISTENBRAINZ(DEBUG, "No match for listen '" << listen << "'"); return {}; } } // namespace @@ -237,7 +237,7 @@ namespace lms::scrobbling::listenBrainz , _maxSyncListenCount{ core::Service::get()->getULong("listenbrainz-max-sync-listen-count", 1000) } , _syncListensPeriod{ core::Service::get()->getULong("listenbrainz-sync-listens-period-hours", 1) } { - LOG(INFO, "Starting Listens synchronizer, maxSyncListenCount = " << _maxSyncListenCount << ", _syncListensPeriod = " << _syncListensPeriod.count() << " hours"); + LMS_LOG_LISTENBRAINZ(INFO, "Starting Listens synchronizer, maxSyncListenCount = " << _maxSyncListenCount << ", _syncListensPeriod = " << _syncListensPeriod.count() << " hours"); scheduleSync(std::chrono::seconds{ 30 }); } @@ -287,14 +287,14 @@ namespace lms::scrobbling::listenBrainz std::string bodyText{ listenToJsonString(_db.getTLSSession(), listen, timePoint, timePoint.isValid() ? "single" : "playing_now") }; if (bodyText.empty()) { - LOG(DEBUG, "Cannot convert listen to json: skipping"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Cannot convert listen to json: skipping"); return; } const std::string listenBrainzToken{ utils::getListenBrainzToken(_db.getTLSSession(), listen.userId) }; if (listenBrainzToken.empty()) { - LOG(DEBUG, "No listenbrainz token found: skipping"); + LMS_LOG_LISTENBRAINZ(DEBUG, "No listenbrainz token found: skipping"); return; } @@ -323,7 +323,7 @@ namespace lms::scrobbling::listenBrainz dbListen = session.create(user, track, db::ScrobblingBackend::ListenBrainz, listen.listenedAt); dbListen.modify()->setSyncState(scrobblingState); - LOG(DEBUG, "LISTEN CREATED for user " << user->getLoginName() << ", track '" << track->getName() << "' AT " << listen.listenedAt.toString()); + LMS_LOG_LISTENBRAINZ(DEBUG, "LISTEN CREATED for user " << user->getLoginName() << ", track '" << track->getName() << "' AT " << listen.listenedAt.toString()); return true; } @@ -365,7 +365,7 @@ namespace lms::scrobbling::listenBrainz } } - LOG(DEBUG, "Queing " << pendingListens.size() << " pending listen"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Queing " << pendingListens.size() << " pending listen"); for (const TimedListen& pendingListen : pendingListens) enqueListen(pendingListen); @@ -396,12 +396,12 @@ namespace lms::scrobbling::listenBrainz if (_syncListensPeriod.count() == 0 || _maxSyncListenCount == 0) return; - LOG(DEBUG, "Scheduled sync in " << fromNow.count() << " seconds..."); + LMS_LOG_LISTENBRAINZ(DEBUG, "Scheduled sync in " << fromNow.count() << " seconds..."); _syncTimer.expires_after(fromNow); _syncTimer.async_wait(boost::asio::bind_executor(_strand, [this](const boost::system::error_code& ec) { if (ec == boost::asio::error::operation_aborted) { - LOG(DEBUG, "getListens aborted"); + LMS_LOG_LISTENBRAINZ(DEBUG, "getListens aborted"); return; } else if (ec) @@ -415,7 +415,7 @@ namespace lms::scrobbling::listenBrainz void ListensSynchronizer::startSync() { - LOG(DEBUG, "Starting sync!"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Starting sync!"); assert(!isSyncing()); @@ -450,7 +450,7 @@ namespace lms::scrobbling::listenBrainz void ListensSynchronizer::onSyncEnded(UserContext& context) { boost::asio::post(boost::asio::bind_executor(_strand, [this, &context] { - LOG(INFO, "Sync done for user '" << context.listenBrainzUserName << "', fetched: " << context.fetchedListenCount << ", matched: " << context.matchedListenCount << ", imported: " << context.importedListenCount); + LMS_LOG_LISTENBRAINZ(INFO, "Sync done for user '" << context.listenBrainzUserName << "', fetched: " << context.fetchedListenCount << ", matched: " << context.matchedListenCount << ", imported: " << context.importedListenCount); context.syncing = false; if (!isSyncing()) @@ -500,7 +500,7 @@ namespace lms::scrobbling::listenBrainz const auto listenCount{ parseListenCount(msg.body()) }; boost::asio::post(boost::asio::bind_executor(_strand, [this, listenCount, &context] { if (listenCount) - LOG(DEBUG, "Listen count for listenbrainz user '" << context.listenBrainzUserName << "' = " << *listenCount); + LMS_LOG_LISTENBRAINZ(DEBUG, "Listen count for listenbrainz user '" << context.listenBrainzUserName << "' = " << *listenCount); bool needSync{ listenCount && (!context.listenCount || *context.listenCount != *listenCount) }; context.listenCount = listenCount; @@ -559,7 +559,7 @@ namespace lms::scrobbling::listenBrainz // update oldest listen for the next query if (!parsedListen.listenedAt.isValid()) { - LOG(DEBUG, "Skipping entry due to invalid listenedAt"); + LMS_LOG_LISTENBRAINZ(DEBUG, "Skipping entry due to invalid listenedAt"); continue; } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp index 7a33db20..bf4e489a 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.cpp @@ -49,13 +49,13 @@ namespace lms::scrobbling::listenBrainz::utils Wt::Json::Object root; if (!Wt::Json::parse(std::string{ msgBody }, root, error)) { - LOG(ERROR, "Cannot parse 'validate-token' result: " << error.what()); + LMS_LOG_LISTENBRAINZ(ERROR, "Cannot parse 'validate-token' result: " << error.what()); return listenBrainzUserName; } if (!root.get("valid").orIfNull(false)) { - LOG(INFO, "Invalid listenbrainz user"); + LMS_LOG_LISTENBRAINZ(INFO, "Invalid listenbrainz user"); return listenBrainzUserName; } diff --git a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp index 816f7e80..e9c412d8 100644 --- a/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp +++ b/src/libs/services/scrobbling/impl/listenbrainz/Utils.hpp @@ -23,7 +23,7 @@ #include "database/objects/UserId.hpp" -#define LOG(sev, message) LMS_LOG(SCROBBLING, sev, "[listenbrainz] " << message) +#define LMS_LOG_LISTENBRAINZ(sev, message) LMS_LOG(SCROBBLING, sev, "[listenbrainz] " << message) namespace lms::db { From 8efedc7c1e6d1efc1f399b969654764a8783ff82 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 16:49:16 +0200 Subject: [PATCH 32/38] Bumped versions --- Dockerfile-release | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile-release b/Dockerfile-release index ae2ef07e..f5fa9235 100644 --- a/Dockerfile-release +++ b/Dockerfile-release @@ -1,4 +1,4 @@ -FROM alpine:3.23 AS build +FROM alpine:3.24 AS build WORKDIR /tmp/workdir @@ -81,7 +81,7 @@ RUN \ make -j$(nproc) install # WT -ARG WT_VERSION=4.13.2 +ARG WT_VERSION=4.13.3 ARG WT_DEBUG=OFF RUN \ DIR=/tmp/wt && mkdir -p ${DIR} && cd ${DIR} && \ @@ -147,7 +147,7 @@ RUN \ rm -rf /tmp/fakeroot/share/Wt/resources/themes ## Release Stage -FROM alpine:3.23 AS release +FROM alpine:3.24 AS release LABEL maintainer="Emeric Poupon " ARG RUNTIME_PACKAGES=" \ From 0cabfa0d04fe24782756b683f5967d40ac705e7f Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 16:49:40 +0200 Subject: [PATCH 33/38] Bumped version --- Dockerfile-build-alpine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-build-alpine b/Dockerfile-build-alpine index 14f06a52..29930e9b 100644 --- a/Dockerfile-build-alpine +++ b/Dockerfile-build-alpine @@ -1,5 +1,5 @@ FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx -FROM --platform=$BUILDPLATFORM alpine:3.23 +FROM --platform=$BUILDPLATFORM alpine:3.24 ARG BUILD_PACKAGES="\ clang \ From 95eb1f00bca268353852c9ce9e40e4e3d3492bf8 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 17:00:36 +0200 Subject: [PATCH 34/38] Log mmap size used by sqlite3 --- src/libs/database/impl/Db.cpp | 28 ++++++++++++++++++++++++++++ src/libs/database/impl/Db.hpp | 1 + 2 files changed, 29 insertions(+) diff --git a/src/libs/database/impl/Db.cpp b/src/libs/database/impl/Db.cpp index 550f6d4a..6d242777 100644 --- a/src/libs/database/impl/Db.cpp +++ b/src/libs/database/impl/Db.cpp @@ -170,6 +170,24 @@ namespace lms::db return res; } + std::optional getMmapSize(Wt::Dbo::SqlConnection& connection) + { + auto statement = connection.prepareStatement("PRAGMA mmap_size"); + statement->execute(); + + std::optional res; + while (statement->nextRow()) + { + assert(!res); + long long value{}; + if (statement->getResult(0, &value)) + res = value; + break; + } + + return res; + } + void getCompileOptions(Wt::Dbo::SqlConnection& connection, std::function callback) { auto statement = connection.prepareStatement("PRAGMA compile_options"); @@ -217,6 +235,7 @@ namespace lms::db logPageSize(); logCacheSize(); + logMmapSize(); logCompileOptions(); if (checkType == "quick") { @@ -278,6 +297,15 @@ namespace lms::db LMS_LOG(DB, INFO, "Cache size set to " << *cacheSize); } + void Db::logMmapSize() + { + ScopedConnection connection{ *_connectionPool }; + const std::optional mmapSize{ getMmapSize(*connection) }; + + if (mmapSize) + LMS_LOG(DB, INFO, "Mmap size set to " << *mmapSize); + } + void Db::logCompileOptions() { ScopedConnection connection{ *_connectionPool }; diff --git a/src/libs/database/impl/Db.hpp b/src/libs/database/impl/Db.hpp index 63890021..5b5c1845 100644 --- a/src/libs/database/impl/Db.hpp +++ b/src/libs/database/impl/Db.hpp @@ -51,6 +51,7 @@ namespace lms::db void logPageSize(); void logCacheSize(); + void logMmapSize(); void logCompileOptions(); void performQuickCheck(); void performIntegrityCheck(); From 8b8e3cc99c031d830f178d415bd0478cf25383b3 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 21 Jun 2026 20:33:21 +0200 Subject: [PATCH 35/38] Enabled some scan settings by default for new installs --- src/libs/database/impl/objects/ScanSettings.cpp | 4 ++-- .../include/database/objects/ScanSettings.hpp | 12 ++++++------ src/libs/services/scanner/impl/ScannerService.cpp | 2 +- src/lms/ui/admin/ScanSettingsView.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libs/database/impl/objects/ScanSettings.cpp b/src/libs/database/impl/objects/ScanSettings.cpp index 23907e24..ab41d137 100644 --- a/src/libs/database/impl/objects/ScanSettings.cpp +++ b/src/libs/database/impl/objects/ScanSettings.cpp @@ -132,9 +132,9 @@ namespace lms::db _allowMBIDArtistMerge = value; } - void ScanSettings::setArtistImageFallbackToReleaseField(bool value) + void ScanSettings::setArtistImageFallbackToRelease(bool value) { - _artistImageFallbackToReleaseField = value; + _artistImageFallbackToRelease = value; } void ScanSettings::incAudioScanVersion() diff --git a/src/libs/database/include/database/objects/ScanSettings.hpp b/src/libs/database/include/database/objects/ScanSettings.hpp index 53593388..d8e68db1 100644 --- a/src/libs/database/include/database/objects/ScanSettings.hpp +++ b/src/libs/database/include/database/objects/ScanSettings.hpp @@ -75,7 +75,7 @@ namespace lms::db std::vector getArtistsToNotSplit() const; bool getSkipSingleReleasePlayLists() const { return _skipSingleReleasePlayLists; } bool getAllowMBIDArtistMerge() const { return _allowMBIDArtistMerge; } - bool getArtistImageFallbackToReleaseField() const { return _artistImageFallbackToReleaseField; } + bool getArtistImageFallbackToRelease() const { return _artistImageFallbackToRelease; } // Setters void setUpdateStartTime(Wt::WTime t) { _startTime = t; } @@ -87,7 +87,7 @@ namespace lms::db void setDefaultTagDelimiters(std::span delimiters); void setSkipSingleReleasePlayLists(bool value); void setAllowMBIDArtistMerge(bool value); - void setArtistImageFallbackToReleaseField(bool value); + void setArtistImageFallbackToRelease(bool value); void setMusicNNModelIdentifier(std::string_view identifier) { _musicnnModelIdentifier = identifier; } template void persist(Action& a) @@ -104,7 +104,7 @@ namespace lms::db Wt::Dbo::field(a, _defaultTagDelimiters, "default_tag_delimiters"); Wt::Dbo::field(a, _skipSingleReleasePlayLists, "skip_single_release_playlists"); Wt::Dbo::field(a, _allowMBIDArtistMerge, "allow_mbid_artist_merge"); - Wt::Dbo::field(a, _artistImageFallbackToReleaseField, "artist_image_fallback_to_release"); + Wt::Dbo::field(a, _artistImageFallbackToRelease, "artist_image_fallback_to_release"); Wt::Dbo::field(a, _musicnnModelIdentifier, "musicnn_model_identifier"); } @@ -126,9 +126,9 @@ namespace lms::db std::string _artistTagDelimiters; std::string _artistsToNotSplit; std::string _defaultTagDelimiters; - bool _skipSingleReleasePlayLists{}; - bool _allowMBIDArtistMerge{}; - bool _artistImageFallbackToReleaseField{}; + bool _skipSingleReleasePlayLists{ true }; + bool _allowMBIDArtistMerge{ true }; + bool _artistImageFallbackToRelease{ true }; std::string _musicnnModelIdentifier; }; } // namespace lms::db diff --git a/src/libs/services/scanner/impl/ScannerService.cpp b/src/libs/services/scanner/impl/ScannerService.cpp index 87e07fd0..d1ce1a5e 100644 --- a/src/libs/services/scanner/impl/ScannerService.cpp +++ b/src/libs/services/scanner/impl/ScannerService.cpp @@ -124,7 +124,7 @@ namespace lms::scanner settings->skipSingleReleasePlayLists = scanSettings->getSkipSingleReleasePlayLists(); settings->allowArtistMBIDFallback = scanSettings->getAllowMBIDArtistMerge(); - settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToReleaseField(); + settings->artistImageFallbackToRelease = scanSettings->getArtistImageFallbackToRelease(); settings->extractMusicNNEmbeddings = scanSettings->getRecommendationEngineType() == db::ScanSettings::RecommendationEngineType::AudioSimilarity; settings->musicnnModelPath = core::Service::get()->getPath("musicnn-model-path", "/usr/share/lms/models/MSD_musicnn_embedding.onnx"); diff --git a/src/lms/ui/admin/ScanSettingsView.cpp b/src/lms/ui/admin/ScanSettingsView.cpp index 93a4a824..44caa2c2 100644 --- a/src/lms/ui/admin/ScanSettingsView.cpp +++ b/src/lms/ui/admin/ScanSettingsView.cpp @@ -160,7 +160,7 @@ namespace lms::ui setValue(SkipSingleReleasePlayListsField, scanSettings->getSkipSingleReleasePlayLists()); setValue(AllowMBIDArtistMergeField, scanSettings->getAllowMBIDArtistMerge()); - setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToReleaseField()); + setValue(ArtistImageFallbackToReleaseField, scanSettings->getArtistImageFallbackToRelease()); auto recommendationEngineTypeRow{ _recommendationEngineTypeModel->getRowFromValue(scanSettings->getRecommendationEngineType()) }; if (recommendationEngineTypeRow) @@ -210,7 +210,7 @@ namespace lms::ui { const bool artistImageFallbackToRelease{ Wt::asNumber(value(ArtistImageFallbackToReleaseField)) != 0 }; - scanSettings.modify()->setArtistImageFallbackToReleaseField(artistImageFallbackToRelease); + scanSettings.modify()->setArtistImageFallbackToRelease(artistImageFallbackToRelease); } { From 29506fd16a0a07a39b82987ecfb0041ec5b16d17 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 23 Jun 2026 18:59:54 +0200 Subject: [PATCH 36/38] Isolated migration steps within transactions --- src/libs/database/impl/Migration.cpp | 98 +++++----- src/libs/database/impl/Session.cpp | 283 ++++++++++++++------------- src/libs/database/test/Migration.cpp | 1 - 3 files changed, 192 insertions(+), 190 deletions(-) diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index fe858eda..34f1f461 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -90,10 +90,14 @@ namespace lms::db::Migration { void dropIndexes(Session& session) { + LMS_LOG(DB, INFO, "Droping all indexes..."); + // Make sure we remove all the previoulsy created index, the createIndexesIfNeeded will recreate them all std::vector indexeNames{ utils::fetchQueryResults(session.getDboSession()->query(R"(SELECT name FROM sqlite_master WHERE type = 'index' AND name LIKE '%_idx')")) }; for (const auto& indexName : indexeNames) utils::executeCommand(*session.getDboSession(), "DROP INDEX " + indexName); + + LMS_LOG(DB, INFO, "Indexes dropped!"); } void migrateFromV33(Session& session) @@ -1738,46 +1742,34 @@ FROM track)"); void migrateFromV106(Session& session) { - dropIndexes(session); + auto& dboSession{ *session.getDboSession() }; + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS artist_name_mbid_idx"); + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS artist_mbid_idx"); + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS release_mbid_idx"); + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS release_group_mbid_idx"); + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS track_mbid_idx"); + utils::executeCommand(dboSession, "DROP INDEX IF EXISTS track_recording_mbid_idx"); - // Convert the 5 MBID TEXT columns to BLOB (16 raw bytes) - // unhex() returns NULL for non-hex input, so malformed values become NULL + auto convertMBIDColumn = [&](std::string_view table, std::string_view column) { + LMS_LOG(DB, INFO, "Migrating '" << column << "' from table '" << table << "'..."); - // artist.mbid - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist ADD COLUMN mbid_new BLOB)"); - utils::executeCommand(*session.getDboSession(), R"(UPDATE artist SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist DROP COLUMN mbid)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE artist RENAME COLUMN mbid_new TO mbid)"); + utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " ADD COLUMN " + std::string{ column } + "_new BLOB"); + utils::executeCommand(dboSession, "UPDATE " + std::string{ table } + " SET " + std::string{ column } + "_new = CASE WHEN " + std::string{ column } + " != '' THEN unhex(replace(" + std::string{ column } + ", '-', '')) ELSE NULL END"); + utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " DROP COLUMN " + std::string{ column }); + utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " RENAME COLUMN " + std::string{ column } + "_new TO " + std::string{ column }); + }; - // release.mbid - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release ADD COLUMN mbid_new BLOB)"); - utils::executeCommand(*session.getDboSession(), R"(UPDATE release SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release DROP COLUMN mbid)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release RENAME COLUMN mbid_new TO mbid)"); - - // release.group_mbid - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release ADD COLUMN group_mbid_new BLOB)"); - utils::executeCommand(*session.getDboSession(), R"(UPDATE release SET group_mbid_new = CASE WHEN group_mbid != '' THEN unhex(replace(group_mbid, '-', '')) ELSE NULL END)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release DROP COLUMN group_mbid)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE release RENAME COLUMN group_mbid_new TO group_mbid)"); - - // track.mbid - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track ADD COLUMN mbid_new BLOB)"); - utils::executeCommand(*session.getDboSession(), R"(UPDATE track SET mbid_new = CASE WHEN mbid != '' THEN unhex(replace(mbid, '-', '')) ELSE NULL END)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track DROP COLUMN mbid)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track RENAME COLUMN mbid_new TO mbid)"); - - // track.recording_mbid - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track ADD COLUMN recording_mbid_new BLOB)"); - utils::executeCommand(*session.getDboSession(), R"(UPDATE track SET recording_mbid_new = CASE WHEN recording_mbid != '' THEN unhex(replace(recording_mbid, '-', '')) ELSE NULL END)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track DROP COLUMN recording_mbid)"); - utils::executeCommand(*session.getDboSession(), R"(ALTER TABLE track RENAME COLUMN recording_mbid_new TO recording_mbid)"); + convertMBIDColumn("artist", "mbid"); + convertMBIDColumn("release", "mbid"); + convertMBIDColumn("release", "group_mbid"); + convertMBIDColumn("track", "mbid"); + convertMBIDColumn("track", "recording_mbid"); } void migrateFromV107(Session& session) { // Extract Genre, Mood, Language and Grouping from Cluster (keep it for user tags) - + LMS_LOG(DB, INFO, "Migrating genre..."); utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "genre" ( "id" integer primary key autoincrement, "version" integer not null, @@ -1808,6 +1800,7 @@ WHERE ct.name = 'GENRE')"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_genre_genre" ON "track_genre" ("genre_id"))"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_genre_track" ON "track_genre" ("track_id"))"); + LMS_LOG(DB, INFO, "Migrating mood..."); utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "mood" ( "id" integer primary key autoincrement, "version" integer not null, @@ -1835,6 +1828,7 @@ WHERE ct.name = 'MOOD')"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_mood_mood" ON "track_mood" ("mood_id"))"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_mood_track" ON "track_mood" ("track_id"))"); + LMS_LOG(DB, INFO, "Migrating language..."); utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "language" ( "id" integer primary key autoincrement, "version" integer not null, @@ -1862,6 +1856,7 @@ WHERE ct.name = 'LANGUAGE')"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_language_language" ON "track_language" ("language_id"))"); utils::executeCommand(*session.getDboSession(), R"(CREATE INDEX "track_language_track" ON "track_language" ("track_id"))"); + LMS_LOG(DB, INFO, "Migrating grouping..."); utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "grouping" ( "id" integer primary key autoincrement, "version" integer not null, @@ -1982,12 +1977,11 @@ WHERE ct.name = 'GROUPING')"); { 107, migrateFromV107 }, }; - bool migrationPerformed{}; - { - LMS_SCOPED_TRACE_OVERVIEW("Database", "Migration"); - auto transaction{ session.createWriteTransaction() }; + LMS_SCOPED_TRACE_OVERVIEW("Database", "Migration"); - Version version; + Version version{}; + { + auto transaction{ session.createWriteTransaction() }; try { version = VersionInfo::getOrCreate(session)->getVersion(); @@ -2004,23 +1998,27 @@ WHERE ct.name = 'GROUPING')"); if (version < migrationFunctions.begin()->first) throw core::LmsException{ outdatedMsg }; + } + + bool migrationPerformed{}; + while (version < LMS_DATABASE_VERSION) + { + LMS_SCOPED_TRACE_DETAILED("Database", "MigrationStep"); + LMS_LOG(DB, INFO, "Migrating database from version " << version << " to " << version + 1 << "..."); + + auto itMigrationFunc{ migrationFunctions.find(version) }; + if (itMigrationFunc == std::cend(migrationFunctions)) + throw core::LmsException{ "No code found to upgrade database!" }; - while (version < LMS_DATABASE_VERSION) { - LMS_SCOPED_TRACE_DETAILED("Database", "MigrationStep"); - LMS_LOG(DB, INFO, "Migrating database from version " << version << " to " << version + 1 << "..."); - - auto itMigrationFunc{ migrationFunctions.find(version) }; - if (itMigrationFunc == std::cend(migrationFunctions)) - throw core::LmsException{ "No code found to upgrade database!" }; - + auto transaction{ session.createWriteTransaction() }; itMigrationFunc->second(session); - - VersionInfo::get(session).modify()->setVersion(++version); - - LMS_LOG(DB, INFO, "Migration complete to version " << version); - migrationPerformed = true; + VersionInfo::get(session).modify()->setVersion(version + 1); } + ++version; + + LMS_LOG(DB, INFO, "Migration complete to version " << version); + migrationPerformed = true; } return migrationPerformed; diff --git a/src/libs/database/impl/Session.cpp b/src/libs/database/impl/Session.cpp index 875a15ac..01c49b2b 100644 --- a/src/libs/database/impl/Session.cpp +++ b/src/libs/database/impl/Session.cpp @@ -194,146 +194,151 @@ namespace lms::db LMS_SCOPED_TRACE_OVERVIEW("Database", "IndexCreation"); LMS_LOG(DB, INFO, "Creating indexes... This may take a while..."); + constexpr std::string_view indexSqls[]{ + "CREATE INDEX IF NOT EXISTS artist_id_idx ON artist(id)", + "CREATE INDEX IF NOT EXISTS artist_name_mbid_idx ON artist(name, mbid)", + "CREATE INDEX IF NOT EXISTS artist_sort_name_nocase_idx ON artist(sort_name COLLATE NOCASE)", + "CREATE INDEX IF NOT EXISTS artist_mbid_idx ON artist(mbid)", + + "CREATE INDEX IF NOT EXISTS artist_info_path_idx ON artist_info(absolute_file_path)", + "CREATE INDEX IF NOT EXISTS artist_info_directory_id_idx ON artist_info(directory_id)", + "CREATE INDEX IF NOT EXISTS artist_info_artist_id_idx ON artist_info(artist_id)", + "CREATE INDEX IF NOT EXISTS artist_info_mbid_matched_artist_idx ON artist_info(mbid_matched, artist_id)", + + "CREATE INDEX IF NOT EXISTS artwork_id_idx ON artwork(id)", + "CREATE INDEX IF NOT EXISTS artwork_image_idx ON artwork(image_id)", + "CREATE INDEX IF NOT EXISTS artwork_track_embedded_image_idx ON artwork(track_embedded_image_id)", + + "CREATE INDEX IF NOT EXISTS auth_token_user_domain_idx ON auth_token(user_id, domain)", + "CREATE INDEX IF NOT EXISTS auth_token_domain_expiry_idx ON auth_token(domain, expiry)", + "CREATE INDEX IF NOT EXISTS auth_token_domain_value_idx ON auth_token(domain, value)", + + "CREATE INDEX IF NOT EXISTS cluster_id_idx ON cluster(id)", + "CREATE INDEX IF NOT EXISTS cluster_cluster_type_idx ON cluster(cluster_type_id)", + "CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)", + + "CREATE UNIQUE INDEX IF NOT EXISTS genre_name_idx ON genre(name)", + "CREATE UNIQUE INDEX IF NOT EXISTS grouping_name_idx ON grouping(name)", + "CREATE UNIQUE INDEX IF NOT EXISTS language_name_idx ON language(name)", + "CREATE UNIQUE INDEX IF NOT EXISTS mood_name_idx ON mood(name)", + + "CREATE INDEX IF NOT EXISTS country_id_idx ON country(id)", + "CREATE INDEX IF NOT EXISTS country_name_idx ON country(name COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS directory_id_idx ON directory(id)", + "CREATE INDEX IF NOT EXISTS directory_parent_directory_idx ON directory(parent_directory_id)", + "CREATE INDEX IF NOT EXISTS directory_path_idx ON directory(absolute_path)", + "CREATE INDEX IF NOT EXISTS directory_media_library_idx ON directory(media_library_id)", + "CREATE INDEX IF NOT EXISTS directory_name_idx ON directory(name COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS track_embedded_image_id_idx ON track_embedded_image(id)", + "CREATE INDEX IF NOT EXISTS track_embedded_image_hash_idx ON track_embedded_image(hash)", + + "CREATE INDEX IF NOT EXISTS track_embedded_image_link_id_idx ON track_embedded_image_link(id)", + "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_id_idx ON track_embedded_image_link(track_id)", + "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_embedded_image_id_track_id_idx ON track_embedded_image_link(track_embedded_image_id, track_id)", + "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_track_embedded_image_id_idx ON track_embedded_image_link(track_id, track_embedded_image_id)", + + "CREATE INDEX IF NOT EXISTS image_directory_stem_idx ON image(directory_id, stem COLLATE NOCASE)", + "CREATE INDEX IF NOT EXISTS image_id_idx ON image(id)", + "CREATE INDEX IF NOT EXISTS image_path_idx ON image(absolute_file_path)", + "CREATE INDEX IF NOT EXISTS image_stem_idx ON image(stem COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS label_id_idx ON label(id)", + "CREATE INDEX IF NOT EXISTS label_name_idx ON label(name COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS listen_backend_idx ON listen(backend)", + "CREATE INDEX IF NOT EXISTS listen_id_idx ON listen(id)", + "CREATE INDEX IF NOT EXISTS listen_user_backend_idx ON listen(user_id,backend)", + "CREATE INDEX IF NOT EXISTS listen_user_backend_date_time_idx ON listen(user_id, backend, date_time DESC)", + "CREATE INDEX IF NOT EXISTS listen_track_user_backend_idx ON listen(track_id,user_id,backend)", + "CREATE INDEX IF NOT EXISTS listen_user_track_backend_date_time_idx ON listen(user_id,track_id,backend,date_time)", + + "CREATE INDEX IF NOT EXISTS media_library_id_idx ON media_library(id)", + + "CREATE INDEX IF NOT EXISTS medium_release_position_idx ON medium(release_id, position)", + + "CREATE INDEX IF NOT EXISTS playlist_file_id_idx ON playlist_file(id)", + "CREATE INDEX IF NOT EXISTS playlist_file_directory_idx ON playlist_file(directory_id)", + "CREATE INDEX IF NOT EXISTS playlist_file_absolute_file_path_idx ON playlist_file(absolute_file_path)", + + "CREATE INDEX IF NOT EXISTS rated_artist_user_artist_idx ON rated_artist(user_id,artist_id)", + "CREATE INDEX IF NOT EXISTS rated_release_user_release_idx ON rated_release(user_id,release_id)", + "CREATE INDEX IF NOT EXISTS rated_track_user_track_idx ON rated_track(user_id,track_id)", + + "CREATE INDEX IF NOT EXISTS release_id_idx ON release(id)", + "CREATE INDEX IF NOT EXISTS release_group_mbid_idx ON release(group_mbid)", + "CREATE INDEX IF NOT EXISTS release_mbid_idx ON release(mbid)", + "CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)", + "CREATE INDEX IF NOT EXISTS release_name_nocase_idx ON release(name COLLATE NOCASE)", + "CREATE INDEX IF NOT EXISTS release_sort_name_idx ON release(sort_name)", + "CREATE INDEX IF NOT EXISTS release_sort_name_nocase_idx ON release(sort_name COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS release_artist_link_id_idx ON release_artist_link(id)", + "CREATE INDEX IF NOT EXISTS release_artist_link_artist_idx ON release_artist_link(artist_id)", + "CREATE INDEX IF NOT EXISTS release_artist_link_release_idx ON release_artist_link(release_id)", + + "CREATE INDEX IF NOT EXISTS release_type_id_idx ON release_type(id)", + "CREATE INDEX IF NOT EXISTS release_type_name_idx ON release_type(name COLLATE NOCASE)", + + "CREATE INDEX IF NOT EXISTS track_id_idx ON track(id)", + "CREATE INDEX IF NOT EXISTS track_absolute_path_idx ON track(absolute_file_path)", + "CREATE INDEX IF NOT EXISTS track_date_idx ON track(date)", + "CREATE INDEX IF NOT EXISTS track_directory_release_idx ON track(directory_id, release_id)", + "CREATE INDEX IF NOT EXISTS track_file_added_idx ON track(file_added)", + "CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)", + "CREATE INDEX IF NOT EXISTS track_media_library_idx ON track(media_library_id)", + "CREATE INDEX IF NOT EXISTS track_media_library_release_idx ON track(media_library_id, release_id)", + "CREATE INDEX IF NOT EXISTS track_medium_idx ON track(medium_id)", + "CREATE INDEX IF NOT EXISTS track_mbid_idx ON track(mbid)", + "CREATE INDEX IF NOT EXISTS track_name_file_size_idx ON track(name, file_size)", + "CREATE INDEX IF NOT EXISTS track_name_nocase_idx ON track(name COLLATE NOCASE)", + "CREATE INDEX IF NOT EXISTS track_original_date_idx ON track(original_date)", + "CREATE INDEX IF NOT EXISTS track_recording_mbid_idx ON track(recording_mbid)", + "CREATE INDEX IF NOT EXISTS track_release_date_idx ON track(release_id, date)", + "CREATE INDEX IF NOT EXISTS track_release_file_last_write_idx ON track(release_id, file_last_write)", + "CREATE INDEX IF NOT EXISTS track_release_file_added_idx ON track(release_id, file_added)", + + "CREATE INDEX IF NOT EXISTS tracklist_id_idx ON tracklist(id)", + "CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)", + "CREATE INDEX IF NOT EXISTS tracklist_user_type_idx ON tracklist(user_id, type)", + "CREATE INDEX IF NOT EXISTS tracklist_last_modified_date_time_idx ON tracklist(last_modified_date_time)", + + "CREATE INDEX IF NOT EXISTS tracklist_entry_idx ON tracklist_entry(id)", + "CREATE INDEX IF NOT EXISTS tracklist_entry_tracklist_track_idx ON tracklist_entry(tracklist_id, track_id)", + + "CREATE INDEX IF NOT EXISTS track_artist_link_id_idx ON track_artist_link(id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_artist_idx ON track_artist_link(artist_id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_artist_mbid_matched_artist_idx ON track_artist_link(artist_mbid_matched, artist_id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_artist_track_idx ON track_artist_link(artist_id, track_id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_artist_type_track_idx ON track_artist_link(artist_id, type, track_id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_track_artist_idx ON track_artist_link(track_id, artist_id)", + "CREATE INDEX IF NOT EXISTS track_artist_link_track_type_idx ON track_artist_link(track_id, type)", + + "CREATE INDEX IF NOT EXISTS track_musicnn_embeddings_track_idx ON track_musicnn_embeddings(track_id)", + + "CREATE INDEX IF NOT EXISTS track_lyrics_id_idx ON track_lyrics(id)", + "CREATE INDEX IF NOT EXISTS track_lyrics_absolute_file_path_idx ON track_lyrics(absolute_file_path)", + "CREATE INDEX IF NOT EXISTS track_lyrics_directory_idx ON track_lyrics(directory_id)", + "CREATE INDEX IF NOT EXISTS track_lyrics_track_idx ON track_lyrics(track_id)", + + "CREATE INDEX IF NOT EXISTS track_bookmark_user_idx ON track_bookmark(user_id)", + "CREATE INDEX IF NOT EXISTS track_bookmark_user_track_idx ON track_bookmark(user_id,track_id)", + + "CREATE INDEX IF NOT EXISTS starred_artist_user_backend_idx ON starred_artist(user_id,backend)", + "CREATE INDEX IF NOT EXISTS starred_artist_artist_user_backend_idx ON starred_artist(artist_id,user_id,backend)", + + "CREATE INDEX IF NOT EXISTS starred_release_user_backend_idx ON starred_release(user_id,backend)", + "CREATE INDEX IF NOT EXISTS starred_release_release_user_backend_idx ON starred_release(release_id,user_id,backend)", + + "CREATE INDEX IF NOT EXISTS starred_track_user_backend_idx ON starred_track(user_id,backend)", + "CREATE INDEX IF NOT EXISTS starred_track_track_user_backend_idx ON starred_track(track_id,user_id,backend)", + }; + + for (std::string_view sql : indexSqls) { auto transaction{ createWriteTransaction() }; - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_id_idx ON artist(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_name_mbid_idx ON artist(name, mbid)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_sort_name_nocase_idx ON artist(sort_name COLLATE NOCASE)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_mbid_idx ON artist(mbid)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_info_path_idx ON artist_info(absolute_file_path)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_info_directory_id_idx ON artist_info(directory_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_info_artist_id_idx ON artist_info(artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artist_info_mbid_matched_artist_idx ON artist_info(mbid_matched, artist_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artwork_id_idx ON artwork(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artwork_image_idx ON artwork(image_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS artwork_track_embedded_image_idx ON artwork(track_embedded_image_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS auth_token_user_domain_idx ON auth_token(user_id, domain)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS auth_token_domain_expiry_idx ON auth_token(domain, expiry)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS auth_token_domain_value_idx ON auth_token(domain, value)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_id_idx ON cluster(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_cluster_type_idx ON cluster(cluster_type_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)"); - - utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS genre_name_idx ON genre(name)"); - utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS grouping_name_idx ON grouping(name)"); - utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS language_name_idx ON language(name)"); - utils::executeCommand(_session, "CREATE UNIQUE INDEX IF NOT EXISTS mood_name_idx ON mood(name)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_id_idx ON country(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_name_idx ON country(name COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_id_idx ON directory(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_parent_directory_idx ON directory(parent_directory_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_path_idx ON directory(absolute_path)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_media_library_idx ON directory(media_library_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_name_idx ON directory(name COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_id_idx ON track_embedded_image(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_hash_idx ON track_embedded_image(hash)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_link_id_idx ON track_embedded_image_link(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_id_idx ON track_embedded_image_link(track_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_embedded_image_id_track_id_idx ON track_embedded_image_link(track_embedded_image_id, track_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_embedded_image_link_track_track_embedded_image_id_idx ON track_embedded_image_link(track_id, track_embedded_image_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS image_directory_stem_idx ON image(directory_id, stem COLLATE NOCASE)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS image_id_idx ON image(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS image_path_idx ON image(absolute_file_path)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS image_stem_idx ON image(stem COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS label_id_idx ON label(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS label_name_idx ON label(name COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_backend_idx ON listen(backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_id_idx ON listen(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_user_backend_idx ON listen(user_id,backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_user_backend_date_time_idx ON listen(user_id, backend, date_time DESC)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_track_user_backend_idx ON listen(track_id,user_id,backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_user_track_backend_date_time_idx ON listen(user_id,track_id,backend,date_time)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS media_library_id_idx ON media_library(id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS medium_release_position_idx ON medium(release_id, position)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS playlist_file_id_idx ON playlist_file(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS playlist_file_directory_idx ON playlist_file(directory_id);"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS playlist_file_absolute_file_path_idx ON playlist_file(absolute_file_path)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS rated_artist_user_artist_idx ON rated_artist(user_id,artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS rated_release_user_release_idx ON rated_release(user_id,release_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS rated_track_user_track_idx ON rated_track(user_id,track_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_id_idx ON release(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_group_mbid_idx ON release(group_mbid)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_mbid_idx ON release(mbid)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_name_nocase_idx ON release(name COLLATE NOCASE)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_sort_name_idx ON release(sort_name)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_sort_name_nocase_idx ON release(sort_name COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_artist_link_id_idx ON release_artist_link(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_artist_link_artist_idx ON release_artist_link(artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_artist_link_release_idx ON release_artist_link(release_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_type_id_idx ON release_type(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS release_type_name_idx ON release_type(name COLLATE NOCASE)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_id_idx ON track(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_absolute_path_idx ON track(absolute_file_path)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_date_idx ON track(date)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_directory_release_idx ON track(directory_id, release_id);"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_added_idx ON track(file_added)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_file_last_write_idx ON track(file_last_write)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_media_library_idx ON track(media_library_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_media_library_release_idx ON track(media_library_id, release_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_medium_idx ON track(medium_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_mbid_idx ON track(mbid)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_name_file_size_idx ON track(name, file_size)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_name_nocase_idx ON track(name COLLATE NOCASE)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_original_date_idx ON track(original_date)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_recording_mbid_idx ON track(recording_mbid)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_date_idx ON track(release_id, date)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_last_write_idx ON track(release_id, file_last_write)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_release_file_added_idx ON track(release_id, file_added)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_id_idx ON tracklist(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_name_idx ON tracklist(name)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_user_type_idx ON tracklist(user_id, type)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_last_modified_date_time_idx ON tracklist(last_modified_date_time)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_entry_idx ON tracklist_entry(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS tracklist_entry_tracklist_track_idx ON tracklist_entry(tracklist_id, track_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_id_idx ON track_artist_link(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_artist_idx ON track_artist_link(artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_artist_mbid_matched_artist_idx ON track_artist_link(artist_mbid_matched, artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_artist_track_idx ON track_artist_link(artist_id, track_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_artist_type_track_idx ON track_artist_link(artist_id, type, track_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_track_artist_idx ON track_artist_link(track_id, artist_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_artist_link_track_type_idx ON track_artist_link(track_id, type)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_musicnn_embeddings_track_idx ON track_musicnn_embeddings(track_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_lyrics_id_idx ON track_lyrics(id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_lyrics_absolute_file_path_idx ON track_lyrics(absolute_file_path)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_lyrics_directory_idx ON track_lyrics(directory_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_lyrics_track_idx ON track_lyrics(track_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_bookmark_user_idx ON track_bookmark(user_id)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS track_bookmark_user_track_idx ON track_bookmark(user_id,track_id)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_artist_user_backend_idx ON starred_artist(user_id,backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_artist_artist_user_backend_idx ON starred_artist(artist_id,user_id,backend)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_release_user_backend_idx ON starred_release(user_id,backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_release_release_user_backend_idx ON starred_release(release_id,user_id,backend)"); - - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_track_user_backend_idx ON starred_track(user_id,backend)"); - utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS starred_track_track_user_backend_idx ON starred_track(track_id,user_id,backend)"); + utils::executeCommand(_session, std::string{ sql }); } LMS_LOG(DB, INFO, "Indexes created!"); @@ -360,7 +365,7 @@ namespace lms::db LMS_SCOPED_TRACE_OVERVIEW("Database", "Vacuum"); LMS_LOG(DB, INFO, "Performing vacuum... This may take a while..."); - // We manually take a lock here since vacuum cannot be inside a transaction + // We manually take a lock here since vacuum cannot be inside a transaction. { std::unique_lock lock{ static_cast(_db).getMutex() }; static_cast(_db).executeSql("VACUUM"); diff --git a/src/libs/database/test/Migration.cpp b/src/libs/database/test/Migration.cpp index 82c4b00c..90815466 100644 --- a/src/libs/database/test/Migration.cpp +++ b/src/libs/database/test/Migration.cpp @@ -383,7 +383,6 @@ VALUES EXPECT_FALSE(UIState::find(session, UIStateId{})); EXPECT_FALSE(User::find(session, UserId{})); - // Verify UUID MBID round-trip through V107 migration (TEXT → BLOB) const auto artistMBID{ core::UUID::fromString("550e8400-e29b-41d4-a716-446655440000") }; ASSERT_TRUE(artistMBID); const auto artist{ Artist::find(session, *artistMBID) }; From 166a79a72af49af9a5e2523914cdbf84218cbe19 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 23 Jun 2026 19:23:59 +0200 Subject: [PATCH 37/38] Fixed migration with old sqlite3 versions (likely shipped with wt) --- src/libs/database/impl/Migration.cpp | 33 +++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/src/libs/database/impl/Migration.cpp b/src/libs/database/impl/Migration.cpp index 34f1f461..dc65b75d 100644 --- a/src/libs/database/impl/Migration.cpp +++ b/src/libs/database/impl/Migration.cpp @@ -24,6 +24,7 @@ #include "core/Exception.hpp" #include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" +#include "core/String.hpp" #include "database/Session.hpp" #include "database/objects/ScanSettings.hpp" @@ -1754,7 +1755,37 @@ FROM track)"); LMS_LOG(DB, INFO, "Migrating '" << column << "' from table '" << table << "'..."); utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " ADD COLUMN " + std::string{ column } + "_new BLOB"); - utils::executeCommand(dboSession, "UPDATE " + std::string{ table } + " SET " + std::string{ column } + "_new = CASE WHEN " + std::string{ column } + " != '' THEN unhex(replace(" + std::string{ column } + ", '-', '')) ELSE NULL END"); + + // Fetch all non-empty MBIDs and convert to blobs + using Row = std::tuple; + std::vector>> rows; + const auto queryResults{ dboSession.query("SELECT id, " + std::string{ column } + " FROM " + std::string{ table } + " WHERE " + std::string{ column } + " != ''") }; + std::string hexStr; + hexStr.reserve(32); + utils::forEachQueryResult(queryResults, [&](const Row& row) { + hexStr.clear(); + const auto& uuid{ std::get<1>(row) }; + for (char c : uuid) + { + if (c != '-') + hexStr.push_back(c); + } + const auto blob{ core::stringUtils::stringFromHex(hexStr) }; + if (blob && blob->size() == 16) + rows.emplace_back(std::get<0>(row), std::vector{ blob->begin(), blob->end() }); + }); + + // Update with prepared statement loop + Wt::Dbo::Transaction transaction{ dboSession }; + auto update{ transaction.connection()->prepareStatement("UPDATE " + std::string{ table } + " SET " + std::string{ column } + "_new = ? WHERE id = ?") }; + for (const auto& [id, blob] : rows) + { + update->bind(0, blob); + update->bind(1, id); + update->execute(); + update->reset(); + } + utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " DROP COLUMN " + std::string{ column }); utils::executeCommand(dboSession, "ALTER TABLE " + std::string{ table } + " RENAME COLUMN " + std::string{ column } + "_new TO " + std::string{ column }); }; From d840db6f73d8c063064583375a418342de439af2 Mon Sep 17 00:00:00 2001 From: emeric Date: Tue, 23 Jun 2026 19:46:05 +0200 Subject: [PATCH 38/38] Fixed alpine build --- Dockerfile-build-alpine | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-build-alpine b/Dockerfile-build-alpine index 29930e9b..f815419e 100644 --- a/Dockerfile-build-alpine +++ b/Dockerfile-build-alpine @@ -3,6 +3,7 @@ FROM --platform=$BUILDPLATFORM alpine:3.24 ARG BUILD_PACKAGES="\ clang \ + llvm \ make \ cmake \ lld \