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

Made database ID manipulations safer

Browse Source
This commit is contained in:
emeric
2021-09-20 23:53:38 +02:00
parent 598f01069e
commit 441aed622c
138 changed files with 2164 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/cover/LmsCover.cpp
+3 -3
View File
@@ -38,15 +38,15 @@ static
void
dumpTrackCovers(Database::Session& session, CoverArt::ImageSize width)
{
std::vector<Database::IdType> trackIds;
std::vector<Database::TrackId> trackIds;
{
auto transaction {session.createSharedTransaction()};
trackIds = Database::Track::getAllIds(session);
}
for (Database::IdType trackId : trackIds)
for (const Database::TrackId trackId : trackIds)
{
std::cout << "Getting cover for track id " << trackId << std::endl;
std::cout << "Getting cover for track id " << trackId.toString() << std::endl;
Service<CoverArt::IGrabber>::get()->getFromTrack(session, trackId, width);
}
}
src/tools/recommendation/LmsRecommendation.cpp
+18 -18
View File
@@ -39,16 +39,16 @@ static
void
dumpTracksRecommendation(Database::Session session, Recommendation::IEngine& engine, unsigned maxSimilarityCount)
{
const std::vector<Database::IdType> trackIds {[&]()
const std::vector<Database::TrackId> trackIds {[&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Track::getAllIds(session);
}()};
std::cout << "*** Tracks (" << trackIds.size() << ") ***" << std::endl;
for (Database::IdType trackId : trackIds)
for (Database::TrackId trackId : trackIds)
{
auto trackToString = [&](Database::IdType trackId)
auto trackToString = [&](Database::TrackId trackId)
{
std::string res;
auto transaction {session.createSharedTransaction()};
@@ -66,7 +66,7 @@ dumpTracksRecommendation(Database::Session session, Recommendation::IEngine& eng
};
std::cout << "Processing track '" << trackToString(trackId) << std::endl;
for (Database::IdType similarTrackId : engine.getSimilarTracks(session, {trackId}, maxSimilarityCount))
for (Database::TrackId similarTrackId : engine.getSimilarTracks(session, {trackId}, maxSimilarityCount))
std::cout << "\t- Similar track '" << trackToString(similarTrackId) << std::endl;
}
}
@@ -75,16 +75,16 @@ static
void
dumpReleasesRecommendation(Database::Session session, Recommendation::IEngine& engine, unsigned maxSimilarityCount)
{
const std::vector<Database::IdType> releaseIds = std::invoke([&]()
{
const std::vector<Database::ReleaseId> releaseIds = std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Release::getAllIds(session);
});
});
std::cout << "*** Releases ***" << std::endl;
for (Database::IdType releaseId : releaseIds)
for (Database::ReleaseId releaseId : releaseIds)
{
auto releaseToString = [&](Database::IdType releaseId)
auto releaseToString = [&](Database::ReleaseId releaseId)
{
auto transaction {session.createSharedTransaction()};
@@ -93,7 +93,7 @@ dumpReleasesRecommendation(Database::Session session, Recommendation::IEngine& e
};
std::cout << "Processing release '" << releaseToString(releaseId) << "'" << std::endl;
for (Database::IdType similarReleaseId : engine.getSimilarReleases(session, releaseId, maxSimilarityCount))
for (Database::ReleaseId similarReleaseId : engine.getSimilarReleases(session, releaseId, maxSimilarityCount))
std::cout << "\t- Similar release '" << releaseToString(similarReleaseId) << "'" << std::endl;
}
}
@@ -102,16 +102,16 @@ static
void
dumpArtistsRecommendation(Database::Session session, Recommendation::IEngine& engine, unsigned maxSimilarityCount)
{
const std::vector<Database::IdType> artistIds = std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Artist::getAllIds(session);
});
const std::vector<Database::ArtistId> artistIds = std::invoke([&]()
{
auto transaction {session.createSharedTransaction()};
return Database::Artist::getAllIds(session);
});
std::cout << "*** Artists ***" << std::endl;
for (Database::IdType artistId : artistIds)
for (Database::ArtistId artistId : artistIds)
{
auto artistToString = [&](Database::IdType artistId)
auto artistToString = [&](Database::ArtistId artistId)
{
auto transaction {session.createSharedTransaction()};
@@ -120,7 +120,7 @@ dumpArtistsRecommendation(Database::Session session, Recommendation::IEngine& en
};
std::cout << "Processing artist '" << artistToString(artistId) << "'" << std::endl;
for (Database::IdType similarArtistId : engine.getSimilarArtists(session, artistId, {Database::TrackArtistLinkType::Artist, Database::TrackArtistLinkType::ReleaseArtist}, maxSimilarityCount))
for (Database::ArtistId similarArtistId : engine.getSimilarArtists(session, artistId, {Database::TrackArtistLinkType::Artist, Database::TrackArtistLinkType::ReleaseArtist}, maxSimilarityCount))
{
std::cout << "\t- Similar artist '" << artistToString(similarArtistId) << "'" << std::endl;
}