From 1cd3fb9409f5841ea6b15f3895e583be8a980b23 Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Tue, 10 Jun 2025 09:27:15 +0200
Subject: [PATCH] Get track list images from first tracks in list

---
 src/libs/database/impl/TrackEmbeddedImage.cpp |  4 +++
 src/libs/database/include/database/Types.hpp  |  1 +
 src/libs/database/test/TrackEmbeddedImage.cpp | 35 +++++++++++++++++++
 .../services/artwork/impl/ArtworkService.cpp  |  3 +-
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/libs/database/impl/TrackEmbeddedImage.cpp b/src/libs/database/impl/TrackEmbeddedImage.cpp
index 9189828b..4aa512d9 100644
--- a/src/libs/database/impl/TrackEmbeddedImage.cpp
+++ b/src/libs/database/impl/TrackEmbeddedImage.cpp
@@ -115,6 +115,10 @@ namespace lms::db
             case TrackEmbeddedImageSortMethod::FrontTypeThenSizeDesc:
                 query.orderBy("CASE WHEN t_e_i_l.type = ? THEN 0 ELSE 1 END, t_e_i.size DESC").bind(ImageType::FrontCover);
                 break;
+            case TrackEmbeddedImageSortMethod::TrackListIndexAscThenSizeDesc:
+                assert(params.trackList.isValid());
+                query.orderBy("t_l_e.id, t_e_i.size DESC");
+                break;
             }
 
             return query;
diff --git a/src/libs/database/include/database/Types.hpp b/src/libs/database/include/database/Types.hpp
index 74bee666..1a5d2406 100644
--- a/src/libs/database/include/database/Types.hpp
+++ b/src/libs/database/include/database/Types.hpp
@@ -174,6 +174,7 @@ namespace lms::db
         SizeDesc,
         MediaTypeThenFrontTypeThenSizeDescDesc,
         FrontTypeThenSizeDesc,
+        TrackListIndexAscThenSizeDesc,
     };
 
     enum class TrackListSortMethod
diff --git a/src/libs/database/test/TrackEmbeddedImage.cpp b/src/libs/database/test/TrackEmbeddedImage.cpp
index 0bc0f9ef..a0149f3d 100644
--- a/src/libs/database/test/TrackEmbeddedImage.cpp
+++ b/src/libs/database/test/TrackEmbeddedImage.cpp
@@ -21,6 +21,7 @@
 
 #include "database/TrackEmbeddedImage.hpp"
 #include "database/TrackEmbeddedImageLink.hpp"
+#include "database/TrackList.hpp"
 #include "database/Types.hpp"
 
 #include "Common.hpp"
@@ -452,4 +453,38 @@ namespace lms::db::tests
             EXPECT_TRUE(visited);
         }
     }
+
+    TEST_F(DatabaseFixture, TrackEmbeddedImage_TrackList)
+    {
+        ScopedTrackList trackList{ session, "MytrackList", TrackListType::PlayList };
+
+        ScopedTrack track1{ session };
+        ScopedTrack track2{ session };
+        ScopedTrackEmbeddedImage image1{ session };
+        ScopedTrackEmbeddedImageLink imageLink1{ session, track1.lockAndGet(), image1.lockAndGet() };
+        ScopedTrackEmbeddedImage image2{ session };
+        ScopedTrackEmbeddedImageLink imageLink2{ session, track2.lockAndGet(), image2.lockAndGet() };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            session.create<TrackListEntry>(track2.get(), trackList.get());
+            session.create<TrackListEntry>(track1.get(), trackList.get());
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            TrackEmbeddedImage::FindParameters params;
+            params.setTrackList(trackList.getId());
+            params.setSortMethod(TrackEmbeddedImageSortMethod::TrackListIndexAscThenSizeDesc);
+
+            std::vector<TrackEmbeddedImageId> visitedIds;
+            TrackEmbeddedImage::find(session, params, [&](const TrackEmbeddedImage::pointer& image) {
+                visitedIds.push_back(image->getId());
+            });
+            ASSERT_EQ(visitedIds.size(), 2);
+            EXPECT_EQ(visitedIds[0], image2.getId());
+            EXPECT_EQ(visitedIds[1], image1.getId());
+        }
+    }
 } // namespace lms::db::tests
\ No newline at end of file
diff --git a/src/libs/services/artwork/impl/ArtworkService.cpp b/src/libs/services/artwork/impl/ArtworkService.cpp
index 507b4bf3..1213acc3 100644
--- a/src/libs/services/artwork/impl/ArtworkService.cpp
+++ b/src/libs/services/artwork/impl/ArtworkService.cpp
@@ -312,13 +312,14 @@ namespace lms::artwork
 
         db::TrackEmbeddedImage::FindParameters params;
         params.setTrackList(trackListId);
-        params.setSortMethod(db::TrackEmbeddedImageSortMethod::MediaTypeThenFrontTypeThenSizeDescDesc);
+        params.setSortMethod(db::TrackEmbeddedImageSortMethod::TrackListIndexAscThenSizeDesc);
         params.setRange(db::Range{ .offset = 0, .size = 1 });
 
         db::TrackEmbeddedImage::find(session, params, [&](const db::TrackEmbeddedImage::pointer& image) {
             res = image->getId();
         });
 
+        // TODO fallback on release image if not found
         return res;
     }