Various minor cleanup

src/libs/services/scanner/impl/FileScanQueue.cpp

@@ -21,11 +21,8 @@
 
 #include <fstream>
 
-#include "core/Exception.hpp"
-#include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "core/Path.hpp"
 #include "image/Exception.hpp"
 #include "image/Image.hpp"
 #include "metadata/Exception.hpp"

src/libs/services/scanner/impl/FileScanQueue.hpp

@@ -23,7 +23,6 @@
 #include <deque>
 #include <filesystem>
 #include <mutex>
-#include <span>
 #include <variant>
 #include <vector>
 

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

@@ -23,6 +23,7 @@
 #include <cassert>
 #include <deque>
 #include <set>
+#include <span>
 
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
@@ -33,8 +34,6 @@
 #include "database/Image.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
-#include "image/Exception.hpp"
-#include "image/Image.hpp"
 
 namespace lms::scanner
 {
@@ -55,7 +54,7 @@ namespace lms::scanner
             db::Session& session;
             db::ArtistId lastRetrievedArtistId;
             std::size_t processedArtistCount{};
-            const std::vector<std::string>& artistFileNames;
+            std::span<const std::string> artistFileNames;
         };
 
         db::Image::pointer findImageInDirectory(SearchImageContext& searchContext, const std::filesystem::path& directoryPath)

src/libs/services/scanner/impl/ScanStepAssociateArtistImages.hpp

@@ -30,6 +30,9 @@ namespace lms::scanner
     {
     public:
         ScanStepAssociateArtistImages(InitParams& initParams);
+        ~ScanStepAssociateArtistImages() override = default;
+        ScanStepAssociateArtistImages(const ScanStepAssociateArtistImages&) = delete;
+        ScanStepAssociateArtistImages& operator=(const ScanStepAssociateArtistImages&) = delete;
 
     private:
         ScanStep getStep() const override { return ScanStep::AssociateArtistImages; }

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

@@ -33,8 +33,6 @@
 #include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
-#include "image/Exception.hpp"
-#include "image/Image.hpp"
 
 namespace lms::scanner
 {

src/libs/services/scanner/impl/ScanStepAssociateReleaseImages.hpp

@@ -30,6 +30,9 @@ namespace lms::scanner
     {
     public:
         ScanStepAssociateReleaseImages(InitParams& initParams);
+        ~ScanStepAssociateReleaseImages() override = default;
+        ScanStepAssociateReleaseImages(const ScanStepAssociateReleaseImages&) = delete;
+        ScanStepAssociateReleaseImages& operator=(const ScanStepAssociateReleaseImages&) = delete;
 
     private:
         ScanStep getStep() const override { return ScanStep::AssociateReleaseImages; }

src/libs/services/scanner/impl/ScanStepBase.hpp

@@ -55,6 +55,8 @@ namespace lms::scanner
         }
 
     protected:
+        ~ScanStepBase() override = default;
+
         const ScannerSettings& _settings;
         ProgressCallback _progressCallback;
         bool& _abortScan;

src/libs/services/scanner/impl/ScanStepComputeClusterStats.cpp

@@ -19,7 +19,6 @@
 
 #include "ScanStepComputeClusterStats.hpp"
 #include "core/ILogger.hpp"
-#include "core/Path.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"
 #include "database/Session.hpp"

src/libs/services/scanner/impl/ScanStepRemoveOrphanedDbEntries.cpp

@@ -20,7 +20,6 @@
 #include "ScanStepRemoveOrphanedDbEntries.hpp"
 
 #include "core/ILogger.hpp"
-#include "core/Path.hpp"
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"

src/libs/services/scanner/impl/ScanStepRemoveOrphanedDbEntries.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <filesystem>
-
 #include "ScanStepBase.hpp"
 
 namespace lms::scanner

src/libs/services/scanner/impl/ScanStepScanFiles.cpp

@@ -36,7 +36,6 @@
 #include "database/TrackArtistLink.hpp"
 #include "database/TrackFeatures.hpp"
 #include "database/TrackLyrics.hpp"
-#include "metadata/Exception.hpp"
 #include "metadata/IParser.hpp"
 
 namespace lms::scanner
@@ -391,9 +390,9 @@ namespace lms::scanner
 
             if (readStyle == "fast")
                 return metadata::ParserReadStyle::Fast;
-            else if (readStyle == "average")
+            if (readStyle == "average")
                 return metadata::ParserReadStyle::Average;
-            else if (readStyle == "accurate")
+            if (readStyle == "accurate")
                 return metadata::ParserReadStyle::Accurate;
 
             throw core::LmsException{ "Invalid value for 'scanner-parser-read-style'" };
@@ -888,16 +887,9 @@ namespace lms::scanner
             return;
         }
 
-        bool added;
+        const bool added{ !image };
         if (!image)
-        {
             image = dbSession.create<db::Image>(file);
-            added = true;
-        }
-        else
-        {
-            added = false;
-        }
 
         image.modify()->setLastWriteTime(fileInfo->lastWriteTime);
         image.modify()->setFileSize(fileInfo->fileSize);
@@ -945,16 +937,11 @@ namespace lms::scanner
             return;
         }
 
-        bool added;
+        const bool added{ !trackLyrics };
         if (!trackLyrics)
         {
             trackLyrics = dbSession.create<db::TrackLyrics>();
             trackLyrics.modify()->setAbsoluteFilePath(file);
-            added = true;
-        }
-        else
-        {
-            added = false;
         }
 
         trackLyrics.modify()->setLastWriteTime(fileInfo->lastWriteTime);

src/libs/services/scanner/impl/ScanStepScanFiles.hpp

@@ -47,9 +47,9 @@ namespace lms::scanner
         bool checkLyricsFileNeedScan(ScanContext& context, const std::filesystem::path& file);
 
         void processFileScanResults(ScanContext& context, std::span<const FileScanResult> scanResults, const ScannerSettings::MediaLibraryInfo& libraryInfo);
-        void processAudioFileScanData(ScanContext& context, const std::filesystem::path& path, const metadata::Track* trackMetadata, const ScannerSettings::MediaLibraryInfo& libraryInfo);
-        void processImageFileScanData(ScanContext& context, const std::filesystem::path& path, const ImageInfo* imageInfo, const ScannerSettings::MediaLibraryInfo& libraryInfo);
-        void processLyricsFileScanData(ScanContext& context, const std::filesystem::path& path, const metadata::Lyrics* lyrics, const ScannerSettings::MediaLibraryInfo& libraryInfo);
+        void processAudioFileScanData(ScanContext& context, const std::filesystem::path& file, const metadata::Track* trackMetadata, const ScannerSettings::MediaLibraryInfo& libraryInfo);
+        void processImageFileScanData(ScanContext& context, const std::filesystem::path& file, const ImageInfo* imageInfo, const ScannerSettings::MediaLibraryInfo& libraryInfo);
+        void processLyricsFileScanData(ScanContext& context, const std::filesystem::path& file, const metadata::Lyrics* lyrics, const ScannerSettings::MediaLibraryInfo& libraryInfo);
 
         std::unique_ptr<metadata::IParser> _metadataParser;
         const std::vector<std::string> _extraTagsToParse;

src/libs/services/scanner/impl/ScanStepUpdateLibraryFields.cpp

@@ -19,8 +19,6 @@
 
 #include "ScanStepUpdateLibraryFields.hpp"
 
-#include "core/ILogger.hpp"
-#include "core/Path.hpp"
 #include "database/Db.hpp"
 #include "database/Directory.hpp"
 #include "database/MediaLibrary.hpp"

src/libs/services/scanner/impl/ScanStepUpdateLibraryFields.hpp

@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include "database/DirectoryId.hpp"
-
 #include "ScanStepBase.hpp"
 
 namespace lms::scanner

src/libs/services/scanner/impl/ScannerService.cpp

@@ -21,11 +21,9 @@
 
 #include <ctime>
 
-#include "core/Exception.hpp"
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
-#include "core/Path.hpp"
 #include "database/MediaLibrary.hpp"
 #include "database/ScanSettings.hpp"
 #include "database/TrackFeatures.hpp"

src/libs/services/scanner/impl/ScannerService.hpp

@@ -31,10 +31,8 @@
 
 #include "IScanStep.hpp"
 #include "ScannerSettings.hpp"
-#include "core/Path.hpp"
 #include "database/Db.hpp"
 #include "database/Session.hpp"
-#include "database/Types.hpp"
 #include "services/scanner/IScannerService.hpp"
 
 namespace lms::scanner
@@ -44,11 +42,10 @@ namespace lms::scanner
     public:
         ScannerService(db::Db& db);
         ~ScannerService() override;
-
-    private:
         ScannerService(const ScannerService&) = delete;
         ScannerService& operator=(const ScannerService&) = delete;
 
+    private:
         void requestReload() override;
         void requestImmediateScan(const ScanOptions& scanOptions) override;
 
@@ -83,7 +80,7 @@ namespace lms::scanner
         Wt::WIOService _ioService;
         boost::asio::system_timer _scheduleTimer{ _ioService };
         Events _events;
-        std::chrono::system_clock::time_point _lastScanInProgressEmit{};
+        std::chrono::system_clock::time_point _lastScanInProgressEmit;
         db::Db& _db;
 
         mutable std::shared_mutex _statusMutex;