Added a way to set artists that must not be split, fixes #522

src/libs/database/impl/Migration.cpp

@@ -35,7 +35,7 @@ namespace lms::db
 {
     namespace
     {
-        static constexpr Version LMS_DATABASE_VERSION{ 87 };
+        static constexpr Version LMS_DATABASE_VERSION{ 88 };
     }
 
     VersionInfo::VersionInfo()
@@ -1184,6 +1184,11 @@ FROM tracklist)");
         utils::executeCommand(*session.getDboSession(), "ALTER TABLE scan_settings RENAME COLUMN scan_version TO audio_scan_version");
     }
 
+    void migrateFromV87(Session& session)
+    {
+        utils::executeCommand(*session.getDboSession(), "ALTER TABLE scan_settings ADD COLUMN artists_to_not_split TEXT NON NULL DEFAULT('')");
+    }
+
     bool doDbMigration(Session& session)
     {
         constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -1247,6 +1252,7 @@ FROM tracklist)");
             { 84, migrateFromV84 },
             { 85, migrateFromV85 },
             { 86, migrateFromV86 },
+            { 87, migrateFromV87 },
         };
 
         bool migrationPerformed{};

src/libs/database/impl/ScanSettings.cpp

@@ -26,6 +26,7 @@
 #include "database/Session.hpp"
 
 #include "Utils.hpp"
+#include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
 namespace lms::db
@@ -40,7 +41,14 @@ namespace lms::db
         return session.getDboSession()->add(std::unique_ptr<ScanSettings>(new ScanSettings{ name }));
     }
 
-    ScanSettings::pointer ScanSettings::get(Session& session, std::string_view name)
+    ScanSettings::pointer ScanSettings::find(Session& session, ScanSettingsId id)
+    {
+        session.checkReadTransaction();
+
+        return utils::fetchQuerySingleResult(session.getDboSession()->query<Wt::Dbo::ptr<ScanSettings>>("SELECT s_s from scan_settings s_s").where("s_s.id = ?").bind(id));
+    }
+
+    ScanSettings::pointer ScanSettings::find(Session& session, std::string_view name)
     {
         session.checkReadTransaction();
 
@@ -66,13 +74,19 @@ namespace lms::db
         return core::stringUtils::splitEscapedStrings(_defaultTagDelimiters, ';', '\\');
     }
 
+    std::vector<std::string> ScanSettings::getArtistsToNotSplit() const
+    {
+        return core::stringUtils::splitEscapedStrings(_artistsToNotSplit, ';', '\\');
+    }
+
     void ScanSettings::setExtraTagsToScan(std::span<const std::string_view> extraTags)
     {
         std::string newTagsToScan{ core::stringUtils::joinStrings(extraTags, ";") };
         if (newTagsToScan != _extraTagsToScan)
+        {
+            _extraTagsToScan.swap(newTagsToScan);
             incAudioScanVersion();
-
-        _extraTagsToScan = std::move(newTagsToScan);
+        }
     }
 
     void ScanSettings::setArtistTagDelimiters(std::span<const std::string_view> delimiters)
@@ -85,6 +99,16 @@ namespace lms::db
         }
     }
 
+    void ScanSettings::setArtistsToNotSplit(std::span<const std::string_view> artists)
+    {
+        std::string artistsToNotSplit{ core::stringUtils::escapeAndJoinStrings(artists, ';', '\\') };
+        if (artistsToNotSplit != _artistsToNotSplit)
+        {
+            _artistsToNotSplit.swap(artistsToNotSplit);
+            incAudioScanVersion();
+        }
+    }
+
     void ScanSettings::setDefaultTagDelimiters(std::span<const std::string_view> delimiters)
     {
         std::string tagDelimiters{ core::stringUtils::escapeAndJoinStrings(delimiters, ';', '\\') };

src/libs/database/impl/Session.cpp

@@ -181,7 +181,7 @@ namespace lms::db
         {
             auto uniqueTransaction{ createWriteTransaction() };
 
-            if (!ScanSettings::get(*this))
+            if (!ScanSettings::find(*this))
                 create<ScanSettings>();
         }