From ac4baaac101e446fd5ccaffcb226f5a871aebfc4 Mon Sep 17 00:00:00 2001 From: emeric Date: Thu, 19 Dec 2024 20:36:50 +0100 Subject: [PATCH] Added some debug logs during scans, quite verbose --- .../services/scanner/impl/scanners/AudioFileScanner.cpp | 6 ++++++ .../services/scanner/impl/scanners/AudioFileScanner.hpp | 1 + .../services/scanner/impl/scanners/IFileScanOperation.hpp | 4 ++++ src/libs/services/scanner/impl/scanners/IFileScanner.hpp | 3 +++ .../services/scanner/impl/scanners/ImageFileScanner.cpp | 6 ++++++ .../services/scanner/impl/scanners/ImageFileScanner.hpp | 1 + .../services/scanner/impl/scanners/LyricsFileScanner.cpp | 6 ++++++ .../services/scanner/impl/scanners/LyricsFileScanner.hpp | 1 + .../services/scanner/impl/scanners/PlayListFileScanner.cpp | 6 ++++++ .../services/scanner/impl/scanners/PlayListFileScanner.hpp | 1 + src/libs/services/scanner/impl/steps/FileScanQueue.cpp | 2 ++ src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp | 2 ++ 12 files changed, 39 insertions(+) diff --git a/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp b/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp index 9a37f3bd..e440a030 100644 --- a/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp +++ b/src/libs/services/scanner/impl/scanners/AudioFileScanner.cpp @@ -325,6 +325,7 @@ namespace lms::scanner AudioFileScanOperation& operator=(const AudioFileScanOperation&) = delete; private: + const std::filesystem::path& getFile() const override { return _file; }; core::LiteralString getName() const override { return "ScanAudioFile"; } void scan() override; void processResult(ScanContext& context) override; @@ -603,6 +604,11 @@ namespace lms::scanner AudioFileScanner::~AudioFileScanner() = default; + core::LiteralString AudioFileScanner::getName() const + { + return "Audio scanner"; + } + std::span AudioFileScanner::getSupportedExtensions() const { return _metadataParser->getSupportedExtensions(); diff --git a/src/libs/services/scanner/impl/scanners/AudioFileScanner.hpp b/src/libs/services/scanner/impl/scanners/AudioFileScanner.hpp index 16ddf5e1..a79fbe4a 100644 --- a/src/libs/services/scanner/impl/scanners/AudioFileScanner.hpp +++ b/src/libs/services/scanner/impl/scanners/AudioFileScanner.hpp @@ -50,6 +50,7 @@ namespace lms::scanner AudioFileScanner& operator=(const AudioFileScanner&) = delete; private: + core::LiteralString getName() const override; std::span getSupportedExtensions() const override; bool needsScan(ScanContext& context, const FileToScan& file) const override; std::unique_ptr createScanOperation(const FileToScan& fileToScan) const override; diff --git a/src/libs/services/scanner/impl/scanners/IFileScanOperation.hpp b/src/libs/services/scanner/impl/scanners/IFileScanOperation.hpp index 4a9a2867..cbf828af 100644 --- a/src/libs/services/scanner/impl/scanners/IFileScanOperation.hpp +++ b/src/libs/services/scanner/impl/scanners/IFileScanOperation.hpp @@ -19,6 +19,8 @@ #pragma once +#include + #include "core/LiteralString.hpp" namespace lms::scanner @@ -31,6 +33,8 @@ namespace lms::scanner virtual ~IFileScanOperation() = default; virtual core::LiteralString getName() const = 0; + + virtual const std::filesystem::path& getFile() const = 0; virtual void scan() = 0; virtual void processResult(ScanContext& context) = 0; }; diff --git a/src/libs/services/scanner/impl/scanners/IFileScanner.hpp b/src/libs/services/scanner/impl/scanners/IFileScanner.hpp index 0a77470f..c0245fda 100644 --- a/src/libs/services/scanner/impl/scanners/IFileScanner.hpp +++ b/src/libs/services/scanner/impl/scanners/IFileScanner.hpp @@ -22,6 +22,8 @@ #include #include +#include "core/LiteralString.hpp" + #include "MediaLibraryInfo.hpp" namespace lms::scanner @@ -41,6 +43,7 @@ namespace lms::scanner public: virtual ~IFileScanner() = default; + virtual core::LiteralString getName() const = 0; virtual std::span getSupportedExtensions() const = 0; virtual bool needsScan(ScanContext& context, const FileToScan& file) const = 0; virtual std::unique_ptr createScanOperation(const FileToScan& fileToScan) const = 0; diff --git a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp index 8cb0362b..8f1278b8 100644 --- a/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp +++ b/src/libs/services/scanner/impl/scanners/ImageFileScanner.cpp @@ -46,6 +46,7 @@ namespace lms::scanner , _db{ db } {} private: + const std::filesystem::path& getFile() const override { return _file; }; core::LiteralString getName() const override { return "ScanImageFile"; } void scan() override; void processResult(ScanContext& context) override; @@ -134,6 +135,11 @@ namespace lms::scanner { } + core::LiteralString ImageFileScanner::getName() const + { + return "Image scanner"; + } + std::span ImageFileScanner::getSupportedExtensions() const { return image::getSupportedFileExtensions(); diff --git a/src/libs/services/scanner/impl/scanners/ImageFileScanner.hpp b/src/libs/services/scanner/impl/scanners/ImageFileScanner.hpp index d17d3225..a5ade2a6 100644 --- a/src/libs/services/scanner/impl/scanners/ImageFileScanner.hpp +++ b/src/libs/services/scanner/impl/scanners/ImageFileScanner.hpp @@ -42,6 +42,7 @@ namespace lms::scanner ImageFileScanner& operator=(const ImageFileScanner&) = delete; private: + core::LiteralString getName() const override; std::span getSupportedExtensions() const override; bool needsScan(ScanContext& context, const FileToScan& file) const override; std::unique_ptr createScanOperation(const FileToScan& fileToScan) const override; diff --git a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp index 433e162d..12e3e604 100644 --- a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp +++ b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.cpp @@ -46,6 +46,7 @@ namespace lms::scanner , _db{ db } {} private: + const std::filesystem::path& getFile() const override { return _file; }; core::LiteralString getName() const override { return "ScanLyricsFile"; } void scan() override; void processResult(ScanContext& context) override; @@ -137,6 +138,11 @@ namespace lms::scanner { } + core::LiteralString LyricsFileScanner::getName() const + { + return "Lyrics scanner"; + } + std::span LyricsFileScanner::getSupportedExtensions() const { return metadata::getSupportedLyricsFileExtensions(); diff --git a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.hpp b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.hpp index c6eba5a2..44fb2e1d 100644 --- a/src/libs/services/scanner/impl/scanners/LyricsFileScanner.hpp +++ b/src/libs/services/scanner/impl/scanners/LyricsFileScanner.hpp @@ -42,6 +42,7 @@ namespace lms::scanner LyricsFileScanner& operator=(const LyricsFileScanner&) = delete; private: + core::LiteralString getName() const override; std::span getSupportedExtensions() const override; bool needsScan(ScanContext& context, const FileToScan& file) const override; std::unique_ptr createScanOperation(const FileToScan& fileToScan) const override; diff --git a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp index 953a2265..4efdb469 100644 --- a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp +++ b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.cpp @@ -50,6 +50,7 @@ namespace lms::scanner PlayListFileScanOperation& operator=(const PlayListFileScanOperation&) = delete; private: + const std::filesystem::path& getFile() const override { return _file; }; core::LiteralString getName() const override { return "ScanPlayListFile"; } void scan() override; void processResult(ScanContext& context) override; @@ -136,6 +137,11 @@ namespace lms::scanner { } + core::LiteralString PlayListFileScanner::getName() const + { + return "PlayList scanner"; + } + std::span PlayListFileScanner::getSupportedExtensions() const { return metadata::getSupportedPlayListFileExtensions(); diff --git a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.hpp b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.hpp index 2a38a8ef..d61d7e67 100644 --- a/src/libs/services/scanner/impl/scanners/PlayListFileScanner.hpp +++ b/src/libs/services/scanner/impl/scanners/PlayListFileScanner.hpp @@ -42,6 +42,7 @@ namespace lms::scanner PlayListFileScanner& operator=(const PlayListFileScanner&) = delete; private: + core::LiteralString getName() const override; std::span getSupportedExtensions() const override; bool needsScan(ScanContext& context, const FileToScan& file) const override; std::unique_ptr createScanOperation(const FileToScan& fileToScan) const override; diff --git a/src/libs/services/scanner/impl/steps/FileScanQueue.cpp b/src/libs/services/scanner/impl/steps/FileScanQueue.cpp index 044d4482..d5b580a9 100644 --- a/src/libs/services/scanner/impl/steps/FileScanQueue.cpp +++ b/src/libs/services/scanner/impl/steps/FileScanQueue.cpp @@ -21,6 +21,7 @@ #include +#include "core/ILogger.hpp" #include "core/ITraceLogger.hpp" #include "scanners/IFileScanOperation.hpp" @@ -52,6 +53,7 @@ namespace lms::scanner { { LMS_SCOPED_TRACE_OVERVIEW("Scanner", operation->getName()); + LMS_LOG(DBUPDATER, DEBUG, operation->getName() << ": scanning file '" << operation->getFile().string() << "'"); operation->scan(); } diff --git a/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp b/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp index aafc0b63..cebece5b 100644 --- a/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp +++ b/src/libs/services/scanner/impl/steps/ScanStepScanFiles.cpp @@ -57,6 +57,7 @@ namespace lms::scanner { [[maybe_unused]] auto [it, inserted]{ _scannerByExtension.emplace(extension, scanner) }; assert(inserted); + LMS_LOG(DBUPDATER, INFO, "Registered extension '" << extension.string() << "' for '" << scanner->getName() << "'"); } } @@ -139,6 +140,7 @@ namespace lms::scanner if (_abortScan) return; + LMS_LOG(DBUPDATER, DEBUG, scanOperation->getName() << ": processing result for '" << scanOperation->getFile().string() << "'"); scanOperation->processResult(context); context.stats.scans++; }