Made compilation work with unity builds

src/libs/services/scanner/impl/steps/ScanStepAssociateArtistImages.cpp

@@ -51,7 +51,7 @@ namespace lms::scanner
         };
         using ArtistImageAssociationContainer = std::deque<ArtistImageAssociation>;
 
-        struct SearchImageContext
+        struct SearchArtistImageContext
         {
             db::Session& session;
             db::ArtistId lastRetrievedArtistId;
@@ -59,7 +59,7 @@ namespace lms::scanner
             std::span<const std::string> artistFileNames;
         };
 
-        db::Image::pointer findImageInDirectory(SearchImageContext& searchContext, const std::filesystem::path& directoryPath, std::span<const std::string> fileStemsToSearch)
+        db::Image::pointer findImageInDirectory(SearchArtistImageContext& searchContext, const std::filesystem::path& directoryPath, std::span<const std::string> fileStemsToSearch)
         {
             db::Image::pointer image;
 
@@ -85,7 +85,7 @@ namespace lms::scanner
             return image;
         }
 
-        db::Image::pointer getImageFromMbid(SearchImageContext& searchContext, const core::UUID& mbid)
+        db::Image::pointer getImageFromMbid(SearchArtistImageContext& searchContext, const core::UUID& mbid)
         {
             db::Image::pointer image;
 
@@ -98,7 +98,7 @@ namespace lms::scanner
             return image;
         }
 
-        db::Image::pointer searchImageInArtistInfoDirectory(SearchImageContext& searchContext, db::ArtistId artistId)
+        db::Image::pointer searchImageInArtistInfoDirectory(SearchArtistImageContext& searchContext, db::ArtistId artistId)
         {
             db::Image::pointer image;
 
@@ -116,7 +116,7 @@ namespace lms::scanner
             return image;
         }
 
-        db::Image::pointer searchImageInDirectories(SearchImageContext& searchContext, db::ArtistId artistId)
+        db::Image::pointer searchImageInDirectories(SearchArtistImageContext& searchContext, db::ArtistId artistId)
         {
             db::Image::pointer image;
 
@@ -169,7 +169,7 @@ namespace lms::scanner
             return image;
         }
 
-        db::Image::pointer computeBestArtistImage(SearchImageContext& searchContext, const db::Artist::pointer& artist)
+        db::Image::pointer computeBestArtistImage(SearchArtistImageContext& searchContext, const db::Artist::pointer& artist)
         {
             db::Image::pointer image;
 
@@ -185,7 +185,7 @@ namespace lms::scanner
             return image;
         }
 
-        bool fetchNextArtistImagesToUpdate(SearchImageContext& searchContext, ArtistImageAssociationContainer& artistImageAssociations)
+        bool fetchNextArtistImagesToUpdate(SearchArtistImageContext& searchContext, ArtistImageAssociationContainer& artistImageAssociations)
         {
             const db::ArtistId artistId{ searchContext.lastRetrievedArtistId };
 
@@ -271,7 +271,7 @@ namespace lms::scanner
             context.currentStepStats.totalElems = db::Artist::getCount(session);
         }
 
-        SearchImageContext searchContext{
+        SearchArtistImageContext searchContext{
             .session = session,
             .lastRetrievedArtistId = {},
             .artistFileNames = _artistFileNames,

src/libs/services/scanner/impl/steps/ScanStepAssociateExternalLyrics.cpp

@@ -32,9 +32,6 @@ namespace lms::scanner
 {
     namespace
     {
-        constexpr std::size_t readBatchSize{ 100 };
-        constexpr std::size_t writeBatchSize{ 20 };
-
         struct TrackLyricsAssociation
         {
             db::TrackLyricsId trackLyricsId;
@@ -83,6 +80,8 @@ namespace lms::scanner
 
         bool fetchNextTrackLyricsToUpdate(SearchTrackLyricsContext& searchContext, TrackLyricsAssociationContainer& trackLyricsAssociations)
         {
+            constexpr std::size_t readBatchSize{ 100 };
+
             const db::TrackLyricsId trackLyricsId{ searchContext.lastRetrievedTrackLyricsId };
 
             {
@@ -125,6 +124,8 @@ namespace lms::scanner
 
         void updateTrackLyrics(db::Session& session, TrackLyricsAssociationContainer& lyricsAssociations)
         {
+            constexpr std::size_t writeBatchSize{ 20 };
+
             while (!lyricsAssociations.empty())
             {
                 auto transaction{ session.createWriteTransaction() };

src/libs/services/scanner/impl/steps/ScanStepAssociatePlayListTracks.cpp

@@ -37,9 +37,6 @@ namespace lms::scanner
 {
     namespace
     {
-        constexpr std::size_t readBatchSize{ 20 };
-        constexpr std::size_t writeBatchSize{ 5 };
-
         struct TrackInfo
         {
             db::TrackId trackId;
@@ -118,6 +115,8 @@ namespace lms::scanner
             const db::PlayListFileId playListFileIdId{ searchContext.lastRetrievedPlayListFileId };
 
             {
+                constexpr std::size_t readBatchSize{ 20 };
+
                 auto transaction{ searchContext.session.createReadTransaction() };
 
                 db::PlayListFile::find(searchContext.session, searchContext.lastRetrievedPlayListFileId, readBatchSize, [&](const db::PlayListFile::pointer& playListFile) {
@@ -199,6 +198,8 @@ namespace lms::scanner
 
         void updatePlayListFiles(db::Session& session, PlayListFileAssociationContainer& playListFileAssociations)
         {
+            constexpr std::size_t writeBatchSize{ 5 };
+
             while (!playListFileAssociations.empty())
             {
                 auto transaction{ session.createWriteTransaction() };

src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp

@@ -38,9 +38,6 @@ namespace lms::scanner
 {
     namespace
     {
-        constexpr std::size_t readBatchSize{ 100 };
-        constexpr std::size_t writeBatchSize{ 20 };
-
         struct ReleaseImageAssociation
         {
             db::ReleaseId releaseId;
@@ -48,7 +45,7 @@ namespace lms::scanner
         };
         using ReleaseImageAssociationContainer = std::deque<ReleaseImageAssociation>;
 
-        struct SearchImageContext
+        struct SearchReleaseImageContext
         {
             db::Session& session;
             db::ReleaseId lastRetrievedReleaseId;
@@ -56,7 +53,7 @@ namespace lms::scanner
             const std::vector<std::string>& releaseFileNames;
         };
 
-        db::Image::pointer findImageInDirectory(SearchImageContext& searchContext, const std::filesystem::path& directoryPath)
+        db::Image::pointer findImageInDirectory(SearchReleaseImageContext& searchContext, const std::filesystem::path& directoryPath)
         {
             db::Image::pointer image;
 
@@ -82,7 +79,7 @@ namespace lms::scanner
             return image;
         }
 
-        db::Image::pointer computeBestReleaseImage(SearchImageContext& searchContext, const db::Release::pointer& release)
+        db::Image::pointer computeBestReleaseImage(SearchReleaseImageContext& searchContext, const db::Release::pointer& release)
         {
             db::Image::pointer image;
 
@@ -130,11 +127,13 @@ namespace lms::scanner
             return image;
         }
 
-        bool fetchNextReleaseImagesToUpdate(SearchImageContext& searchContext, ReleaseImageAssociationContainer& releaseImageAssociations)
+        bool fetchNextReleaseImagesToUpdate(SearchReleaseImageContext& searchContext, ReleaseImageAssociationContainer& releaseImageAssociations)
         {
             const db::ReleaseId releaseId{ searchContext.lastRetrievedReleaseId };
 
             {
+                constexpr std::size_t readBatchSize{ 100 };
+
                 auto transaction{ searchContext.session.createReadTransaction() };
 
                 db::Release::find(searchContext.session, searchContext.lastRetrievedReleaseId, readBatchSize, [&](const db::Release::pointer& release) {
@@ -166,6 +165,8 @@ namespace lms::scanner
 
         void updateReleaseImages(db::Session& session, ReleaseImageAssociationContainer& imageAssociations)
         {
+            constexpr std::size_t writeBatchSize{ 20 };
+
             while (!imageAssociations.empty())
             {
                 auto transaction{ session.createWriteTransaction() };
@@ -216,7 +217,7 @@ namespace lms::scanner
             context.currentStepStats.totalElems = db::Release::getCount(session);
         }
 
-        SearchImageContext searchContext{
+        SearchReleaseImageContext searchContext{
             .session = session,
             .lastRetrievedReleaseId = {},
             .releaseFileNames = _releaseFileNames,