Added a way to set custom tag delimiters for artists and for other fields, fixes #417

src/libs/database/impl/Migration.cpp

@@ -215,7 +215,7 @@ CREATE TABLE IF NOT EXISTS "track_backup" (
         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");
     }
 
@@ -359,7 +359,7 @@ 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
+        // Migrate data, with the new media_library_id field set to 1
         session.getDboSession().execute(R"(INSERT INTO track_backup 
 SELECT
  id,
@@ -394,6 +394,13 @@ SELECT
         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 doDbMigration(Session& session)
     {
         static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
@@ -422,6 +429,7 @@ SELECT
             {48, migrateFromV48},
             {49, migrateFromV49},
             {50, migrateFromV50},
+            {51, migrateFromV51},
         };
 
         {

src/libs/database/impl/Migration.hpp

@@ -26,7 +26,7 @@ namespace Database
     class Session;
 
     using Version = std::size_t;
-    static constexpr Version LMS_DATABASE_VERSION{ 51 };
+    static constexpr Version LMS_DATABASE_VERSION{ 52 };
     class VersionInfo
     {
     public:

src/libs/database/impl/ScanSettings.cpp

@@ -46,7 +46,7 @@ namespace Database
 
     std::vector<std::filesystem::path> ScanSettings::getAudioFileExtensions() const
     {
-        const auto extensions{ StringUtils::splitString(_audioFileExtensions, " ") };
+        const auto extensions{ StringUtils::splitString(_audioFileExtensions, ' ') };
 
         std::vector<std::filesystem::path> res(std::cbegin(extensions), std::cend(extensions));
         std::sort(std::begin(res), std::end(res));
@@ -57,7 +57,17 @@ namespace Database
 
     std::vector<std::string_view> ScanSettings::getExtraTagsToScan() const
     {
-        return StringUtils::splitString(_extraTagsToScan, ";");
+        return StringUtils::splitString(_extraTagsToScan, ';');
+    }
+
+    std::vector<std::string> ScanSettings::getArtistTagDelimiters() const
+    {
+        return StringUtils::splitEscapedStrings(_artistTagDelimiters, ';', '\\');
+    }
+
+    std::vector<std::string> ScanSettings::getDefaultTagDelimiters() const
+    {
+        return StringUtils::splitEscapedStrings(_defaultTagDelimiters, ';', '\\');
     }
 
     void ScanSettings::setExtraTagsToScan(const std::vector<std::string_view>& extraTags)
@@ -69,6 +79,26 @@ namespace Database
         _extraTagsToScan = std::move(newTagsToScan);
     }
 
+    void ScanSettings::setArtistTagDelimiters(std::span<const std::string_view> delimiters)
+    {
+        std::string tagDelimiters{ StringUtils::escapeAndJoinStrings(delimiters, ';', '\\') };
+        if (tagDelimiters != _artistTagDelimiters)
+        {
+            _artistTagDelimiters.swap(tagDelimiters);
+            incScanVersion();
+        }
+    }
+
+    void ScanSettings::setDefaultTagDelimiters(std::span<const std::string_view> delimiters)
+    {
+        std::string tagDelimiters{ StringUtils::escapeAndJoinStrings(delimiters, ';', '\\') };
+        if (tagDelimiters != _defaultTagDelimiters)
+        {
+            _defaultTagDelimiters.swap(tagDelimiters);
+            incScanVersion();
+        }
+    }
+
     void ScanSettings::incScanVersion()
     {
         _scanVersion += 1;

src/libs/database/include/database/ScanSettings.hpp

@@ -20,6 +20,7 @@
 #pragma once
 
 #include <filesystem>
+#include <span>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -62,18 +63,22 @@ namespace Database
         static pointer get(Session& session);
 
         // Getters
-        std::size_t				getScanVersion() const { return _scanVersion; }
-        Wt::WTime				getUpdateStartTime() const { return _startTime; }
-        UpdatePeriod			getUpdatePeriod() const { return _updatePeriod; }
-        std::vector<std::string_view> getExtraTagsToScan() const;
-        std::vector<std::filesystem::path> getAudioFileExtensions() const;
-        SimilarityEngineType	getSimilarityEngineType() const { return _similarityEngineType; }
+        std::size_t                         getScanVersion() const { return _scanVersion; }
+        Wt::WTime                           getUpdateStartTime() const { return _startTime; }
+        UpdatePeriod                        getUpdatePeriod() const { return _updatePeriod; }
+        std::vector<std::string_view>       getExtraTagsToScan() const;
+        std::vector<std::filesystem::path>  getAudioFileExtensions() const;
+        SimilarityEngineType	            getSimilarityEngineType() const { return _similarityEngineType; }
+        std::vector<std::string>            getArtistTagDelimiters() const;
+        std::vector<std::string>            getDefaultTagDelimiters() const;
 
         // Setters
         void setUpdateStartTime(Wt::WTime t) { _startTime = t; }
         void setUpdatePeriod(UpdatePeriod p) { _updatePeriod = p; }
         void setExtraTagsToScan(const std::vector<std::string_view>& extraTags);
         void setSimilarityEngineType(SimilarityEngineType type) { _similarityEngineType = type; }
+        void setArtistTagDelimiters(std::span<const std::string_view> delimiters);
+        void setDefaultTagDelimiters(std::span<const std::string_view> delimiters);
         void incScanVersion();
 
         template<class Action>
@@ -85,6 +90,8 @@ namespace Database
             Wt::Dbo::field(a, _audioFileExtensions, "audio_file_extensions");
             Wt::Dbo::field(a, _similarityEngineType, "similarity_engine_type");
             Wt::Dbo::field(a, _extraTagsToScan, "extra_tags_to_scan");
+            Wt::Dbo::field(a, _artistTagDelimiters, "artist_tag_delimiters");
+            Wt::Dbo::field(a, _defaultTagDelimiters, "default_tag_delimiters");
         }
 
     private:
@@ -94,6 +101,7 @@ namespace Database
         SimilarityEngineType    _similarityEngineType{ SimilarityEngineType::Clusters };
         std::string             _audioFileExtensions{ ".alac .mp3 .ogg .oga .aac .m4a .m4b .flac .wav .wma .aif .aiff .ape .mpc .shn .opus .wv" };
         std::string             _extraTagsToScan;
+        std::string             _artistTagDelimiters;
+        std::string             _defaultTagDelimiters;
     };
 } // namespace Database
-