Added a scan step to scan artist images, ref #435

src/libs/database/CMakeLists.txt

@@ -3,6 +3,7 @@ add_library(lmsdatabase SHARED
 	impl/AuthToken.cpp
 	impl/Cluster.cpp
 	impl/Db.cpp
+	impl/Image.cpp
 	impl/Listen.cpp
 	impl/MediaLibrary.cpp
 	impl/Migration.cpp

src/libs/database/impl/Artist.cpp

@@ -22,6 +22,7 @@
 
 #include "core/ILogger.hpp"
 #include "database/Cluster.hpp"
+#include "database/Image.hpp"
 #include "database/Release.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
@@ -273,6 +274,11 @@ namespace lms::db
         utils::forEachQueryRangeResult(query, params.range, func);
     }
 
+    ObjectPtr<Image> Artist::getImage() const
+    {
+        return ObjectPtr<Image>{ _image.lock() };
+    }
+
     RangeResults<ArtistId> Artist::findSimilarArtistIds(core::EnumSet<TrackArtistLinkType> artistLinkTypes, std::optional<Range> range) const
     {
         assert(session());

src/libs/database/impl/Image.cpp

@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "database/Image.hpp"
+
+#include <Wt/Dbo/WtSqlTraits.h>
+
+#include "database/Artist.hpp"
+#include "database/Session.hpp"
+
+#include "IdTypeTraits.hpp"
+#include "PathTraits.hpp"
+#include "Utils.hpp"
+
+namespace lms::db
+{
+    Image::Image(const std::filesystem::path& p)
+        : _path{ p }
+    {
+    }
+
+    Image::pointer Image::create(Session& session, const std::filesystem::path& p)
+    {
+        return session.getDboSession()->add(std::unique_ptr<Image>{ new Image{ p } });
+    }
+
+    std::size_t Image::getCount(Session& session)
+    {
+        session.checkReadTransaction();
+
+        return utils::fetchQuerySingleResult(session.getDboSession()->query<int>("SELECT COUNT(*) FROM image"));
+    }
+
+    Image::pointer Image::find(Session& session, ImageId id)
+    {
+        session.checkReadTransaction();
+
+        return utils::fetchQuerySingleResult(session.getDboSession()->find<Image>().where("id = ?").bind(id));
+    }
+} // namespace lms::db

src/libs/database/impl/MediaLibrary.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2016 Emeric Poupon
+ * Copyright (C) 2024 Emeric Poupon
  *
  * This file is part of LMS.
  *

src/libs/database/impl/Migration.cpp

@@ -35,7 +35,7 @@ namespace lms::db
 {
     namespace
     {
-        static constexpr Version LMS_DATABASE_VERSION{ 59 };
+        static constexpr Version LMS_DATABASE_VERSION{ 60 };
     }
 
     VersionInfo::VersionInfo()
@@ -86,11 +86,13 @@ namespace lms::db::Migration
         Db& _db;
     };
 
-    static void migrateFromV33(Session& session)
+    namespace
     {
-        // remove name from track_artist_link
-        // Drop Auth mode
-        session.getDboSession()->execute(R"(
+        void migrateFromV33(Session& session)
+        {
+            // remove name from track_artist_link
+            // Drop Auth mode
+            session.getDboSession()->execute(R"(
 CREATE TABLE IF NOT EXISTS "track_artist_link_backup" (
   "id" integer primary key autoincrement,
   "version" integer not null,
@@ -101,49 +103,49 @@ CREATE TABLE IF NOT EXISTS "track_artist_link_backup" (
   constraint "fk_track_artist_link_artist" foreign key ("artist_id") references "artist" ("id") on delete cascade deferrable initially deferred
 );
 ))");
-        session.getDboSession()->execute("INSERT INTO track_artist_link_backup SELECT id, version, type, track_id, artist_id FROM track_artist_link");
-        session.getDboSession()->execute("DROP TABLE track_artist_link");
-        session.getDboSession()->execute("ALTER TABLE track_artist_link_backup RENAME TO track_artist_link");
-    }
+            session.getDboSession()->execute("INSERT INTO track_artist_link_backup SELECT id, version, type, track_id, artist_id FROM track_artist_link");
+            session.getDboSession()->execute("DROP TABLE track_artist_link");
+            session.getDboSession()->execute("ALTER TABLE track_artist_link_backup RENAME TO track_artist_link");
+        }
 
-    static void migrateFromV34(Session& session)
-    {
-        // Add scrobbling state
-        // By default, everything needs to be sent
-        session.getDboSession()->execute("ALTER TABLE starred_artist ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
-        session.getDboSession()->execute("ALTER TABLE starred_release ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
-        session.getDboSession()->execute("ALTER TABLE starred_track ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
-    }
+        void migrateFromV34(Session& session)
+        {
+            // Add scrobbling state
+            // By default, everything needs to be sent
+            session.getDboSession()->execute("ALTER TABLE starred_artist ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
+            session.getDboSession()->execute("ALTER TABLE starred_release ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
+            session.getDboSession()->execute("ALTER TABLE starred_track ADD scrobbling_state INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*ScrobblingState::PendingAdd*/ 0)) + ")");
+        }
 
-    static void migrateFromV35(Session& session)
-    {
-        // Add creattion/last modif date time for tracklists
-        session.getDboSession()->execute("ALTER TABLE tracklist ADD creation_date_time TEXT");
-        session.getDboSession()->execute("ALTER TABLE tracklist ADD last_modified_date_time TEXT");
-    }
+        void migrateFromV35(Session& session)
+        {
+            // Add creattion/last modif date time for tracklists
+            session.getDboSession()->execute("ALTER TABLE tracklist ADD creation_date_time TEXT");
+            session.getDboSession()->execute("ALTER TABLE tracklist ADD last_modified_date_time TEXT");
+        }
 
-    static void migrateFromV36(Session& session)
-    {
-        // Increased precision for track durations (now in milliseconds instead of secodns)
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+        void migrateFromV36(Session& session)
+        {
+            // Increased precision for track durations (now in milliseconds instead of secodns)
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV37(Session& session)
-    {
-        // Support Performer tags (via subtypes)
-        session.getDboSession()->execute("ALTER TABLE track_artist_link ADD subtype TEXT");
+        void migrateFromV37(Session& session)
+        {
+            // Support Performer tags (via subtypes)
+            session.getDboSession()->execute("ALTER TABLE track_artist_link ADD subtype TEXT");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV38(Session& session)
-    {
-        // migrate release-specific tags from Track to Release
-        session.getDboSession()->execute("ALTER TABLE release ADD total_disc INTEGER");
+        void migrateFromV38(Session& session)
+        {
+            // migrate release-specific tags from Track to Release
+            session.getDboSession()->execute("ALTER TABLE release ADD total_disc INTEGER");
 
-        session.getDboSession()->execute(R"(
+            session.getDboSession()->execute(R"(
 CREATE TABLE IF NOT EXISTS "track_backup" (
   "id" integer primary key autoincrement,
   "version" integer not null,
@@ -170,178 +172,178 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
   constraint "fk_track_release" foreign key ("release_id") references "release" ("id") on delete cascade deferrable initially deferred
 );
 ))");
-        session.getDboSession()->execute("INSERT INTO track_backup SELECT id, version, scan_version, track_number, disc_number, total_track, disc_subtitle, name, duration, date, original_date, file_path, file_last_write, file_added, has_cover, mbid, recording_mbid, copyright, copyright_url, track_replay_gain, release_replay_gain, release_id FROM track");
-        session.getDboSession()->execute("DROP TABLE track");
-        session.getDboSession()->execute("ALTER TABLE track_backup RENAME TO track");
+            session.getDboSession()->execute("INSERT INTO track_backup SELECT id, version, scan_version, track_number, disc_number, total_track, disc_subtitle, name, duration, date, original_date, file_path, file_last_write, file_added, has_cover, mbid, recording_mbid, copyright, copyright_url, track_replay_gain, release_replay_gain, release_id FROM track");
+            session.getDboSession()->execute("DROP TABLE track");
+            session.getDboSession()->execute("ALTER TABLE track_backup RENAME TO track");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV39(Session& session)
-    {
-        // add release type
-        session.getDboSession()->execute("ALTER TABLE release ADD primary_type INTEGER");
-        session.getDboSession()->execute("ALTER TABLE release ADD secondary_types INTEGER");
+        void migrateFromV39(Session& session)
+        {
+            // add release type
+            session.getDboSession()->execute("ALTER TABLE release ADD primary_type INTEGER");
+            session.getDboSession()->execute("ALTER TABLE release ADD secondary_types INTEGER");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV40(Session& session)
-    {
-        // add artist_display_name in Release and Track
-        session.getDboSession()->execute("ALTER TABLE release ADD artist_display_name TEXT NOT NULL DEFAULT ''");
-        session.getDboSession()->execute("ALTER TABLE track ADD artist_display_name TEXT NOT NULL DEFAULT ''");
+        void migrateFromV40(Session& session)
+        {
+            // add artist_display_name in Release and Track
+            session.getDboSession()->execute("ALTER TABLE release ADD artist_display_name TEXT NOT NULL DEFAULT ''");
+            session.getDboSession()->execute("ALTER TABLE track ADD artist_display_name TEXT NOT NULL DEFAULT ''");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV41(Session& session)
-    {
-        // add artist_display_name in Release and Track
-        session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN subsonic_transcode_format TO subsonic_default_transcode_format");
-        session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN subsonic_transcode_bitrate TO subsonic_default_transcode_bitrate");
-        session.getDboSession()->execute("ALTER TABLE user DROP COLUMN subsonic_transcode_enable");
-    }
+        void migrateFromV41(Session& session)
+        {
+            // add artist_display_name in Release and Track
+            session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN subsonic_transcode_format TO subsonic_default_transcode_format");
+            session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN subsonic_transcode_bitrate TO subsonic_default_transcode_bitrate");
+            session.getDboSession()->execute("ALTER TABLE user DROP COLUMN subsonic_transcode_enable");
+        }
 
-    static void migrateFromV42(Session& session)
-    {
-        session.getDboSession()->execute("DROP INDEX IF EXISTS listen_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS listen_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS listen_user_track_scrobbler_date_time_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_artist_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_artist_artist_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_release_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_release_release_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_track_user_scrobbler_idx");
-        session.getDboSession()->execute("DROP INDEX IF EXISTS starred_track_track_user_scrobbler_idx");
+        void migrateFromV42(Session& session)
+        {
+            session.getDboSession()->execute("DROP INDEX IF EXISTS listen_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS listen_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS listen_user_track_scrobbler_date_time_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_artist_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_artist_artist_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_release_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_release_release_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_track_user_scrobbler_idx");
+            session.getDboSession()->execute("DROP INDEX IF EXISTS starred_track_track_user_scrobbler_idx");
 
-        // New feedback service that now handles the star/unstar stuff (that was previously handled by the scrobbling service)
-        session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN scrobbler TO scrobbling_backend");
-        session.getDboSession()->execute("ALTER TABLE user ADD feedback_backend INTEGER");
-        session.getDboSession()->execute("ALTER TABLE listen RENAME COLUMN scrobbler TO backend");
-        session.getDboSession()->execute("ALTER TABLE listen RENAME COLUMN scrobbling_state TO sync_state");
-        session.getDboSession()->execute("ALTER TABLE starred_artist RENAME COLUMN scrobbler TO backend");
-        session.getDboSession()->execute("ALTER TABLE starred_artist RENAME COLUMN scrobbling_state TO sync_state");
-        session.getDboSession()->execute("ALTER TABLE starred_release RENAME COLUMN scrobbler TO backend");
-        session.getDboSession()->execute("ALTER TABLE starred_release RENAME COLUMN scrobbling_state TO sync_state");
-        session.getDboSession()->execute("ALTER TABLE starred_track RENAME COLUMN scrobbler TO backend");
-        session.getDboSession()->execute("ALTER TABLE starred_track RENAME COLUMN scrobbling_state TO sync_state");
+            // New feedback service that now handles the star/unstar stuff (that was previously handled by the scrobbling service)
+            session.getDboSession()->execute("ALTER TABLE user RENAME COLUMN scrobbler TO scrobbling_backend");
+            session.getDboSession()->execute("ALTER TABLE user ADD feedback_backend INTEGER");
+            session.getDboSession()->execute("ALTER TABLE listen RENAME COLUMN scrobbler TO backend");
+            session.getDboSession()->execute("ALTER TABLE listen RENAME COLUMN scrobbling_state TO sync_state");
+            session.getDboSession()->execute("ALTER TABLE starred_artist RENAME COLUMN scrobbler TO backend");
+            session.getDboSession()->execute("ALTER TABLE starred_artist RENAME COLUMN scrobbling_state TO sync_state");
+            session.getDboSession()->execute("ALTER TABLE starred_release RENAME COLUMN scrobbler TO backend");
+            session.getDboSession()->execute("ALTER TABLE starred_release RENAME COLUMN scrobbling_state TO sync_state");
+            session.getDboSession()->execute("ALTER TABLE starred_track RENAME COLUMN scrobbler TO backend");
+            session.getDboSession()->execute("ALTER TABLE starred_track RENAME COLUMN scrobbling_state TO sync_state");
 
-        session.getDboSession()->execute("UPDATE user SET feedback_backend = scrobbling_backend");
-    }
+            session.getDboSession()->execute("UPDATE user SET feedback_backend = scrobbling_backend");
+        }
 
-    static void migrateFromV43(Session& session)
-    {
-        // add counts in genre table
-        session.getDboSession()->execute("ALTER TABLE cluster ADD track_count INTEGER");
-        session.getDboSession()->execute("ALTER TABLE cluster ADD release_count INTEGER");
+        void migrateFromV43(Session& session)
+        {
+            // add counts in genre table
+            session.getDboSession()->execute("ALTER TABLE cluster ADD track_count INTEGER");
+            session.getDboSession()->execute("ALTER TABLE cluster ADD release_count INTEGER");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    static void migrateFromV44(Session& session)
-    {
-        // add bitrate
-        session.getDboSession()->execute("ALTER TABLE track ADD bitrate INTEGER NOT NULL DEFAULT 0");
+        void migrateFromV44(Session& session)
+        {
+            // add bitrate
+            session.getDboSession()->execute("ALTER TABLE track ADD bitrate INTEGER NOT NULL DEFAULT 0");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV45(Session& session)
-    {
-        // add subsonic_enable_transcoding_by_default, default is disabled
-        session.getDboSession()->execute("ALTER TABLE user ADD subsonic_enable_transcoding_by_default INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*User::defaultSubsonicEnableTranscodingByDefault*/ 0)) + ")");
-    }
+        void migrateFromV45(Session& session)
+        {
+            // add subsonic_enable_transcoding_by_default, default is disabled
+            session.getDboSession()->execute("ALTER TABLE user ADD subsonic_enable_transcoding_by_default INTEGER NOT NULL DEFAULT(" + std::to_string(static_cast<int>(/*User::defaultSubsonicEnableTranscodingByDefault*/ 0)) + ")");
+        }
 
-    void migrateFromV46(Session& session)
-    {
-        // add extra tags to parse
-        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "cluster_type_backup" (
+        void migrateFromV46(Session& session)
+        {
+            // add extra tags to parse
+            session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "cluster_type_backup" (
   "id" integer primary key autoincrement,
   "version" integer not null,
   "name" text not null
 );)");
-        session.getDboSession()->execute("INSERT INTO cluster_type_backup SELECT id, version, name FROM cluster_type");
-        session.getDboSession()->execute("DROP TABLE cluster_type");
-        session.getDboSession()->execute("ALTER TABLE cluster_type_backup RENAME TO cluster_type");
+            session.getDboSession()->execute("INSERT INTO cluster_type_backup SELECT id, version, name FROM cluster_type");
+            session.getDboSession()->execute("DROP TABLE cluster_type");
+            session.getDboSession()->execute("ALTER TABLE cluster_type_backup RENAME TO cluster_type");
 
-        session.getDboSession()->execute("ALTER TABLE scan_settings ADD COLUMN extra_tags_to_scan TEXT");
+            session.getDboSession()->execute("ALTER TABLE scan_settings ADD COLUMN extra_tags_to_scan TEXT");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV47(Session& session)
-    {
-        // release type, new way
-        session.getDboSession()->execute("ALTER TABLE release DROP primary_type");
-        session.getDboSession()->execute("ALTER TABLE release DROP secondary_types");
+        void migrateFromV47(Session& session)
+        {
+            // release type, new way
+            session.getDboSession()->execute("ALTER TABLE release DROP primary_type");
+            session.getDboSession()->execute("ALTER TABLE release DROP secondary_types");
 
-        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "release_type" (
+            session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "release_type" (
   "id" integer primary key autoincrement,
   "version" integer not null,
   "name" text not null))");
 
-        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "release_release_type" (
+            session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "release_release_type" (
   "release_type_id" bigint,
   "release_id" bigint,
   primary key ("release_type_id", "release_id"),
   constraint "fk_release_release_type_key1" foreign key ("release_type_id") references "release_type" ("id") on delete cascade deferrable initially deferred,
   constraint "fk_release_release_type_key2" foreign key ("release_id") references "release" ("id") on delete cascade deferrable initially deferred
 ))");
-        session.getDboSession()->execute(R"(CREATE INDEX "release_release_type_release_type" on "release_release_type" ("release_type_id"))");
-        session.getDboSession()->execute(R"(CREATE INDEX "release_release_type_release" on "release_release_type" ("release_id"))");
+            session.getDboSession()->execute(R"(CREATE INDEX "release_release_type_release_type" on "release_release_type" ("release_type_id"))");
+            session.getDboSession()->execute(R"(CREATE INDEX "release_release_type_release" on "release_release_type" ("release_id"))");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV48(Session& session)
-    {
-        // Regression for the extra tags not being parsed
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+        void migrateFromV48(Session& session)
+        {
+            // Regression for the extra tags not being parsed
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV49(Session& session)
-    {
-        // Add year / originalYear fields, as date / originalDate are not enough (we don't want a wrong date but year or nothing)
-        session.getDboSession()->execute("ALTER TABLE track ADD year INTEGER");
-        session.getDboSession()->execute("ALTER TABLE track ADD original_year INTEGER");
+        void migrateFromV49(Session& session)
+        {
+            // Add year / originalYear fields, as date / originalDate are not enough (we don't want a wrong date but year or nothing)
+            session.getDboSession()->execute("ALTER TABLE track ADD year INTEGER");
+            session.getDboSession()->execute("ALTER TABLE track ADD original_year INTEGER");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV50(Session& session)
-    {
-        // MediaLibrary support
-        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "media_library" (
+        void migrateFromV50(Session& session)
+        {
+            // MediaLibrary support
+            session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "media_library" (
   "id" integer primary key autoincrement,
   "version" integer not null,
   "path" text not null,
   "name" text not null
 ))");
 
-        const int scanSettingsId{ session.getDboSession()->query<int>("SELECT id FROM scan_settings") };
+            const int scanSettingsId{ session.getDboSession()->query<int>("SELECT id FROM scan_settings") };
 
-        // Convert the existing media_directory in the scan_settings table to a media_library with id '1'
-        session.getDboSession()->execute(R"(INSERT INTO "media_library" ("id", "version", "path", "name")
+            // Convert the existing media_directory in the scan_settings table to a media_library with id '1'
+            session.getDboSession()->execute(R"(INSERT INTO "media_library" ("id", "version", "path", "name")
 SELECT 1, 0, s_s.media_directory, "Main"
 FROM scan_settings s_s
 WHERE id = ?)")
-            .bind(scanSettingsId);
+                .bind(scanSettingsId);
 
-        // Remove the outdated column in scan_settings
-        session.getDboSession()->execute("ALTER TABLE scan_settings DROP media_directory");
+            // Remove the outdated column in scan_settings
+            session.getDboSession()->execute("ALTER TABLE scan_settings DROP media_directory");
 
-        // Add the media_library column in tracks, with id '1'
-        session.getDboSession()->execute(R"(
+            // Add the media_library column in tracks, with id '1'
+            session.getDboSession()->execute(R"(
 CREATE TABLE IF NOT EXISTS "track_backup" (
   "id" integer primary key autoincrement,
   "version" integer not null,
@@ -374,8 +376,8 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
   constraint "fk_track_media_library" foreign key ("media_library_id") references "media_library" ("id") on delete set null deferrable initially deferred
 ))");
 
-        // Migrate data, with the new media_library_id field set to 1
-        session.getDboSession()->execute(R"(INSERT INTO track_backup 
+            // Migrate data, with the new media_library_id field set to 1
+            session.getDboSession()->execute(R"(INSERT INTO track_backup 
 SELECT
  id,
  version,
@@ -405,76 +407,96 @@ SELECT
  release_id,
  1
  FROM track)");
-        session.getDboSession()->execute("DROP TABLE track");
-        session.getDboSession()->execute("ALTER TABLE track_backup RENAME TO track");
-    }
+            session.getDboSession()->execute("DROP TABLE track");
+            session.getDboSession()->execute("ALTER TABLE track_backup RENAME TO track");
+        }
 
-    void migrateFromV51(Session& session)
-    {
-        // Add custom artist tag delimiters, no need to rescan since it has no effect when empty
-        session.getDboSession()->execute("ALTER TABLE scan_settings ADD artist_tag_delimiters TEXT NOT NULL DEFAULT ''");
-        session.getDboSession()->execute("ALTER TABLE scan_settings ADD default_tag_delimiters TEXT NOT NULL DEFAULT ''");
-    }
+        void migrateFromV51(Session& session)
+        {
+            // Add custom artist tag delimiters, no need to rescan since it has no effect when empty
+            session.getDboSession()->execute("ALTER TABLE scan_settings ADD artist_tag_delimiters TEXT NOT NULL DEFAULT ''");
+            session.getDboSession()->execute("ALTER TABLE scan_settings ADD default_tag_delimiters TEXT NOT NULL DEFAULT ''");
+        }
 
-    void migrateFromV52(Session& session)
-    {
-        // Add sort name for releases
-        session.getDboSession()->execute("ALTER TABLE release ADD sort_name TEXT NOT NULL DEFAULT ''");
+        void migrateFromV52(Session& session)
+        {
+            // Add sort name for releases
+            session.getDboSession()->execute("ALTER TABLE release ADD sort_name TEXT NOT NULL DEFAULT ''");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV53(Session& session)
-    {
-        // Add release group mbid
-        session.getDboSession()->execute("ALTER TABLE release ADD group_mbid TEXT NOT NULL DEFAULT ''");
+        void migrateFromV53(Session& session)
+        {
+            // Add release group mbid
+            session.getDboSession()->execute("ALTER TABLE release ADD group_mbid TEXT NOT NULL DEFAULT ''");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV54(Session& session)
-    {
-        // Add file size + relative file path
-        session.getDboSession()->execute("ALTER TABLE track RENAME COLUMN file_path TO absolute_file_path");
-        session.getDboSession()->execute("ALTER TABLE track ADD file_size BIGINT NOT NULL DEFAULT(0)");
-        session.getDboSession()->execute("ALTER TABLE track ADD relative_file_path TEXT NOT NULL DEFAULT ''");
+        void migrateFromV54(Session& session)
+        {
+            // Add file size + relative file path
+            session.getDboSession()->execute("ALTER TABLE track RENAME COLUMN file_path TO absolute_file_path");
+            session.getDboSession()->execute("ALTER TABLE track ADD file_size BIGINT NOT NULL DEFAULT(0)");
+            session.getDboSession()->execute("ALTER TABLE track ADD relative_file_path TEXT NOT NULL DEFAULT ''");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV55(Session& session)
-    {
-        // Add bitsPerSample, channelCount and sampleRate
-        session.getDboSession()->execute("ALTER TABLE track ADD bits_per_sample INTEGER NOT NULL DEFAULT(0)");
-        session.getDboSession()->execute("ALTER TABLE track ADD channel_count INTEGER NOT NULL DEFAULT(0)");
-        session.getDboSession()->execute("ALTER TABLE track ADD sample_rate INTEGER NOT NULL DEFAULT(0)");
+        void migrateFromV55(Session& session)
+        {
+            // Add bitsPerSample, channelCount and sampleRate
+            session.getDboSession()->execute("ALTER TABLE track ADD bits_per_sample INTEGER NOT NULL DEFAULT(0)");
+            session.getDboSession()->execute("ALTER TABLE track ADD channel_count INTEGER NOT NULL DEFAULT(0)");
+            session.getDboSession()->execute("ALTER TABLE track ADD sample_rate INTEGER NOT NULL DEFAULT(0)");
 
-        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
-        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
-    }
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
 
-    void migrateFromV56(Session& session)
-    {
-        // Make sure we remove all the previoulsy created index, the createIndexesIfNeeded will recreate them all
-        std::vector<std::string> indexeNames{ utils::fetchQueryResults(session.getDboSession()->query<std::string>(R"(SELECT name FROM sqlite_master WHERE type = 'index' AND name LIKE '%_idx')")) };
-        for (const auto& indexName : indexeNames)
-            session.getDboSession()->execute("DROP INDEX " + indexName);
-    }
+        void migrateFromV56(Session& session)
+        {
+            // Make sure we remove all the previoulsy created index, the createIndexesIfNeeded will recreate them all
+            std::vector<std::string> indexeNames{ utils::fetchQueryResults(session.getDboSession()->query<std::string>(R"(SELECT name FROM sqlite_master WHERE type = 'index' AND name LIKE '%_idx')")) };
+            for (const auto& indexName : indexeNames)
+                session.getDboSession()->execute("DROP INDEX " + indexName);
+        }
 
-    void migrateFromV57(Session& session)
-    {
-        // useless index, may have been already removed in the previous step
-        session.getDboSession()->execute("DROP INDEX IF EXISTS cluster_name_idx");
-    }
+        void migrateFromV57(Session& session)
+        {
+            // useless index, may have been already removed in the previous step
+            session.getDboSession()->execute("DROP INDEX IF EXISTS cluster_name_idx");
+        }
 
-    void migrateFromV58(Session& session)
-    {
-        // DSF support
-        session.getDboSession()->execute("UPDATE scan_settings SET audio_file_extensions = audio_file_extensions || ' .dsf'");
-    }
+        void migrateFromV58(Session& session)
+        {
+            // DSF support
+            session.getDboSession()->execute("UPDATE scan_settings SET audio_file_extensions = audio_file_extensions || ' .dsf'");
+        }
+
+        void migrateFromV59(Session& session)
+        {
+            // Dedicated image table
+            session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "image" (
+  "id" integer primary key autoincrement,
+  "version" integer not null,
+  "path" text not null,
+  "file_last_write" text,
+  "file_size" integer not null,
+  "width" integer not null,
+  "height" integer not null,
+  "artist_id" bigint,
+  constraint "fk_image_artist" foreign key ("artist_id") references "artist" ("id") on delete cascade deferrable initially deferred
+))");
+
+            // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+            session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+        }
+    } // namespace
 
     bool doDbMigration(Session& session)
     {
@@ -511,6 +533,7 @@ SELECT
             { 56, migrateFromV56 },
             { 57, migrateFromV57 },
             { 58, migrateFromV58 },
+            { 59, migrateFromV59 },
         };
 
         bool migrationPerformed{};

src/libs/database/impl/Session.cpp

@@ -26,6 +26,7 @@
 #include "database/AuthToken.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"
+#include "database/Image.hpp"
 #include "database/Listen.hpp"
 #include "database/MediaLibrary.hpp"
 #include "database/Release.hpp"
@@ -92,6 +93,7 @@ namespace lms::db
         _session.mapClass<AuthToken>("auth_token");
         _session.mapClass<Cluster>("cluster");
         _session.mapClass<ClusterType>("cluster_type");
+        _session.mapClass<Image>("image");
         _session.mapClass<Listen>("listen");
         _session.mapClass<MediaLibrary>("media_library");
         _session.mapClass<Release>("release");
@@ -177,6 +179,8 @@ namespace lms::db
         _session.execute("CREATE INDEX IF NOT EXISTS cluster_cluster_type_idx ON cluster(cluster_type_id)");
         _session.execute("CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)");
 
+        _session.execute("CREATE INDEX IF NOT EXISTS image_artist_idx ON image(artist_id)");
+
         _session.execute("CREATE INDEX IF NOT EXISTS listen_backend_idx ON listen(backend)");
         _session.execute("CREATE INDEX IF NOT EXISTS listen_id_idx ON listen(id)");
         _session.execute("CREATE INDEX IF NOT EXISTS listen_user_backend_idx ON listen(user_id,backend)");

src/libs/database/include/database/Artist.hpp

@@ -44,6 +44,7 @@ namespace lms::db
 
     class Cluster;
     class ClusterType;
+    class Image;
     class Release;
     class Session;
     class StarredArtist;
@@ -139,6 +140,7 @@ namespace lms::db
         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); }
+        ObjectPtr<Image> getImage() const;
 
         // No artistLinkTypes means get them all
         RangeResults<ArtistId> findSimilarArtistIds(core::EnumSet<TrackArtistLinkType> artistLinkTypes = {}, std::optional<Range> range = std::nullopt) const;
@@ -159,6 +161,7 @@ namespace lms::db
             Wt::Dbo::field(a, _sortName, "sort_name");
             Wt::Dbo::field(a, _MBID, "mbid");
 
+            Wt::Dbo::hasOne(a, _image, "artist");
             Wt::Dbo::hasMany(a, _trackArtistLinks, Wt::Dbo::ManyToOne, "artist");
             Wt::Dbo::hasMany(a, _starredArtists, Wt::Dbo::ManyToMany, "user_starred_artists", "", Wt::Dbo::OnDeleteCascade);
         }
@@ -175,6 +178,7 @@ namespace lms::db
         std::string _sortName;
         std::string _MBID; // Musicbrainz Identifier
 
+        Wt::Dbo::weak_ptr<Image> _image;
         Wt::Dbo::collection<Wt::Dbo::ptr<TrackArtistLink>> _trackArtistLinks; // Tracks involving this artist
         Wt::Dbo::collection<Wt::Dbo::ptr<StarredArtist>> _starredArtists;     // starred entries for this artist
     };

src/libs/database/include/database/Image.hpp

@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <filesystem>
+
+#include <Wt/WDateTime.h>
+#include <Wt/Dbo/Dbo.h>
+
+#include "database/ArtistId.hpp"
+#include "database/ImageId.hpp"
+#include "database/Object.hpp"
+
+namespace lms::db
+{
+    class Artist;
+    class Session;
+
+    class Image final : public Object<Image, ImageId>
+    {
+    public:
+        Image() = default;
+
+        // find
+        static std::size_t getCount(Session& session);
+        static pointer find(Session& session, ImageId id);
+
+        // getters
+        const std::filesystem::path& getPath() const { return _path; }
+        const Wt::WDateTime& getLastWriteTime() const { return _fileLastWrite; }
+        std::size_t getFileSize() const { return _fileSize; }
+        std::size_t getWidth() const { return _width; }
+        std::size_t getHeight() const { return _height; }
+
+        // setters
+        void setPath(const std::filesystem::path& p) { _path = p; }
+        void setLastWriteTime(Wt::WDateTime time) { _fileLastWrite = time; }
+        void setFileSize(std::size_t fileSize) { _fileSize = fileSize; }
+        void setWidth(std::size_t width) { _width = width; }
+        void setHeight(std::size_t height) { _height = height; }
+        void setArtist(const ObjectPtr<Artist>& artist) { _artist = getDboPtr(artist); }
+
+        template<class Action>
+        void persist(Action& a)
+        {
+            Wt::Dbo::field(a, _path, "path");
+            Wt::Dbo::field(a, _fileLastWrite, "file_last_write");
+            Wt::Dbo::field(a, _fileSize, "file_size");
+
+            Wt::Dbo::field(a, _width, "width");
+            Wt::Dbo::field(a, _height, "height");
+
+            Wt::Dbo::belongsTo(a, _artist, "artist", Wt::Dbo::OnDeleteCascade);
+        }
+
+    private:
+        friend class Session;
+        Image(const std::filesystem::path& p);
+        static pointer create(Session& session, const std::filesystem::path& p);
+
+        std::filesystem::path _path;
+        Wt::WDateTime _fileLastWrite;
+        int _fileSize{};
+        int _width{};
+        int _height{};
+
+        Wt::Dbo::ptr<Artist> _artist;
+    };
+} // namespace lms::db

src/libs/database/include/database/ImageId.hpp

@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "database/IdType.hpp"
+
+LMS_DECLARE_IDTYPE(ImageId)

src/libs/database/include/database/Object.hpp

@@ -95,7 +95,7 @@ namespace lms::db
 
         // Can get raw dbo ptr only from Objects
         template<typename SomeObject>
-        static Wt::Dbo::ptr<SomeObject> getDboPtr(ObjectPtr<SomeObject> ptr)
+        static Wt::Dbo::ptr<SomeObject> getDboPtr(const ObjectPtr<SomeObject>& ptr)
         {
             return ptr._obj;
         }

src/libs/database/test/CMakeLists.txt

@@ -4,6 +4,7 @@ add_executable(test-database
 	Cluster.cpp
 	Common.cpp
 	DatabaseTest.cpp
+	Image.cpp
 	Listen.cpp
 	Migration.cpp
 	Release.cpp

src/libs/database/test/Common.cpp

@@ -22,6 +22,7 @@
 #include "database/Artist.hpp"
 #include "database/Cluster.hpp"
 #include "database/Db.hpp"
+#include "database/Image.hpp"
 #include "database/Listen.hpp"
 #include "database/MediaLibrary.hpp"
 #include "database/Release.hpp"
@@ -80,6 +81,7 @@ namespace lms::db::tests
         EXPECT_EQ(Cluster::getCount(session), 0);
         EXPECT_EQ(ClusterType::getCount(session), 0);
         EXPECT_EQ(Listen::getCount(session), 0);
+        EXPECT_EQ(Image::getCount(session), 0);
         EXPECT_EQ(MediaLibrary::getCount(session), 0);
         EXPECT_EQ(Release::getCount(session), 0);
         EXPECT_EQ(StarredArtist::getCount(session), 0);

src/libs/database/test/Image.cpp

@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 Emeric Poupon
+ *
+ * This file is part of LMS.
+ *
+ * LMS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LMS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Common.hpp"
+
+#include "database/Image.hpp"
+
+namespace lms::db::tests
+{
+    using ScopedImage = ScopedEntity<db::Image>;
+
+    TEST_F(DatabaseFixture, Image)
+    {
+        ScopedImage image{ session, "/path/to/image" };
+
+        {
+            auto transaction{ session.createReadTransaction() };
+            EXPECT_EQ(Image::getCount(session), 1);
+
+            Image::pointer img{ Image::find(session, image.getId()) };
+            ASSERT_NE(img, Image::pointer{});
+            EXPECT_EQ(img->getPath(), "/path/to/image");
+            EXPECT_EQ(img->getWidth(), 0);
+            EXPECT_EQ(img->getHeight(), 0);
+            EXPECT_EQ(img->getFileSize(), 0);
+        }
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+
+            Image::pointer img{ Image::find(session, image.getId()) };
+            ASSERT_NE(img, Image::pointer{});
+            img.modify()->setPath("/path/to/another/image");
+            img.modify()->setWidth(640);
+            img.modify()->setHeight(480);
+            img.modify()->setFileSize(1024 * 1024);
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            Image::pointer img{ Image::find(session, image.getId()) };
+            ASSERT_NE(img, Image::pointer{});
+            EXPECT_EQ(img->getPath(), "/path/to/another/image");
+            EXPECT_EQ(img->getWidth(), 640);
+            EXPECT_EQ(img->getHeight(), 480);
+            EXPECT_EQ(img->getFileSize(), 1024 * 1024);
+        }
+    }
+} // namespace lms::db::tests