From 67db09685d400d98fa15f454ce7eac52cb1db0df Mon Sep 17 00:00:00 2001 From: emeric Date: Sat, 21 Jun 2025 18:52:57 +0200 Subject: [PATCH] Fixed unity build --- .../steps/ScanStepAssociateReleaseImages.cpp | 18 ++++++------ .../steps/ScanStepAssociateTrackImages.cpp | 28 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp index 9833701e..b76c9611 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateReleaseImages.cpp @@ -45,8 +45,8 @@ namespace lms::scanner { namespace { - using Artwork = std::variant; - bool isSameArtwork(Artwork preferredArtwork, const db::ObjectPtr& artwork) + using ReleaseArtwork = std::variant; + bool isSameArtwork(ReleaseArtwork preferredArtwork, const db::ObjectPtr& artwork) { if (std::holds_alternative(preferredArtwork)) return !artwork; @@ -63,7 +63,7 @@ namespace lms::scanner struct ReleaseImageAssociation { db::ReleaseId releaseId; - Artwork preferredArtwork; + ReleaseArtwork preferredArtwork; }; using ReleaseImageAssociationContainer = std::deque; @@ -149,11 +149,11 @@ namespace lms::scanner return image; } - Artwork computePreferredReleaseArtwork(SearchReleaseImageContext& searchContext, const db::Release::pointer& release) + ReleaseArtwork computePreferredReleaseArtwork(SearchReleaseImageContext& searchContext, const db::Release::pointer& release) { const db::Image::pointer image{ computePreferredReleaseImage(searchContext, release) }; if (image) - return Artwork{ image->getId() }; + return ReleaseArtwork{ image->getId() }; // Fallback on embedded Front image db::TrackEmbeddedImageId trackEmbeddedImageId; @@ -168,7 +168,7 @@ namespace lms::scanner } if (trackEmbeddedImageId.isValid()) - return Artwork{ trackEmbeddedImageId }; + return ReleaseArtwork{ trackEmbeddedImageId }; // Fallback on embedded media image { @@ -182,9 +182,9 @@ namespace lms::scanner } if (trackEmbeddedImageId.isValid()) - return Artwork{ trackEmbeddedImageId }; + return ReleaseArtwork{ trackEmbeddedImageId }; - return Artwork{}; + return ReleaseArtwork{}; } bool fetchNextReleaseArtworksToUpdate(SearchReleaseImageContext& searchContext, ReleaseImageAssociationContainer& releaseImageAssociations) @@ -197,7 +197,7 @@ namespace lms::scanner auto transaction{ searchContext.session.createReadTransaction() }; db::Release::find(searchContext.session, searchContext.lastRetrievedReleaseId, readBatchSize, [&](const db::Release::pointer& release) { - const Artwork preferredArtwork{ computePreferredReleaseArtwork(searchContext, release) }; + const ReleaseArtwork preferredArtwork{ computePreferredReleaseArtwork(searchContext, release) }; const db::Artwork::pointer currentPreferredArtwork{ release->getPreferredArtwork() }; if (!isSameArtwork(preferredArtwork, currentPreferredArtwork)) diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp index e1a0526e..346bc09d 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp @@ -42,8 +42,8 @@ namespace lms::scanner namespace { // May come from an embedded image in a track, or from what has been previously resolved for the release - using Artwork = std::variant; - bool isSameArtwork(Artwork preferredArtwork, const db::ObjectPtr& artwork) + using TrackArtwork = std::variant; + bool isSameArtwork(TrackArtwork preferredArtwork, const db::ObjectPtr& artwork) { if (std::holds_alternative(preferredArtwork)) return !artwork; @@ -57,7 +57,7 @@ namespace lms::scanner return false; } - bool isValid(const Artwork& res) + bool isValid(const TrackArtwork& res) { return !std::holds_alternative(res); } @@ -65,8 +65,8 @@ namespace lms::scanner struct TrackImageAssociation { db::Track::pointer track; - Artwork preferredArtwork; - Artwork preferredMediaArtwork; + TrackArtwork preferredArtwork; + TrackArtwork preferredMediaArtwork; }; using TrackImageAssociationContainer = std::deque; @@ -77,10 +77,10 @@ namespace lms::scanner std::size_t processedTrackCount{}; }; - Artwork computePreferredTrackArtwork(SearchTrackImageContext& searchContext, const db::Track::pointer& track) + TrackArtwork computePreferredTrackArtwork(SearchTrackImageContext& searchContext, const db::Track::pointer& track) { // Try to get a media image - Artwork res; + TrackArtwork res; { db::TrackEmbeddedImage::FindParameters params; params.setTrack(track->getId()); @@ -96,7 +96,7 @@ namespace lms::scanner // Fallback on another track of the same disc const db::ReleaseId releaseId{ track->getReleaseId() }; if (!releaseId.isValid()) - return Artwork{}; + return res; { db::TrackEmbeddedImage::FindParameters params; @@ -135,9 +135,9 @@ namespace lms::scanner return res; } - Artwork computePreferredTrackMediaArtwork(SearchTrackImageContext& searchContext, const db::Track::pointer& track) + TrackArtwork computePreferredTrackMediaArtwork(SearchTrackImageContext& searchContext, const db::Track::pointer& track) { - Artwork res; + TrackArtwork res; { db::TrackEmbeddedImage::FindParameters params; params.setTrack(track->getId()); @@ -175,8 +175,8 @@ namespace lms::scanner auto transaction{ searchContext.session.createReadTransaction() }; db::Track::find(searchContext.session, searchContext.lastRetrievedTrackId, readBatchSize, [&](const db::Track::pointer& track) { - const Artwork preferredArtwork{ computePreferredTrackArtwork(searchContext, track) }; - const Artwork preferredMediaArtwork{ computePreferredTrackMediaArtwork(searchContext, track) }; + const TrackArtwork preferredArtwork{ computePreferredTrackArtwork(searchContext, track) }; + const TrackArtwork preferredMediaArtwork{ computePreferredTrackMediaArtwork(searchContext, track) }; const db::Artwork::pointer currentPreferredArtwork{ track->getPreferredArtwork() }; const db::Artwork::pointer currentPreferredMediaArtwork{ track->getPreferredMediaArtwork() }; @@ -194,7 +194,7 @@ namespace lms::scanner return trackId != searchContext.lastRetrievedTrackId; } - void updateTrackPreferredArtwork(db::Session& session, db::Track::pointer& track, Artwork preferredArtwork) + void updateTrackPreferredArtwork(db::Session& session, db::Track::pointer& track, TrackArtwork preferredArtwork) { db::Artwork::pointer artwork; if (const db::TrackEmbeddedImageId * trackEmbeddedImageId{ std::get_if(&preferredArtwork) }) @@ -210,7 +210,7 @@ namespace lms::scanner LMS_LOG(DBUPDATER, DEBUG, "Removed preferred artwork from track " << track->getAbsoluteFilePath()); } - void updateTrackPreferredMediaArtwork(db::Session& session, db::Track::pointer& track, Artwork preferredArtwork) + void updateTrackPreferredMediaArtwork(db::Session& session, db::Track::pointer& track, TrackArtwork preferredArtwork) { db::Artwork::pointer artwork; if (const db::TrackEmbeddedImageId * trackEmbeddedImageId{ std::get_if(&preferredArtwork) })