From c2ee50ab709c2fa801cdd6cf350353416522e19c Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 20 Nov 2019 13:47:11 +0100 Subject: [PATCH] Restored similarity dumps in the similarity tool --- src/database/Artist.cpp | 9 ++++ src/database/Artist.hpp | 1 + src/database/Release.cpp | 9 ++++ src/database/Release.hpp | 1 + src/database/Track.hpp | 4 +- tools/similarity/LmsSimilarity.cpp | 78 ++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp index 1951b69a..0b457f1f 100644 --- a/src/database/Artist.cpp +++ b/src/database/Artist.cpp @@ -86,6 +86,15 @@ Artist::getAll(Session& session, std::optional offset, std::optiona return std::vector(res.begin(), res.end()); } +std::vector +Artist::getAllIds(Session& session) +{ + session.checkSharedLocked(); + + Wt::Dbo::collection res = session.getDboSession().query("SELECT id FROM artist"); + return std::vector(res.begin(), res.end()); +} + std::vector Artist::getAllOrphans(Session& session) { diff --git a/src/database/Artist.hpp b/src/database/Artist.hpp index b46cafb1..fb03bf8b 100644 --- a/src/database/Artist.hpp +++ b/src/database/Artist.hpp @@ -62,6 +62,7 @@ class Artist : public Wt::Dbo::Dbo bool& moreExpected); static std::vector getAll(Session& session, std::optional offset = {}, std::optional size = {}); + static std::vector getAllIds(Session& session); static std::vector getAllOrphans(Session& session); // No track related static std::vector getLastAdded(Session& session, Wt::WDateTime after, std::optional size = {}); diff --git a/src/database/Release.cpp b/src/database/Release.cpp index 30587939..bbf26aaa 100644 --- a/src/database/Release.cpp +++ b/src/database/Release.cpp @@ -96,6 +96,15 @@ Release::getAll(Session& session, std::optional offset, std::option return std::vector(res.begin(), res.end()); } +std::vector +Release::getAllIds(Session& session) +{ + session.checkSharedLocked(); + + Wt::Dbo::collection res = session.getDboSession().query("SELECT id FROM release"); + return std::vector(res.begin(), res.end()); +} + std::vector Release::getAllOrderedByArtist(Session& session, std::optional offset, std::optional size) { diff --git a/src/database/Release.hpp b/src/database/Release.hpp index 494bee49..c2c6bbf1 100644 --- a/src/database/Release.hpp +++ b/src/database/Release.hpp @@ -52,6 +52,7 @@ class Release : public Wt::Dbo::Dbo static pointer getById(Session& session, IdType id); static std::vector getAllOrphans(Session& session); // no track related static std::vector getAll(Session& session, std::optional offset = {}, std::optional size = {}); + static std::vector getAllIds(Session& session); static std::vector getAllOrderedByArtist(Session& session, std::optional offset = {}, std::optional size = {}); static std::vector getAllRandom(Session& session, std::optional size = {}); static std::vector getLastAdded(Session& session, const Wt::WDateTime& after, std::optional offset = {}, std::optional size = {}); diff --git a/src/database/Track.hpp b/src/database/Track.hpp index 2ed74a11..e87062dc 100644 --- a/src/database/Track.hpp +++ b/src/database/Track.hpp @@ -70,8 +70,8 @@ class Track : public Wt::Dbo::Dbo static std::vector getAll(Session& session, std::optional limit = {}); static std::vector getAllRandom(Session& session, std::optional limit = {}); - static std::vector getAllIds(Session& session); // nested transaction - static std::vector getAllPaths(Session& session); // nested transaction + static std::vector getAllIds(Session& session); + static std::vector getAllPaths(Session& session); static std::vector getMBIDDuplicates(Session& session); static std::vector getLastAdded(Session& session, const Wt::WDateTime& after, std::optional size = 1); static std::vector getAllWithMBIDAndMissingFeatures(Session& session); diff --git a/tools/similarity/LmsSimilarity.cpp b/tools/similarity/LmsSimilarity.cpp index 76eb40ec..4e600686 100644 --- a/tools/similarity/LmsSimilarity.cpp +++ b/tools/similarity/LmsSimilarity.cpp @@ -3,8 +3,11 @@ #include #include +#include "database/Artist.hpp" #include "database/Db.hpp" +#include "database/Release.hpp" #include "database/Session.hpp" +#include "database/Track.hpp" #include "utils/Config.hpp" #include "utils/Service.hpp" #include "utils/StreamLogger.hpp" @@ -48,6 +51,81 @@ int main(int argc, char *argv[]) FeaturesSearcher searcher {session, featuresSettings}; std::cout << "Classifying tracks DONE" << std::endl; + + const std::vector trackIds = std::invoke([&]() + { + auto transaction {session.createSharedTransaction()}; + return Database::Track::getAllIds(session); + }); + + std::cout << "*** Tracks ***" << std::endl; + for (Database::IdType trackId : trackIds) + { + auto trackToString = [&](Database::IdType trackId) + { + std::string res; + auto transaction {session.createSharedTransaction()}; + Database::Track::pointer track {Database::Track::getById(session, trackId)}; + + res += track->getName(); + auto artists {track->getArtists()}; + for (auto artist : artists ) + res += " - " + artist->getName(); + if (track->getRelease()) + res += " [" + track->getRelease()->getName() + "]"; + + return res; + }; + + std::cout << "Processing track '" << trackToString(trackId) << std::endl; + for (Database::IdType similarTrackId : searcher.getSimilarTracks({trackId}, 3)) + std::cout << "\t- Similar track '" << trackToString(similarTrackId) << std::endl; + } + + const std::vector releaseIds = std::invoke([&]() + { + auto transaction {session.createSharedTransaction()}; + return Database::Release::getAllIds(session); + }); + + std::cout << "*** Releases ***" << std::endl; + for (Database::IdType releaseId : releaseIds) + { + auto releaseToString = [&](Database::IdType releaseId) + { + auto transaction {session.createSharedTransaction()}; + + Database::Release::pointer release {Database::Release::getById(session, releaseId)}; + return release->getName(); + }; + + std::cout << "Processing release '" << releaseToString(releaseId) << "'" << std::endl; + for (Database::IdType similarReleaseId : searcher.getSimilarReleases({releaseId}, 3)) + std::cout << "\t- Similar release '" << releaseToString(similarReleaseId) << "'" << std::endl; + } + + const std::vector artistIds = std::invoke([&]() + { + auto transaction {session.createSharedTransaction()}; + return Database::Artist::getAllIds(session); + }); + + std::cout << "*** Artists ***" << std::endl; + for (Database::IdType artistId : artistIds) + { + auto artistToString = [&](Database::IdType artistId) + { + auto transaction {session.createSharedTransaction()}; + + Database::Artist::pointer artist {Database::Artist::getById(session, artistId)}; + return artist->getName(); + }; + + std::cout << "Processing artist '" << artistToString(artistId) << "'" << std::endl; + for (Database::IdType similarArtistId : searcher.getSimilarArtists({artistId}, 3)) + std::cout << "\t- Similar artist '" << artistToString(similarArtistId) << "'" << std::endl; + } + } catch( std::exception& e) {