Added an option to merge artists without MBIDs to those with one, fixes #642

src/libs/database/test/ArtistInfo.cpp

@@ -109,4 +109,103 @@ namespace lms::db::tests
             EXPECT_TRUE(visited);
         }
     }
+
+    TEST_F(DatabaseFixture, ArtistInfo_findArtistNameNoLongerMatch)
+    {
+        ScopedArtistInfo artistInfo{ session };
+        ScopedArtist artist{ session, "MyArtist" };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            artistInfo.get().modify()->setArtist(artist.get());
+            artistInfo.get().modify()->setName("MyArtist");
+            artistInfo.get().modify()->setMBIDMatched(false);
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findArtistNameNoLongerMatch(session, std::nullopt, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_FALSE(visited);
+        }
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            artist.get().modify()->setName("MyArtist2");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findArtistNameNoLongerMatch(session, std::nullopt, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+    }
+
+    TEST_F(DatabaseFixture, ArtistInfo_findWithArtistNameAmbiguity_split)
+    {
+        ScopedArtistInfo artistInfo1{ session };
+        ScopedArtist artist1{ session, "MyArtist", core::UUID::fromString("b227426f-98b8-4b39-b3a7-ff25e7711e9b") };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            artistInfo1.get().modify()->setArtist(artist1.get());
+            artistInfo1.get().modify()->setName("MyArtist");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_FALSE(visited);
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+
+        ScopedArtist artist2{ session, "MyArtist", core::UUID::fromString("97d1fb6f-db09-4760-b0b3-816559bcb632") };
+        ScopedArtistInfo artistInfo2{ session };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            artistInfo2.get().modify()->setArtist(artist2.get());
+            artistInfo2.get().modify()->setName("MyArtist");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            ArtistInfo::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const ArtistInfo::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+    }
 } // namespace lms::db::tests

src/libs/database/test/CMakeLists.txt

@@ -19,6 +19,7 @@ add_executable(test-database
 	StarredRelease.cpp
 	StarredTrack.cpp
 	Track.cpp
+	TrackArtistLink.cpp
 	TrackBookmark.cpp
 	TrackEmbeddedImage.cpp
 	TrackFeatures.cpp

src/libs/database/test/Migration.cpp

@@ -34,6 +34,7 @@
 #include "database/StarredArtist.hpp"
 #include "database/StarredRelease.hpp"
 #include "database/StarredTrack.hpp"
+#include "database/TrackArtistLink.hpp"
 #include "database/TrackEmbeddedImage.hpp"
 #include "database/TrackEmbeddedImageLink.hpp"
 #include "database/TrackLyrics.hpp"
@@ -365,6 +366,7 @@ VALUES
             EXPECT_FALSE(StarredRelease::find(session, StarredReleaseId{}));
             EXPECT_FALSE(StarredTrack::find(session, StarredTrackId{}));
             EXPECT_FALSE(Track::find(session, TrackId{}));
+            EXPECT_FALSE(TrackArtistLink::find(session, TrackArtistLinkId{}));
             EXPECT_FALSE(TrackList::find(session, TrackListId{}));
             EXPECT_FALSE(TrackLyrics::find(session, TrackLyricsId{}));
             EXPECT_FALSE(UIState::find(session, UIStateId{}));

src/libs/database/test/TrackArtistLink.cpp

@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2025 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/Types.hpp"
+
+#include "database/TrackArtistLink.hpp"
+
+namespace lms::db::tests
+{
+    TEST_F(DatabaseFixture, TrackArtistLink_findArtistNameNoLongerMatch)
+    {
+        ScopedTrack track{ session };
+        ScopedArtist artist{ session, "MyArtist" };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            auto link{ session.create<TrackArtistLink>(track.get(), artist.get(), TrackArtistLinkType::Artist, false) };
+            link.modify()->setArtistName("MyArtist");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findArtistNameNoLongerMatch(session, std::nullopt, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_FALSE(visited);
+        }
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            artist.get().modify()->setName("MyArtist2");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findArtistNameNoLongerMatch(session, std::nullopt, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+    }
+
+    TEST_F(DatabaseFixture, TrackArtistLink_findWithArtistNameAmbiguity_split)
+    {
+        ScopedTrack track{ session };
+        ScopedArtist artist1{ session, "MyArtist", core::UUID::fromString("b227426f-98b8-4b39-b3a7-ff25e7711e9b") };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            auto link{ session.create<TrackArtistLink>(track.get(), artist1.get(), TrackArtistLinkType::Artist, false) };
+            link.modify()->setArtistName("MyArtist");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_FALSE(visited);
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+
+        ScopedArtist artist2{ session, "MyArtist", core::UUID::fromString("97d1fb6f-db09-4760-b0b3-816559bcb632") };
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            bool visited{};
+            TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                visited = true;
+            });
+            ASSERT_TRUE(visited);
+        }
+    }
+
+    TEST_F(DatabaseFixture, TrackArtistLink_findWithArtistNameAmbiguity_merge)
+    {
+        ScopedTrack track{ session };
+        ScopedArtist artist1{ session, "MyArtist" };
+
+        {
+            auto transaction{ session.createWriteTransaction() };
+            auto link{ session.create<TrackArtistLink>(track.get(), artist1.get(), TrackArtistLinkType::Artist, false) };
+            link.modify()->setArtistName("MyArtist");
+        }
+
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = false;
+                });
+                ASSERT_FALSE(visited);
+            }
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = true;
+                });
+                ASSERT_FALSE(visited);
+            }
+        }
+
+        ScopedArtist artist2{ session, "MyArtist", core::UUID::fromString("97d1fb6f-db09-4760-b0b3-816559bcb632") };
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = true;
+                });
+                ASSERT_TRUE(visited);
+            }
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = true;
+                });
+                ASSERT_FALSE(visited);
+            }
+        }
+
+        ScopedArtist artist3{ session, "MyArtist", core::UUID::fromString("3d46c4fb-110d-4d4f-a2d5-5ca57ef1d582") };
+        {
+            auto transaction{ session.createReadTransaction() };
+
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, true /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = true;
+                });
+                ASSERT_FALSE(visited);
+            }
+            {
+                bool visited{};
+                TrackArtistLink::findWithArtistNameAmbiguity(session, std::nullopt, false /*allow fallback*/, [&](const TrackArtistLink::pointer&) {
+                    visited = true;
+                });
+                ASSERT_FALSE(visited);
+            }
+        }
+    }
+} // namespace lms::db::tests