From 45175a721cd5abe51ef00b4f1aacf9db7abcc391 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Thu, 5 Dec 2024 20:09:14 +0100
Subject: [PATCH] Various minor cleanup

---
 src/libs/av/impl/Transcoder.cpp               |  7 ++--
 src/libs/av/impl/Transcoder.hpp               |  3 --
 .../av/impl/TranscodingResourceHandler.cpp    | 24 ++++++-------
 .../av/impl/TranscodingResourceHandler.hpp    |  7 ++--
 .../av/include/av/TranscodingParameters.hpp   |  4 +--
 src/libs/core/bench/TraceLoggerBench.cpp      |  4 +--
 src/libs/core/impl/ArchiveZipper.cpp          | 16 ++++-----
 src/libs/core/impl/ArchiveZipper.hpp          |  3 +-
 src/libs/core/impl/ChildProcess.hpp           |  5 ++-
 src/libs/core/impl/ChildProcessManager.hpp    |  3 +-
 src/libs/core/impl/Config.cpp                 |  1 -
 src/libs/core/impl/Config.hpp                 |  4 +--
 src/libs/core/impl/TraceLogger.cpp            |  4 ++-
 src/libs/core/test/String.cpp                 |  2 +-
 src/libs/database/impl/Artist.cpp             | 12 +++----
 src/libs/database/impl/Db.cpp                 |  1 -
 src/libs/database/impl/Image.cpp              |  4 +--
 src/libs/database/include/database/Artist.hpp | 18 +++++-----
 src/libs/image/impl/SvgImage.cpp              |  1 +
 src/libs/image/impl/SvgImage.hpp              |  8 ++---
 src/libs/image/impl/stb/JPEGImage.cpp         |  6 ++--
 src/libs/image/impl/stb/RawImage.cpp          |  4 +--
 src/libs/image/impl/stb/RawImage.hpp          |  8 +++--
 src/libs/image/include/image/IRawImage.hpp    |  2 ++
 src/libs/metadata/impl/AvFormatTagReader.cpp  |  6 +---
 src/libs/metadata/impl/AvFormatTagReader.hpp  |  5 ++-
 .../services/scanner/impl/ScannerService.hpp  |  3 +-
 src/libs/subsonic/impl/ProtocolVersion.hpp    |  3 ++
 src/libs/subsonic/impl/SubsonicId.cpp         | 17 ----------
 src/libs/subsonic/impl/SubsonicId.hpp         |  8 -----
 src/libs/subsonic/impl/SubsonicResource.cpp   | 34 +++++++++----------
 src/libs/subsonic/impl/SubsonicResource.hpp   |  3 --
 src/libs/subsonic/impl/SubsonicResponse.cpp   |  1 -
 .../impl/SubsonicResponseAllocator.hpp        |  4 +--
 src/lms/ui/admin/UserView.cpp                 |  6 ++--
 35 files changed, 104 insertions(+), 137 deletions(-)

diff --git a/src/libs/av/impl/Transcoder.cpp b/src/libs/av/impl/Transcoder.cpp
index 760376ef..d9c9821f 100644
--- a/src/libs/av/impl/Transcoder.cpp
+++ b/src/libs/av/impl/Transcoder.cpp
@@ -25,9 +25,10 @@
 #include "core/IChildProcessManager.hpp"
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
-#include "core/Path.hpp"
 #include "core/Service.hpp"
 
+#include "av/Types.hpp"
+
 namespace lms::av::transcoding
 {
 
@@ -81,7 +82,7 @@ namespace lms::av::transcoding
         {
             if (!std::filesystem::exists(_inputParameters.trackPath))
                 throw Exception{ "File '" + _inputParameters.trackPath.string() + "' does not exist!" };
-            else if (!std::filesystem::is_regular_file(_inputParameters.trackPath))
+            if (!std::filesystem::is_regular_file(_inputParameters.trackPath))
                 throw Exception{ "File '" + _inputParameters.trackPath.string() + "' is not regular!" };
         }
         catch (const std::filesystem::filesystem_error& e)
@@ -108,7 +109,7 @@ namespace lms::av::transcoding
             args.emplace_back("-ss");
 
             std::ostringstream oss;
-            oss << std::fixed << std::showpoint << std::setprecision(3) << (_outputParameters.offset.count() / float{ 1000 });
+            oss << std::fixed << std::showpoint << std::setprecision(3) << (_outputParameters.offset.count() / float{ 1'000 });
             args.emplace_back(oss.str());
         }
 
diff --git a/src/libs/av/impl/Transcoder.hpp b/src/libs/av/impl/Transcoder.hpp
index 4e24c4f3..3b226dff 100644
--- a/src/libs/av/impl/Transcoder.hpp
+++ b/src/libs/av/impl/Transcoder.hpp
@@ -19,11 +19,9 @@
 
 #pragma once
 
-#include <filesystem>
 #include <functional>
 
 #include "av/TranscodingParameters.hpp"
-#include "av/Types.hpp"
 
 namespace lms::core
 {
@@ -37,7 +35,6 @@ namespace lms::av::transcoding
     public:
         Transcoder(const InputParameters& inputParameters, const OutputParameters& outputParameters);
         ~Transcoder();
-
         Transcoder(const Transcoder&) = delete;
         Transcoder& operator=(const Transcoder&) = delete;
         Transcoder(Transcoder&&) = delete;
diff --git a/src/libs/av/impl/TranscodingResourceHandler.cpp b/src/libs/av/impl/TranscodingResourceHandler.cpp
index 09932835..611c87c8 100644
--- a/src/libs/av/impl/TranscodingResourceHandler.cpp
+++ b/src/libs/av/impl/TranscodingResourceHandler.cpp
@@ -59,7 +59,7 @@ namespace lms::av::transcoding
         {
             LMS_LOG(TRANSCODING, DEBUG, "Writing " << _bytesReadyCount << " bytes back to client");
 
-            response.out().write(reinterpret_cast<const char*>(&_buffer[0]), _bytesReadyCount);
+            response.out().write(reinterpret_cast<const char*>(_buffer.data()), _bytesReadyCount);
             _totalServedByteCount += _bytesReadyCount;
             _bytesReadyCount = 0;
         }
@@ -78,24 +78,22 @@ namespace lms::av::transcoding
 
             return continuation;
         }
-        else
+
+        // pad with 0 if necessary as duration may not be accurate
+        if (_estimatedContentLength && *_estimatedContentLength > _totalServedByteCount)
         {
-            // pad with 0 if necessary as duration may not be accurate
-            if (_estimatedContentLength && *_estimatedContentLength > _totalServedByteCount)
-            {
-                const std::size_t padSize{ *_estimatedContentLength - _totalServedByteCount };
+            const std::size_t padSize{ *_estimatedContentLength - _totalServedByteCount };
 
-                LMS_LOG(TRANSCODING, DEBUG, "Adding " << padSize << " padding bytes");
+            LMS_LOG(TRANSCODING, DEBUG, "Adding " << padSize << " padding bytes");
 
-                for (std::size_t i{}; i < padSize; ++i)
-                    response.out().put(0);
+            for (std::size_t i{}; i < padSize; ++i)
+                response.out().put(0);
 
-                _totalServedByteCount += padSize;
-            }
-
-            LMS_LOG(TRANSCODING, DEBUG, "Transcoding finished. Total served byte count = " << _totalServedByteCount);
+            _totalServedByteCount += padSize;
         }
 
+        LMS_LOG(TRANSCODING, DEBUG, "Transcoding finished. Total served byte count = " << _totalServedByteCount);
+
         return {};
     }
 } // namespace lms::av::transcoding
diff --git a/src/libs/av/impl/TranscodingResourceHandler.hpp b/src/libs/av/impl/TranscodingResourceHandler.hpp
index 037ebe16..6e5aa516 100644
--- a/src/libs/av/impl/TranscodingResourceHandler.hpp
+++ b/src/libs/av/impl/TranscodingResourceHandler.hpp
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <array>
-#include <filesystem>
 #include <optional>
 
 #include "av/TranscodingParameters.hpp"
@@ -34,9 +33,13 @@ namespace lms::av::transcoding
     {
     public:
         TranscodingResourceHandler(const InputParameters& inputParameters, const OutputParameters& outputParameters, bool estimateContentLength);
+        ~TranscodingResourceHandler() override = default;
+
+        TranscodingResourceHandler(const TranscodingResourceHandler&) = delete;
+        TranscodingResourceHandler& operator=(const TranscodingResourceHandler&) = delete;
 
     private:
-        Wt::Http::ResponseContinuation* processRequest(const Wt::Http::Request& request, Wt::Http::Response& reponse) override;
+        Wt::Http::ResponseContinuation* processRequest(const Wt::Http::Request& request, Wt::Http::Response& response) override;
         void abort() override{};
 
         static constexpr std::size_t _chunkSize{ 262'144 };
diff --git a/src/libs/av/include/av/TranscodingParameters.hpp b/src/libs/av/include/av/TranscodingParameters.hpp
index cc2a9a79..a2f9516b 100644
--- a/src/libs/av/include/av/TranscodingParameters.hpp
+++ b/src/libs/av/include/av/TranscodingParameters.hpp
@@ -23,8 +23,6 @@
 #include <filesystem>
 #include <optional>
 
-#include "Types.hpp"
-
 namespace lms::av::transcoding
 {
     struct InputParameters
@@ -47,7 +45,7 @@ namespace lms::av::transcoding
     struct OutputParameters
     {
         OutputFormat format;
-        std::size_t bitrate{ 128000 };
+        std::size_t bitrate{ 128'000 };
         std::optional<std::size_t> stream; // Id of the stream to be transcoded (auto detect by default)
         std::chrono::milliseconds offset{ 0 };
         bool stripMetadata{ true };
diff --git a/src/libs/core/bench/TraceLoggerBench.cpp b/src/libs/core/bench/TraceLoggerBench.cpp
index 1134fb42..ac3eb591 100644
--- a/src/libs/core/bench/TraceLoggerBench.cpp
+++ b/src/libs/core/bench/TraceLoggerBench.cpp
@@ -29,8 +29,8 @@
 namespace lms::core
 {
     // The trace logger is meant to built/destroyed once
-    Service<logging::ILogger> logger{ std::make_unique<logging::StreamLogger>(std::cout, logging::StreamLogger::allSeverities) };
-    Service<tracing::ITraceLogger> traceLogger{ tracing::createTraceLogger(tracing::Level::Overview) };
+    const Service<logging::ILogger> logger{ std::make_unique<logging::StreamLogger>(std::cout, logging::StreamLogger::allSeverities) };
+    const Service<tracing::ITraceLogger> traceLogger{ tracing::createTraceLogger(tracing::Level::Overview) };
 
     static void BM_TraceLogger_Overview(benchmark::State& state)
     {
diff --git a/src/libs/core/impl/ArchiveZipper.cpp b/src/libs/core/impl/ArchiveZipper.cpp
index 5f3fcecd..b677ac2e 100644
--- a/src/libs/core/impl/ArchiveZipper.cpp
+++ b/src/libs/core/impl/ArchiveZipper.cpp
@@ -217,14 +217,14 @@ namespace lms::zip
             if (!std::filesystem::is_regular_file(entry.filePath))
                 throw FileException{ entry.filePath, "not a regular file" };
 
-            ArchiveEntryPtr archiveEntry{ archive_entry_new() };
+            ArchiveEntryPtr archiveEntry{ ::archive_entry_new() };
             if (!archiveEntry)
                 throw Exception{ "Cannot create archive entry control struct" };
 
-            archive_entry_set_pathname(archiveEntry.get(), entry.fileName.c_str());
-            archive_entry_set_size(archiveEntry.get(), std::filesystem::file_size(entry.filePath));
-            archive_entry_set_mode(archiveEntry.get(), permsToMode(std::filesystem::status(entry.filePath).permissions()));
-            archive_entry_set_filetype(archiveEntry.get(), AE_IFREG);
+            ::archive_entry_set_pathname(archiveEntry.get(), entry.fileName.c_str());
+            ::archive_entry_set_size(archiveEntry.get(), std::filesystem::file_size(entry.filePath));
+            ::archive_entry_set_mode(archiveEntry.get(), permsToMode(std::filesystem::status(entry.filePath).permissions()));
+            ::archive_entry_set_filetype(archiveEntry.get(), AE_IFREG);
 
             return archiveEntry;
         }
@@ -256,7 +256,7 @@ namespace lms::zip
         if (!ifs.seekg(_currentEntryOffset, std::ios::beg))
             throw FileException{ _currentEntry->filePath, "seek failed", errno };
 
-        if (!ifs.read(reinterpret_cast<char*>(&_readBuffer[0]), bytesToRead))
+        if (!ifs.read(reinterpret_cast<char*>(_readBuffer.data()), bytesToRead))
             throw FileException{ _currentEntry->filePath, "read failed", errno };
 
         const std::uint64_t actualBytesRead{ static_cast<std::uint64_t>(ifs.gcount()) };
@@ -266,7 +266,7 @@ namespace lms::zip
             std::uint64_t remainingBytesToWrite{ actualBytesRead };
             while (remainingBytesToWrite > 0)
             {
-                const auto writtenBytes{ archive_write_data(_archive.get(), &_readBuffer[actualBytesRead - remainingBytesToWrite], remainingBytesToWrite) };
+                const auto writtenBytes{ ::archive_write_data(_archive.get(), &_readBuffer[actualBytesRead - remainingBytesToWrite], remainingBytesToWrite) };
                 if (writtenBytes < 0)
                     throw ArchiveException{ _archive.get() };
 
@@ -283,7 +283,7 @@ namespace lms::zip
     {
         if (!_currentOutputStream)
         {
-            archive_set_error(_archive.get(), EIO, "IO error: operation cancelled");
+            ::archive_set_error(_archive.get(), EIO, "IO error: operation cancelled");
             return -1;
         }
 
diff --git a/src/libs/core/impl/ArchiveZipper.hpp b/src/libs/core/impl/ArchiveZipper.hpp
index 5d5b97e5..0166dbe4 100644
--- a/src/libs/core/impl/ArchiveZipper.hpp
+++ b/src/libs/core/impl/ArchiveZipper.hpp
@@ -35,7 +35,8 @@ namespace lms::zip
     class ArchiveZipper : public IZipper
     {
     public:
-        ArchiveZipper(const EntryContainer& files);
+        ArchiveZipper(const EntryContainer& entries);
+        ~ArchiveZipper() = default;
         ArchiveZipper(const ArchiveZipper&) = delete;
         ArchiveZipper& operator=(const ArchiveZipper&) = delete;
 
diff --git a/src/libs/core/impl/ChildProcess.hpp b/src/libs/core/impl/ChildProcess.hpp
index a1628e14..e1053c68 100644
--- a/src/libs/core/impl/ChildProcess.hpp
+++ b/src/libs/core/impl/ChildProcess.hpp
@@ -36,8 +36,11 @@ namespace lms::core
     class ChildProcess : public IChildProcess
     {
     public:
-        ~ChildProcess();
         ChildProcess(boost::asio::io_context& ioContext, const std::filesystem::path& path, const Args& args);
+        ~ChildProcess() override;
+
+        ChildProcess(const ChildProcess&) = delete;
+        ChildProcess& operator=(const ChildProcess&) = delete;
 
     private:
         void asyncRead(std::byte* data, std::size_t bufferSize, ReadCallback callback) override;
diff --git a/src/libs/core/impl/ChildProcessManager.hpp b/src/libs/core/impl/ChildProcessManager.hpp
index d7e5bc29..4a78ff8a 100644
--- a/src/libs/core/impl/ChildProcessManager.hpp
+++ b/src/libs/core/impl/ChildProcessManager.hpp
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <memory>
-#include <thread>
 
 #include <boost/asio/io_context.hpp>
 
@@ -32,7 +31,7 @@ namespace lms::core
     {
     public:
         ChildProcessManager(boost::asio::io_context& ioContext);
-        ~ChildProcessManager() = default;
+        ~ChildProcessManager() override = default;
 
         ChildProcessManager(const ChildProcessManager&) = delete;
         ChildProcessManager(ChildProcessManager&&) = delete;
diff --git a/src/libs/core/impl/Config.cpp b/src/libs/core/impl/Config.cpp
index c4523171..eef30ad4 100644
--- a/src/libs/core/impl/Config.cpp
+++ b/src/libs/core/impl/Config.cpp
@@ -20,7 +20,6 @@
 #include "Config.hpp"
 
 #include "core/Exception.hpp"
-#include "core/ILogger.hpp"
 
 namespace lms::core
 {
diff --git a/src/libs/core/impl/Config.hpp b/src/libs/core/impl/Config.hpp
index b1d323ff..03bd4737 100644
--- a/src/libs/core/impl/Config.hpp
+++ b/src/libs/core/impl/Config.hpp
@@ -29,13 +29,14 @@ namespace lms::core
     {
     public:
         Config(const std::filesystem::path& p);
-        ~Config() = default;
+        ~Config() override = default;
 
         Config(const Config&) = delete;
         Config& operator=(const Config&) = delete;
         Config(Config&&) = delete;
         Config& operator=(Config&&) = delete;
 
+    private:
         // Default values are returned in case of setting not found
         std::string_view getString(std::string_view setting, std::string_view def = "") override;
         void visitStrings(std::string_view setting, std::function<void(std::string_view)> _func, std::initializer_list<std::string_view> defs) override;
@@ -44,7 +45,6 @@ namespace lms::core
         long getLong(std::string_view setting, long def = 0) override;
         bool getBool(std::string_view setting, bool def = false) override;
 
-    private:
         libconfig::Config _config;
     };
 } // namespace lms::core
\ No newline at end of file
diff --git a/src/libs/core/impl/TraceLogger.cpp b/src/libs/core/impl/TraceLogger.cpp
index 88b0f269..af521eb2 100644
--- a/src/libs/core/impl/TraceLogger.cpp
+++ b/src/libs/core/impl/TraceLogger.cpp
@@ -44,6 +44,8 @@ namespace lms::core::tracing
         private:
             CurrentThreadUnregisterer(const CurrentThreadUnregisterer&) = delete;
             CurrentThreadUnregisterer& operator=(const CurrentThreadUnregisterer&) = delete;
+            CurrentThreadUnregisterer(CurrentThreadUnregisterer&&) = delete;
+            CurrentThreadUnregisterer& operator=(CurrentThreadUnregisterer&&) = delete;
 
             TraceLogger* _logger;
         };
@@ -295,7 +297,7 @@ namespace lms::core::tracing
         oss << threadId;
 
         std::istringstream iss{ oss.str() };
-        std::uint64_t id;
+        std::uint64_t id{};
         iss >> id;
 
         return static_cast<std::uint32_t>(id);
diff --git a/src/libs/core/test/String.cpp b/src/libs/core/test/String.cpp
index 2e9789ef..3d66bb99 100644
--- a/src/libs/core/test/String.cpp
+++ b/src/libs/core/test/String.cpp
@@ -167,7 +167,7 @@ namespace lms::core::stringUtils::tests
             std::string expectedOutput;
         };
 
-        TestCase tests[]{
+        const TestCase tests[]{
             { { "" }, ';', '\\', "" },
             { { ";" }, ';', '\\', "\\;" },
             { { ";;" }, ';', '\\', "\\;\\;" },
diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp
index 9ecddfe7..1b8a2cca 100644
--- a/src/libs/database/impl/Artist.cpp
+++ b/src/libs/database/impl/Artist.cpp
@@ -29,7 +29,6 @@
 #include "database/Track.hpp"
 #include "database/User.hpp"
 
-#include "EnumSetTraits.hpp"
 #include "IdTypeTraits.hpp"
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
@@ -182,16 +181,16 @@ namespace lms::db
         }
     } // namespace
 
-    Artist::Artist(const std::string& name, const std::optional<core::UUID>& MBID)
-        : _MBID{ MBID ? MBID->getAsString() : "" }
+    Artist::Artist(const std::string& name, const std::optional<core::UUID>& mbid)
+        : _mbid{ mbid ? mbid->getAsString() : "" }
     {
         setName(name);
         _sortName = _name;
     }
 
-    Artist::pointer Artist::create(Session& session, const std::string& name, const std::optional<core::UUID>& MBID)
+    Artist::pointer Artist::create(Session& session, const std::string& name, const std::optional<core::UUID>& mbid)
     {
-        return session.getDboSession()->add(std::unique_ptr<Artist>{ new Artist{ name, MBID } });
+        return session.getDboSession()->add(std::unique_ptr<Artist>{ new Artist{ name, mbid } });
     }
 
     std::size_t Artist::getCount(Session& session)
@@ -322,7 +321,7 @@ namespace lms::db
         return utils::execRangeQuery<ArtistId>(query, range);
     }
 
-    std::vector<std::vector<Cluster::pointer>> Artist::getClusterGroups(std::vector<ClusterTypeId> clusterTypeIds, std::size_t size) const
+    std::vector<std::vector<Cluster::pointer>> Artist::getClusterGroups(std::span<const ClusterTypeId> clusterTypeIds, std::size_t size) const
     {
         assert(session());
 
@@ -354,6 +353,7 @@ namespace lms::db
         });
 
         std::vector<std::vector<Cluster::pointer>> res;
+        res.reserve(clustersByType.size());
         for (const auto& [clusterTypeId, clusters] : clustersByType)
             res.push_back(clusters);
 
diff --git a/src/libs/database/impl/Db.cpp b/src/libs/database/impl/Db.cpp
index e4d95a71..b033a143 100644
--- a/src/libs/database/impl/Db.cpp
+++ b/src/libs/database/impl/Db.cpp
@@ -24,7 +24,6 @@
 
 #include "core/IConfig.hpp"
 #include "core/ILogger.hpp"
-#include "core/ITraceLogger.hpp"
 #include "core/Service.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
diff --git a/src/libs/database/impl/Image.cpp b/src/libs/database/impl/Image.cpp
index e2a0d02b..0466f9a0 100644
--- a/src/libs/database/impl/Image.cpp
+++ b/src/libs/database/impl/Image.cpp
@@ -71,11 +71,11 @@ namespace lms::db
         return utils::fetchQuerySingleResult(session.getDboSession()->query<Wt::Dbo::ptr<Image>>("SELECT i from image i").where("i.id = ?").bind(id));
     }
 
-    Image::pointer Image::find(Session& session, const std::filesystem::path& path)
+    Image::pointer Image::find(Session& session, const std::filesystem::path& file)
     {
         session.checkReadTransaction();
 
-        return utils::fetchQuerySingleResult(session.getDboSession()->query<Wt::Dbo::ptr<Image>>("SELECT i from image i").where("i.absolute_file_path = ?").bind(path));
+        return utils::fetchQuerySingleResult(session.getDboSession()->query<Wt::Dbo::ptr<Image>>("SELECT i from image i").where("i.absolute_file_path = ?").bind(file));
     }
 
     void Image::find(Session& session, ImageId& lastRetrievedImage, std::size_t count, const std::function<void(const Image::pointer&)>& func)
diff --git a/src/libs/database/include/database/Artist.hpp b/src/libs/database/include/database/Artist.hpp
index 8ed22ee0..84d95d88 100644
--- a/src/libs/database/include/database/Artist.hpp
+++ b/src/libs/database/include/database/Artist.hpp
@@ -130,16 +130,16 @@ namespace lms::db
         static pointer find(Session& session, ArtistId id);
         static std::vector<pointer> find(Session& session, std::string_view name); // exact match on name field
         static void find(Session& session, ArtistId& lastRetrievedArtist, std::size_t count, const std::function<void(const Artist::pointer&)>& func, MediaLibraryId library = {});
-        static RangeResults<pointer> find(Session& session, const FindParameters& parameters);
-        static void find(Session& session, const FindParameters& parameters, std::function<void(const pointer&)> func);
-        static RangeResults<ArtistId> findIds(Session& session, const FindParameters& parameters);
+        static RangeResults<pointer> find(Session& session, const FindParameters& params);
+        static void find(Session& session, const FindParameters& params, std::function<void(const pointer&)> func);
+        static RangeResults<ArtistId> findIds(Session& session, const FindParameters& params);
         static RangeResults<ArtistId> findOrphanIds(Session& session, std::optional<Range> range = std::nullopt); // No track related
         static bool exists(Session& session, ArtistId id);
 
         // Accessors
         const std::string& getName() const { return _name; }
         const std::string& getSortName() const { return _sortName; }
-        std::optional<core::UUID> getMBID() const { return core::UUID::fromString(_MBID); }
+        std::optional<core::UUID> getMBID() const { return core::UUID::fromString(_mbid); }
         ObjectPtr<Image> getImage() const;
 
         // No artistLinkTypes means get them all
@@ -148,10 +148,10 @@ namespace lms::db
         // Get the cluster of the tracks made by this artist
         // Each clusters are grouped by cluster type, sorted by the number of occurence
         // size is the max number of cluster per cluster type
-        std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(std::vector<ClusterTypeId> clusterTypeIds, std::size_t size) const;
+        std::vector<std::vector<ObjectPtr<Cluster>>> getClusterGroups(std::span<const ClusterTypeId> clusterTypeIds, std::size_t size) const;
 
         void setName(std::string_view name);
-        void setMBID(const std::optional<core::UUID>& mbid) { _MBID = mbid ? mbid->getAsString() : ""; }
+        void setMBID(const std::optional<core::UUID>& mbid) { _mbid = mbid ? mbid->getAsString() : ""; }
         void setSortName(std::string_view sortName);
         void setImage(ObjectPtr<Image> image);
 
@@ -160,7 +160,7 @@ namespace lms::db
         {
             Wt::Dbo::field(a, _name, "name");
             Wt::Dbo::field(a, _sortName, "sort_name");
-            Wt::Dbo::field(a, _MBID, "mbid");
+            Wt::Dbo::field(a, _mbid, "mbid");
 
             Wt::Dbo::belongsTo(a, _image, "image", Wt::Dbo::OnDeleteSetNull);
             Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "artist");
@@ -173,11 +173,11 @@ namespace lms::db
         friend class Session;
         // Create
         Artist(const std::string& name, const std::optional<core::UUID>& MBID = {});
-        static pointer create(Session& session, const std::string& name, const std::optional<core::UUID>& UUID = {});
+        static pointer create(Session& session, const std::string& name, const std::optional<core::UUID>& mbid = std::nullopt);
 
         std::string _name;
         std::string _sortName;
-        std::string _MBID; // Musicbrainz Identifier
+        std::string _mbid; // Musicbrainz Identifier
 
         Wt::Dbo::ptr<Image> _image;
         Wt::Dbo::collection<Wt::Dbo::ptr<TrackArtistLink>> _trackArtistLinks; // Tracks involving this artist
diff --git a/src/libs/image/impl/SvgImage.cpp b/src/libs/image/impl/SvgImage.cpp
index 85eb62df..4534e4a0 100644
--- a/src/libs/image/impl/SvgImage.cpp
+++ b/src/libs/image/impl/SvgImage.cpp
@@ -19,6 +19,7 @@
 
 #include "SvgImage.hpp"
 
+#include <filesystem>
 #include <fstream>
 
 #include "core/ITraceLogger.hpp"
diff --git a/src/libs/image/impl/SvgImage.hpp b/src/libs/image/impl/SvgImage.hpp
index 5ae53aa3..4befe5cd 100644
--- a/src/libs/image/impl/SvgImage.hpp
+++ b/src/libs/image/impl/SvgImage.hpp
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <filesystem>
-#include <memory>
 #include <vector>
 
 #include "image/IEncodedImage.hpp"
@@ -33,9 +31,9 @@ namespace lms::image
         SvgImage(std::vector<std::byte>&& data)
             : _data{ std::move(data) } {}
 
-        const std::byte* getData() const { return &_data.front(); }
-        std::size_t getDataSize() const { return _data.size(); }
-        std::string_view getMimeType() const { return "image/svg+xml"; }
+        const std::byte* getData() const override { return &_data.front(); }
+        std::size_t getDataSize() const override { return _data.size(); }
+        std::string_view getMimeType() const override { return "image/svg+xml"; }
 
     private:
         const std::vector<std::byte> _data;
diff --git a/src/libs/image/impl/stb/JPEGImage.cpp b/src/libs/image/impl/stb/JPEGImage.cpp
index f64f831a..bf3cf93a 100644
--- a/src/libs/image/impl/stb/JPEGImage.cpp
+++ b/src/libs/image/impl/stb/JPEGImage.cpp
@@ -47,8 +47,7 @@ namespace lms::image::STB
         }
     }
 
-    const std::byte*
-    JPEGImage::getData() const
+    const std::byte* JPEGImage::getData() const
     {
         if (_data.empty())
             return nullptr;
@@ -56,8 +55,7 @@ namespace lms::image::STB
         return &_data.front();
     }
 
-    std::size_t
-    JPEGImage::getDataSize() const
+    std::size_t JPEGImage::getDataSize() const
     {
         return _data.size();
     }
diff --git a/src/libs/image/impl/stb/RawImage.cpp b/src/libs/image/impl/stb/RawImage.cpp
index 44a02101..3187fd08 100644
--- a/src/libs/image/impl/stb/RawImage.cpp
+++ b/src/libs/image/impl/stb/RawImage.cpp
@@ -45,7 +45,7 @@ namespace lms::image::STB
 {
     RawImage::RawImage(const std::byte* encodedData, std::size_t encodedDataSize)
     {
-        int n;
+        int n{};
         _data = UniquePtrFree{ ::stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(encodedData), encodedDataSize, &_width, &_height, &n, 3), std::free };
         if (!_data)
             throw Exception{ "Cannot load image from memory: " + std::string{ ::stbi_failure_reason() } };
@@ -78,7 +78,7 @@ namespace lms::image::STB
             width = (size_t)((float)height / _height * _width);
         }
 
-        UniquePtrFree resizedData{ reinterpret_cast<unsigned char*>(malloc(width * height * 3)), std::free };
+        UniquePtrFree resizedData{ static_cast<unsigned char*>(malloc(width * height * 3)), std::free };
         if (!resizedData)
             throw Exception{ "Cannot allocate memory for resized image!" };
 
diff --git a/src/libs/image/impl/stb/RawImage.hpp b/src/libs/image/impl/stb/RawImage.hpp
index ceaccd8c..044217fd 100644
--- a/src/libs/image/impl/stb/RawImage.hpp
+++ b/src/libs/image/impl/stb/RawImage.hpp
@@ -33,6 +33,10 @@ namespace lms::image::STB
         RawImage(const std::byte* encodedData, std::size_t encodedDataSize);
         RawImage(const std::filesystem::path& path);
 
+        ~RawImage() override = default;
+        RawImage(const RawImage&) = delete;
+        RawImage& operator=(const RawImage&) = delete;
+
         ImageSize getWidth() const override;
         ImageSize getHeight() const override;
 
@@ -42,8 +46,8 @@ namespace lms::image::STB
         const std::byte* getData() const;
 
     private:
-        int _width;
-        int _height;
+        int _width{};
+        int _height{};
         using UniquePtrFree = std::unique_ptr<unsigned char, decltype(&std::free)>;
         UniquePtrFree _data{ nullptr, std::free };
     };
diff --git a/src/libs/image/include/image/IRawImage.hpp b/src/libs/image/include/image/IRawImage.hpp
index 75ed8c88..3347228f 100644
--- a/src/libs/image/include/image/IRawImage.hpp
+++ b/src/libs/image/include/image/IRawImage.hpp
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "image/IEncodedImage.hpp"
 
 namespace lms::image
diff --git a/src/libs/metadata/impl/AvFormatTagReader.cpp b/src/libs/metadata/impl/AvFormatTagReader.cpp
index 081144ce..7891890a 100644
--- a/src/libs/metadata/impl/AvFormatTagReader.cpp
+++ b/src/libs/metadata/impl/AvFormatTagReader.cpp
@@ -19,16 +19,12 @@
 
 #include "AvFormatTagReader.hpp"
 
-#include <algorithm>
-#include <iostream>
-
 #include "av/IAudioFile.hpp"
+#include "av/Types.hpp"
 #include "core/ILogger.hpp"
 #include "core/String.hpp"
 #include "metadata/Exception.hpp"
 
-#include "Utils.hpp"
-
 namespace lms::metadata
 {
     namespace
diff --git a/src/libs/metadata/impl/AvFormatTagReader.hpp b/src/libs/metadata/impl/AvFormatTagReader.hpp
index cdf5db4f..c18eed1c 100644
--- a/src/libs/metadata/impl/AvFormatTagReader.hpp
+++ b/src/libs/metadata/impl/AvFormatTagReader.hpp
@@ -22,7 +22,6 @@
 #include <filesystem>
 
 #include "av/IAudioFile.hpp"
-#include "metadata/IParser.hpp"
 
 #include "ITagReader.hpp"
 
@@ -32,11 +31,11 @@ namespace lms::metadata
     {
     public:
         AvFormatTagReader(const std::filesystem::path& path, bool debug);
-
-    private:
+        ~AvFormatTagReader() override = default;
         AvFormatTagReader(const AvFormatTagReader&) = delete;
         AvFormatTagReader& operator=(const AvFormatTagReader&) = delete;
 
+    private:
         void visitTagValues(TagType tag, TagValueVisitor visitor) const override;
         void visitTagValues(std::string_view tag, TagValueVisitor visitor) const override;
         void visitPerformerTags(PerformerVisitor visitor) const override;
diff --git a/src/libs/services/scanner/impl/ScannerService.hpp b/src/libs/services/scanner/impl/ScannerService.hpp
index 2a1bbd82..3f4a57aa 100644
--- a/src/libs/services/scanner/impl/ScannerService.hpp
+++ b/src/libs/services/scanner/impl/ScannerService.hpp
@@ -43,7 +43,7 @@ namespace lms::scanner
     {
     public:
         ScannerService(db::Db& db);
-        ~ScannerService();
+        ~ScannerService() override;
 
     private:
         ScannerService(const ScannerService&) = delete;
@@ -55,7 +55,6 @@ namespace lms::scanner
         Status getStatus() const override;
         Events& getEvents() override { return _events; }
 
-    private:
         void start();
         void stop();
 
diff --git a/src/libs/subsonic/impl/ProtocolVersion.hpp b/src/libs/subsonic/impl/ProtocolVersion.hpp
index 28d63cfa..69aed228 100644
--- a/src/libs/subsonic/impl/ProtocolVersion.hpp
+++ b/src/libs/subsonic/impl/ProtocolVersion.hpp
@@ -19,6 +19,9 @@
 
 #pragma once
 
+#include <optional>
+#include <string_view>
+
 #include "core/String.hpp"
 
 namespace lms::api::subsonic
diff --git a/src/libs/subsonic/impl/SubsonicId.cpp b/src/libs/subsonic/impl/SubsonicId.cpp
index b1fda5af..13e75909 100644
--- a/src/libs/subsonic/impl/SubsonicId.cpp
+++ b/src/libs/subsonic/impl/SubsonicId.cpp
@@ -19,9 +19,6 @@
 
 #include "SubsonicId.hpp"
 
-#include "SubsonicResponse.hpp"
-
-#include "core/ILogger.hpp"
 #include "core/String.hpp"
 
 namespace lms::api::subsonic
@@ -47,11 +44,6 @@ namespace lms::api::subsonic
         return "al-" + id.toString();
     }
 
-    std::string idToString(RootId)
-    {
-        return "root";
-    }
-
     std::string idToString(db::TrackId id)
     {
         return "tr-" + id.toString();
@@ -122,15 +114,6 @@ namespace lms::core::stringUtils
         return std::nullopt;
     }
 
-    template<>
-    std::optional<api::subsonic::RootId> readAs(std::string_view str)
-    {
-        if (str == "root")
-            return api::subsonic::RootId{};
-
-        return std::nullopt;
-    }
-
     template<>
     std::optional<db::TrackId> readAs(std::string_view str)
     {
diff --git a/src/libs/subsonic/impl/SubsonicId.hpp b/src/libs/subsonic/impl/SubsonicId.hpp
index 331708a5..7b285b08 100644
--- a/src/libs/subsonic/impl/SubsonicId.hpp
+++ b/src/libs/subsonic/impl/SubsonicId.hpp
@@ -29,25 +29,17 @@
 
 namespace lms::api::subsonic
 {
-    struct RootId
-    {
-    };
-
     std::string idToString(db::ArtistId id);
     std::string idToString(db::DirectoryId id);
     std::string idToString(db::MediaLibraryId id);
     std::string idToString(db::ReleaseId id);
     std::string idToString(db::TrackId id);
     std::string idToString(db::TrackListId id);
-    std::string idToString(RootId);
 } // namespace lms::api::subsonic
 
 // Used to parse parameters
 namespace lms::core::stringUtils
 {
-    template<>
-    std::optional<api::subsonic::RootId> readAs(std::string_view str);
-
     template<>
     std::optional<db::ArtistId> readAs(std::string_view str);
 
diff --git a/src/libs/subsonic/impl/SubsonicResource.cpp b/src/libs/subsonic/impl/SubsonicResource.cpp
index 925b3764..7ea0b82f 100644
--- a/src/libs/subsonic/impl/SubsonicResource.cpp
+++ b/src/libs/subsonic/impl/SubsonicResource.cpp
@@ -29,7 +29,6 @@
 #include "core/LiteralString.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
-#include "core/Utils.hpp"
 #include "database/Db.hpp"
 #include "database/Session.hpp"
 #include "database/User.hpp"
@@ -39,7 +38,6 @@
 #include "ParameterParsing.hpp"
 #include "ProtocolVersion.hpp"
 #include "RequestContext.hpp"
-#include "SubsonicId.hpp"
 #include "SubsonicResponse.hpp"
 #include "endpoints/AlbumSongLists.hpp"
 #include "endpoints/Bookmarks.hpp"
@@ -105,8 +103,8 @@ namespace lms::api::subsonic
             auto censorValue = [](const std::string& type, const std::string& value) -> std::string {
                 if (type == "p" || type == "password")
                     return "*REDACTED*";
-                else
-                    return value;
+
+                return value;
             };
 
             std::string res;
@@ -138,7 +136,7 @@ namespace lms::api::subsonic
                 throw UserNotAuthorizedError{};
         }
 
-        Response handleNotImplemented(RequestContext&)
+        Response handleNotImplemented(RequestContext& /*context*/)
         {
             throw NotImplementedGenericError{};
         }
@@ -292,6 +290,18 @@ namespace lms::api::subsonic
 
             throw UserNotAuthorizedError{};
         }
+
+        ClientInfo getClientInfo(const Wt::Http::Request& request)
+        {
+            const auto& parameters{ request.getParameterMap() };
+            ClientInfo res;
+
+            // Mandatory parameters
+            res.name = getMandatoryParameterAs<std::string>(parameters, "c");
+            res.version = getMandatoryParameterAs<ProtocolVersion>(parameters, "v");
+
+            return res;
+        }
     } // namespace
 
     SubsonicResource::SubsonicResource(db::Db& db)
@@ -403,25 +413,13 @@ namespace lms::api::subsonic
             throw ClientMustUpgradeError{};
         if (client.minor > server.minor)
             throw ServerMustUpgradeError{};
-        else if (client.minor == server.minor)
+        if (client.minor == server.minor)
         {
             if (client.patch > server.patch)
                 throw ServerMustUpgradeError{};
         }
     }
 
-    ClientInfo SubsonicResource::getClientInfo(const Wt::Http::Request& request)
-    {
-        const auto& parameters{ request.getParameterMap() };
-        ClientInfo res;
-
-        // Mandatory parameters
-        res.name = getMandatoryParameterAs<std::string>(parameters, "c");
-        res.version = getMandatoryParameterAs<ProtocolVersion>(parameters, "v");
-
-        return res;
-    }
-
     RequestContext SubsonicResource::buildRequestContext(const Wt::Http::Request& request)
     {
         const Wt::Http::ParameterMap& parameters{ request.getParameterMap() };
diff --git a/src/libs/subsonic/impl/SubsonicResource.hpp b/src/libs/subsonic/impl/SubsonicResource.hpp
index f6bd7417..7c00f847 100644
--- a/src/libs/subsonic/impl/SubsonicResource.hpp
+++ b/src/libs/subsonic/impl/SubsonicResource.hpp
@@ -25,10 +25,8 @@
 #include <Wt/Http/Response.h>
 #include <Wt/WResource.h>
 
-#include "database/Types.hpp"
 #include "database/UserId.hpp"
 
-#include "ClientInfo.hpp"
 #include "RequestContext.hpp"
 
 namespace lms::db
@@ -48,7 +46,6 @@ namespace lms::api::subsonic
         ProtocolVersion getServerProtocolVersion(const std::string& clientName) const;
 
         static void checkProtocolVersion(ProtocolVersion client, ProtocolVersion server);
-        ClientInfo getClientInfo(const Wt::Http::Request& request);
         RequestContext buildRequestContext(const Wt::Http::Request& request);
         db::UserId authenticateUser(const Wt::Http::Request& request);
 
diff --git a/src/libs/subsonic/impl/SubsonicResponse.cpp b/src/libs/subsonic/impl/SubsonicResponse.cpp
index 4110cc4e..5bf5acd3 100644
--- a/src/libs/subsonic/impl/SubsonicResponse.cpp
+++ b/src/libs/subsonic/impl/SubsonicResponse.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/property_tree/xml_parser.hpp>
 
-#include "core/Exception.hpp"
 #include "core/String.hpp"
 
 #include "ProtocolVersion.hpp"
diff --git a/src/libs/subsonic/impl/SubsonicResponseAllocator.hpp b/src/libs/subsonic/impl/SubsonicResponseAllocator.hpp
index b0335a79..5ea437b3 100644
--- a/src/libs/subsonic/impl/SubsonicResponseAllocator.hpp
+++ b/src/libs/subsonic/impl/SubsonicResponseAllocator.hpp
@@ -38,7 +38,7 @@ namespace lms::api::subsonic
         constexpr Allocator() noexcept = default;
 
         template<typename U>
-        constexpr Allocator(const Allocator<MemoryResource, U>&) noexcept
+        constexpr Allocator(const Allocator<MemoryResource, U>& /*allocator*/) noexcept
         {
         }
 
@@ -54,7 +54,7 @@ namespace lms::api::subsonic
         }
 
         // Deallocate memory pointed to by p
-        void deallocate(pointer p, std::size_t) noexcept
+        void deallocate(pointer p, std::size_t /*n*/) noexcept
         {
             MemoryResource::getInstance().deallocate(reinterpret_cast<std::byte*>(p));
         }
diff --git a/src/lms/ui/admin/UserView.cpp b/src/lms/ui/admin/UserView.cpp
index 123ef5ea..a8a1ddb7 100644
--- a/src/lms/ui/admin/UserView.cpp
+++ b/src/lms/ui/admin/UserView.cpp
@@ -27,9 +27,7 @@
 
 #include <Wt/WFormModel.h>
 
-#include "core/Exception.hpp"
 #include "core/IConfig.hpp"
-#include "core/ILogger.hpp"
 #include "core/Service.hpp"
 #include "core/String.hpp"
 #include "database/Session.hpp"
@@ -125,7 +123,7 @@ namespace lms::ui
             const User::pointer user{ User::find(LmsApp->getDbSession(), *_userId) };
             if (!user)
                 throw UserNotFoundException{};
-            else if (user == LmsApp->getUser())
+            if (user == LmsApp->getUser())
                 throw UserNotAllowedException{};
         }
 
@@ -155,7 +153,7 @@ namespace lms::ui
             return valueText(LoginField).toUTF8();
         }
 
-        bool validateField(Field field)
+        bool validateField(Field field) override
         {
             Wt::WString error;