Now resolve the preferred track artworks during scan steps

src/libs/database/impl/Cluster.cpp

@@ -20,6 +20,7 @@
 #include "database/Cluster.hpp"
 
 #include "database/Artist.hpp"
+#include "database/Artwork.hpp"
 #include "database/Directory.hpp"
 #include "database/MediaLibrary.hpp"
 #include "database/Release.hpp"

src/libs/database/impl/Migration.cpp

@@ -1231,7 +1231,6 @@ FROM tracklist)");
   constraint "fk_artwork_image" foreign key ("image_id") references "image" ("id") on delete cascade deferrable initially deferred))");
 
         // Replaced image by artwork for release
-        // Create the new table, copy the data, drop the old table, rename the new one
         utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "release_backup" (
   "id" integer primary key autoincrement,
   "version" integer not null,
@@ -1267,8 +1266,96 @@ FROM release)");
         utils::executeCommand(*session.getDboSession(), "DROP TABLE release");
         utils::executeCommand(*session.getDboSession(), "ALTER TABLE release_backup RENAME TO release");
 
+        // Replaced image by artwork for track
+        utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "track_backup" (
+  "id" integer primary key autoincrement,
+  "version" integer not null,
+  "scan_version" integer not null,
+  "track_number" integer,
+  "disc_number" integer,
+  "total_track" integer,
+  "disc_subtitle" text not null,
+  "name" text not null,
+  "duration" integer,
+  "bitrate" integer not null,
+  "bits_per_sample" integer not null,
+  "channel_count" integer not null,
+  "sample_rate" integer not null,
+  "date" text,
+  "original_date" text,
+  "absolute_file_path" text not null,
+  "relative_file_path" text not null,
+  "file_stem" text not null,
+  "file_name" text not null,
+  "file_size" bigint not null,
+  "file_last_write" text,
+  "file_added" text,
+  "mbid" text not null,
+  "recording_mbid" text not null,
+  "copyright" text not null,
+  "copyright_url" text not null,
+  "advisory" integer not null,
+  "track_replay_gain" real,
+  "release_replay_gain" real,
+  "artist_display_name" text not null,
+  "comment" text not null,
+  "release_id" bigint,
+  "media_library_id" bigint,
+  "directory_id" bigint,
+  "preferred_artwork_id" bigint,
+  "preferred_media_artwork_id" bigint,
+  constraint "fk_track_release" foreign key ("release_id") references "release" ("id") on delete cascade deferrable initially deferred,
+  constraint "fk_track_media_library" foreign key ("media_library_id") references "media_library" ("id") on delete set null deferrable initially deferred,
+  constraint "fk_track_directory" foreign key ("directory_id") references "directory" ("id") on delete cascade deferrable initially deferred,
+  constraint "fk_track_preferred_artwork" foreign key ("preferred_artwork_id") references "artwork" ("id") on delete set null deferrable initially deferred,
+  constraint "fk_track_preferred_media_artwork" foreign key ("preferred_media_artwork_id") references "artwork" ("id") on delete set null deferrable initially deferred
+    ))");
+
+        // Migrate data, with the new preferred_artwork_id and preferred_media_artwork_id fields set to null
+        utils::executeCommand(*session.getDboSession(), R"(INSERT INTO track_backup
+SELECT
+ id,
+ version,
+ scan_version,
+ track_number,
+ disc_number,
+ total_track,
+ disc_subtitle,
+ name,
+ duration,
+ bitrate,
+ bits_per_sample,
+ channel_count,
+ sample_rate,
+ date,
+ original_date,
+ absolute_file_path,
+ relative_file_path,
+ file_stem,
+ file_name,
+ file_size,
+ file_last_write,
+ file_added,
+ mbid,
+ recording_mbid,
+ copyright,
+ copyright_url,
+ advisory,
+ track_replay_gain,
+ release_replay_gain,
+ artist_display_name,
+ comment,
+ release_id,
+ media_library_id,
+ directory_id,
+ NULL as preferred_artwork_id,
+ NULL as preferred_media_artwork_id
+FROM track)");
+        utils::executeCommand(*session.getDboSession(), "DROP TABLE track");
+        utils::executeCommand(*session.getDboSession(), "ALTER TABLE track_backup RENAME TO track");
+
         // Just increment the scan version of the settings to make the next scan rescan everything
-        utils::executeCommand(*session.getDboSession(), "UPDATE scan_settings SET artist_info_scan_version = artist_info_scan_version + 1");
+        utils::executeCommand(*session.getDboSession(), "UPDATE scan_settings SET audio_scan_version = audio_scan_version + 1");
     }
 
     bool doDbMigration(Session& session)
@@ -1339,7 +1426,7 @@ FROM release)");
             { 89, migrateFromV89 },
             { 90, migrateFromV90 },
             { 91, migrateFromV91 },
-            { 92, migrateFromV92 }
+            { 92, migrateFromV92 },
         };
 
         bool migrationPerformed{};

src/libs/database/impl/PlayQueue.cpp

@@ -21,6 +21,7 @@
 
 #include <Wt/Dbo/SqlTraits.h>
 
+#include "database/Artwork.hpp"
 #include "database/Directory.hpp"
 #include "database/MediaLibrary.hpp"
 #include "database/Release.hpp"

src/libs/database/impl/Release.cpp

@@ -706,6 +706,11 @@ namespace lms::db
         return ObjectPtr<Artwork>{ _preferredArtwork };
     }
 
+    ArtworkId Release::getPreferredArtworkId() const
+    {
+        return _preferredArtwork.id();
+    }
+
     void Release::clearLabels()
     {
         _labels.clear();

src/libs/database/impl/Track.cpp

@@ -23,6 +23,7 @@
 
 #include "core/ILogger.hpp"
 #include "database/Artist.hpp"
+#include "database/Artwork.hpp"
 #include "database/Cluster.hpp"
 #include "database/Directory.hpp"
 #include "database/MediaLibrary.hpp"
@@ -324,6 +325,20 @@ namespace lms::db
         return utils::execRangeQuery<TrackId>(query, range);
     }
 
+    void Track::updatePreferredArtwork(Session& session, TrackId trackId, ArtworkId artworkId)
+    {
+        session.checkWriteTransaction();
+
+        utils::executeCommand(*session.getDboSession(), "UPDATE track SET preferred_artwork_id = ? WHERE id = ?", artworkId, trackId);
+    }
+
+    void Track::updatePreferredMediaArtwork(Session& session, TrackId trackId, ArtworkId artworkId)
+    {
+        session.checkWriteTransaction();
+
+        utils::executeCommand(*session.getDboSession(), "UPDATE track SET preferred_media_artwork_id = ? WHERE id = ?", artworkId, trackId);
+    }
+
     std::vector<Cluster::pointer> Track::getClusters() const
     {
         return utils::fetchQueryResults<Cluster::pointer>(_clusters.find());
@@ -338,6 +353,26 @@ namespace lms::db
         return utils::fetchQueryResults(query);
     }
 
+    ObjectPtr<MediaLibrary> Track::getMediaLibrary() const
+    {
+        return _mediaLibrary;
+    }
+
+    ObjectPtr<Directory> Track::getDirectory() const
+    {
+        return _directory;
+    }
+
+    ObjectPtr<Artwork> Track::getPreferredArtwork() const
+    {
+        return _preferredArtwork;
+    }
+
+    ObjectPtr<Artwork> Track::getPreferredMediaArtwork() const
+    {
+        return _preferredMediaArtwork;
+    }
+
     RangeResults<TrackId> Track::findIds(Session& session, const FindParameters& parameters)
     {
         session.checkReadTransaction();
@@ -484,6 +519,26 @@ namespace lms::db
         _embeddedImageLinks.insert(getDboPtr(image));
     }
 
+    void Track::setMediaLibrary(ObjectPtr<MediaLibrary> mediaLibrary)
+    {
+        _mediaLibrary = getDboPtr(mediaLibrary);
+    }
+
+    void Track::setDirectory(ObjectPtr<Directory> directory)
+    {
+        _directory = getDboPtr(directory);
+    }
+
+    void Track::setPreferredArtwork(ObjectPtr<Artwork> artwork)
+    {
+        _preferredArtwork = getDboPtr(artwork);
+    }
+
+    void Track::setPreferredMediaArtwork(ObjectPtr<Artwork> artwork)
+    {
+        _preferredMediaArtwork = getDboPtr(artwork);
+    }
+
     std::optional<int> Track::getYear() const
     {
         return _date.getYear();