owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Databsae service refactoring. Warning, loses stars and listens stats

Browse Source
This commit is contained in:
emeric
2021-12-04 15:25:09 +01:00
parent 97aba4ae82
commit 0cf6b2159e
160 changed files with 6047 additions and 3477 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/cover/LmsCover.cpp
+5 -3
View File
@@ -38,13 +38,15 @@ static
void
dumpTrackCovers(Database::Session& session, Image::ImageSize width)
{
std::vector<Database::TrackId> trackIds;
using namespace Database;
RangeResults<Database::TrackId> trackIds;
{
auto transaction {session.createSharedTransaction()};
trackIds = Database::Track::getAllIds(session);
trackIds = Database::Track::find(session, Database::Track::FindParameters {});
}
for (const Database::TrackId trackId : trackIds)
for (const Database::TrackId trackId : trackIds.results)
{
std::cout << "Getting cover for track id " << trackId.toString() << std::endl;
Service<Cover::ICoverService>::get()->getFromTrack(trackId, width);
src/tools/recommendation/LmsRecommendation.cpp
+29 -26
View File
@@ -30,34 +30,37 @@
#include "services/database/Release.hpp"
#include "services/database/Session.hpp"
#include "services/database/Track.hpp"
#include "services/database/Types.hpp"
#include "services/recommendation/IRecommendationService.hpp"
#include "utils/IConfig.hpp"
#include "utils/Service.hpp"
#include "utils/StreamLogger.hpp"
using namespace Database;
static
void
dumpTracksRecommendation(Database::Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
dumpTracksRecommendation(Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
{
const std::vector<Database::TrackId> trackIds {[&]()
const RangeResults<TrackId> trackIds {[&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Track::getAllIds(session);
return Track::find(session, Track::FindParameters {});
}()};
std::cout << "*** Tracks (" << trackIds.size() << ") ***" << std::endl;
for (Database::TrackId trackId : trackIds)
std::cout << "*** Tracks (" << trackIds.results.size() << ") ***" << std::endl;
for (const TrackId trackId : trackIds.results)
{
auto trackToString = [&](Database::TrackId trackId)
auto trackToString = [&](const TrackId trackId)
{
std::string res;
auto transaction {session.createSharedTransaction()};
Database::Track::pointer track {Database::Track::getById(session, trackId)};
const Track::pointer track {Track::find(session, trackId)};
res += track->getName();
if (track->getRelease())
res += " [" + track->getRelease()->getName() + "]";
for (auto artist : track->getArtists({Database::TrackArtistLinkType::Artist}))
for (auto artist : track->getArtists({TrackArtistLinkType::Artist}))
res += " - " + artist->getName();
for (auto cluster : track->getClusters())
res += " {" + cluster->getType()->getName() + "-"+ cluster->getName() + "}";
@@ -66,61 +69,61 @@ dumpTracksRecommendation(Database::Session session, Recommendation::IRecommendat
};
std::cout << "Processing track '" << trackToString(trackId) << std::endl;
for (Database::TrackId similarTrackId : recommendationService.getSimilarTracks({trackId}, maxSimilarityCount))
for (TrackId similarTrackId : recommendationService.findSimilarTracks({trackId}, maxSimilarityCount))
std::cout << "\t- Similar track '" << trackToString(similarTrackId) << std::endl;
}
}
static
void
dumpReleasesRecommendation(Database::Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
dumpReleasesRecommendation(Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
{
const std::vector<Database::ReleaseId> releaseIds = std::invoke([&]()
const RangeResults<ReleaseId> releaseIds {std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Release::getAllIds(session);
});
return Release::find(session, Release::FindParameters {});
})};
std::cout << "*** Releases ***" << std::endl;
for (Database::ReleaseId releaseId : releaseIds)
for (ReleaseId releaseId : releaseIds.results)
{
auto releaseToString = [&](Database::ReleaseId releaseId) -> std::string
auto releaseToString = [&](ReleaseId releaseId) -> std::string
{
auto transaction {session.createSharedTransaction()};
Database::Release::pointer release {Database::Release::getById(session, releaseId)};
Release::pointer release {Release::find(session, releaseId)};
return release->getName();
};
std::cout << "Processing release '" << releaseToString(releaseId) << "'" << std::endl;
for (Database::ReleaseId similarReleaseId : recommendationService.getSimilarReleases(releaseId, maxSimilarityCount))
for (ReleaseId similarReleaseId : recommendationService.getSimilarReleases(releaseId, maxSimilarityCount))
std::cout << "\t- Similar release '" << releaseToString(similarReleaseId) << "'" << std::endl;
}
}
static
void
dumpArtistsRecommendation(Database::Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
dumpArtistsRecommendation(Session session, Recommendation::IRecommendationService& recommendationService, unsigned maxSimilarityCount)
{
const std::vector<Database::ArtistId> artistIds = std::invoke([&]()
const RangeResults<ArtistId> artistIds = std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Artist::getAllIds(session);
return Artist::find(session, Artist::FindParameters {});
});
std::cout << "*** Artists ***" << std::endl;
for (Database::ArtistId artistId : artistIds)
for (ArtistId artistId : artistIds.results)
{
auto artistToString = [&](Database::ArtistId artistId)
auto artistToString = [&](ArtistId artistId)
{
auto transaction {session.createSharedTransaction()};
Database::Artist::pointer artist {Database::Artist::getById(session, artistId)};
Artist::pointer artist {Artist::find(session, artistId)};
return artist->getName();
};
std::cout << "Processing artist '" << artistToString(artistId) << "'" << std::endl;
for (Database::ArtistId similarArtistId : recommendationService.getSimilarArtists(artistId, {Database::TrackArtistLinkType::Artist, Database::TrackArtistLinkType::ReleaseArtist}, maxSimilarityCount))
for (ArtistId similarArtistId : recommendationService.getSimilarArtists(artistId, {TrackArtistLinkType::Artist, TrackArtistLinkType::ReleaseArtist}, maxSimilarityCount))
{
std::cout << "\t- Similar artist '" << artistToString(similarArtistId) << "'" << std::endl;
}
@@ -158,8 +161,8 @@ int main(int argc, char *argv[])
Service<IConfig> config {createConfig(vm["conf"].as<std::string>())};
Database::Db db {config->getPath("working-dir") / "lms.db"};
Database::Session session {db};
Db db {config->getPath("working-dir") / "lms.db"};
Session session {db};
std::cout << "Creating recommendation recommendationService..." << std::endl;
const auto recommendationService {Recommendation::createRecommendationService(db)};