From c1b73f9b76dd3d91d08310922cd03f0f836bb661 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Mon, 23 Jun 2025 20:26:12 +0200
Subject: [PATCH] Minor cleanup

---
 .../impl/steps/ScanStepAssociateTrackImages.cpp        | 10 +++-------
 .../impl/steps/ScanStepCheckForRemovedFiles.cpp        |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
index bf4da692..6d32e21f 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepAssociateTrackImages.cpp
@@ -126,11 +126,7 @@ namespace lms::scanner
 
             // Fallback on the artwork already resolved for the release
             if (const db::Release::pointer release{ db::Release::find(searchContext.session, releaseId) })
-            {
-                db::ArtworkId artworkId{ release->getPreferredArtworkId() };
-                if (artworkId.isValid())
-                    res = artworkId;
-            }
+                res = release->getPreferredArtworkId();
 
             return res;
         }
@@ -203,7 +199,7 @@ namespace lms::scanner
                 artwork = db::Artwork::find(session, *artworkId);
 
             // Using track.modify() is quite CPU intensive as the track class has too many fields
-            db::Track::updatePreferredArtwork(session, track->getId(), artwork->getId());
+            db::Track::updatePreferredArtwork(session, track->getId(), artwork ? artwork->getId() : db::ArtworkId{});
             if (artwork)
                 LMS_LOG(DBUPDATER, DEBUG, "Updated preferred artwork in track " << track->getAbsoluteFilePath() << " with image in " << utils::toPath(session, artwork->getId()));
             else
@@ -219,7 +215,7 @@ namespace lms::scanner
                 artwork = db::Artwork::find(session, *artworkId);
 
             // Using track.modify() is quite CPU intensive as the track class has too many fields
-            db::Track::updatePreferredMediaArtwork(session, track->getId(), artwork->getId());
+            db::Track::updatePreferredMediaArtwork(session, track->getId(), artwork ? artwork->getId() : db::ArtworkId{});
             if (artwork)
                 LMS_LOG(DBUPDATER, DEBUG, "Updated preferred media artwork in track '" << track->getAbsoluteFilePath() << "' with image in " << utils::toPath(session, artwork->getId()));
             else
diff --git a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
index 35a1eeb1..e1707efb 100644
--- a/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
+++ b/src/libs/services/scanner/impl/steps/ScanStepCheckForRemovedFiles.cpp
@@ -36,11 +36,6 @@
 
 namespace lms::scanner
 {
-    namespace
-    {
-        constexpr std::size_t batchSize = 100;
-    }
-
     bool ScanStepCheckForRemovedFiles::needProcess([[maybe_unused]] const ScanContext& context) const
     {
         // always check for removed files
@@ -90,6 +85,8 @@ namespace lms::scanner
 
             objectsToRemove.clear();
             {
+                constexpr std::size_t batchSize = 100;
+
                 auto transaction{ session.createReadTransaction() };
 
                 endReached = true;