Added a way to filter by record label, display labels in the release info panel

src/libs/database/impl/Artist.cpp

@@ -50,7 +50,8 @@ namespace lms::db
                 || params.track.isValid()
                 || params.release.isValid()
                 || params.clusters.size() == 1
-                || params.mediaLibrary.isValid())
+                || params.mediaLibrary.isValid()
+                || params.label.isValid())
             {
                 query.join("track_artist_link t_a_l ON t_a_l.artist_id = a.id");
             }
@@ -59,7 +60,8 @@ namespace lms::db
                 || params.sortMethod == ArtistSortMethod::AddedDesc
                 || params.writtenAfter.isValid()
                 || params.release.isValid()
-                || params.mediaLibrary.isValid())
+                || params.mediaLibrary.isValid()
+                || params.label.isValid())
             {
                 query.join("track t ON t.id = t_a_l.track_id");
 
@@ -71,6 +73,12 @@ namespace lms::db
 
                 if (params.mediaLibrary.isValid())
                     query.where("t.media_library_id = ?").bind(params.mediaLibrary);
+
+                if (params.label.isValid())
+                {
+                    query.join("release_label r_l ON r_l.release_id = t.release_id");
+                    query.where("r_l.label_id = ?").bind(params.label);
+                }
             }
 
             if (params.linkType)

src/libs/database/impl/Listen.cpp

@@ -42,10 +42,18 @@ namespace lms::db
 
             assert(!params.artist.isValid()); // poor check
 
-            if (params.library.isValid())
+            if (params.library.isValid() || params.label.isValid())
             {
                 query.join("track t ON t.id = t_a_l.track_id");
+            }
+
+            if (params.library.isValid())
                 query.where("t.media_library_id = ?").bind(params.library);
+
+            if (params.label.isValid())
+            {
+                query.join("release_label r_l ON t.release_id = r_l.release_id");
+                query.where("r_l.label_id = ?").bind(params.label);
             }
 
             if (params.linkType)
@@ -113,6 +121,12 @@ namespace lms::db
             if (params.library.isValid())
                 query.where("t.media_library_id = ?").bind(params.library);
 
+            if (params.label.isValid())
+            {
+                query.join("release_label r_l ON r_l.release_id = r.id");
+                query.where("r_l.label_id = ?").bind(params.label);
+            }
+
             if (!params.clusters.empty())
             {
                 std::ostringstream oss;
@@ -160,6 +174,12 @@ namespace lms::db
             if (params.library.isValid())
                 query.where("t.media_library_id = ?").bind(params.library);
 
+            if (params.label.isValid())
+            {
+                query.join("release_label r_l ON r_l.release_id = t.release_id");
+                query.where("r_l.label_id = ?").bind(params.label);
+            }
+
             if (!params.clusters.empty())
             {
                 std::ostringstream oss;

src/libs/database/impl/Migration.cpp

@@ -1074,6 +1074,9 @@ FROM tracklist)");
 
     void migrateFromV81(Session& session)
     {
+        // Make sure we remove all the previoulsy created index, the createIndexesIfNeeded will recreate them all
+        dropIndexes(session);
+
         // Add country + release country
         utils::executeCommand(*session.getDboSession(), R"(CREATE TABLE IF NOT EXISTS "country" (
   "id" integer primary key autoincrement,

src/libs/database/impl/Release.cpp

@@ -28,6 +28,7 @@
 #include "database/Image.hpp"
 #include "database/Session.hpp"
 #include "database/Track.hpp"
+#include "database/Types.hpp"
 #include "database/User.hpp"
 
 #include "EnumSetTraits.hpp"
@@ -76,6 +77,12 @@ namespace lms::db
             if (params.mediaLibrary.isValid())
                 query.where("t.media_library_id = ?").bind(params.mediaLibrary);
 
+            if (params.label.isValid())
+            {
+                query.join("release_label r_l ON r_l.release_id = r.id");
+                query.where("r_l.label_id = ?").bind(params.label);
+            }
+
             if (params.directory.isValid())
                 query.where("t.directory_id = ?").bind(params.directory);
 
@@ -332,6 +339,24 @@ namespace lms::db
         return utils::fetchQuerySingleResult(session.getDboSession()->query<Wt::Dbo::ptr<Label>>("SELECT l from label l").where("l.name = ?").bind(name));
     }
 
+    void Label::find(Session& session, LabelSortMethod sortMethod, std::function<void(const Label::pointer& label)> func)
+    {
+        session.checkReadTransaction();
+
+        auto query{ session.getDboSession()->find<Label>() };
+        switch (sortMethod)
+        {
+        case LabelSortMethod::None:
+            break;
+        case LabelSortMethod::Name:
+            query.orderBy("name COLLATE NOCASE");
+        }
+
+        utils::forEachQueryResult(query, [&](const Label::pointer& label) {
+            func(label);
+        });
+    }
+
     RangeResults<LabelId> Label::findOrphanIds(Session& session, std::optional<Range> range)
     {
         session.checkReadTransaction();

src/libs/database/impl/Session.cpp

@@ -201,7 +201,7 @@ namespace lms::db
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS cluster_type_name_idx ON cluster_type(name)");
 
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_id_idx ON country(id)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_name_idx ON country(name)");
+            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS country_name_idx ON country(name COLLATE NOCASE)");
 
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_id_idx ON directory(id)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS directory_parent_directory_idx ON directory(parent_directory_id)");
@@ -215,7 +215,7 @@ namespace lms::db
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS image_stem_idx ON image(stem COLLATE NOCASE)");
 
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS label_id_idx ON label(id)");
-            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS label_name_idx ON label(name)");
+            utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS label_name_idx ON label(name COLLATE NOCASE)");
 
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_backend_idx ON listen(backend)");
             utils::executeCommand(_session, "CREATE INDEX IF NOT EXISTS listen_id_idx ON listen(id)");

src/libs/database/impl/Track.cpp

@@ -162,6 +162,12 @@ namespace lms::db
             if (params.mediaLibrary.isValid())
                 query.where("t.media_library_id = ?").bind(params.mediaLibrary);
 
+            if (params.label.isValid())
+            {
+                query.join("release_label r_l ON r_l.release_id = t.release_id");
+                query.where("r_l.label_id = ?").bind(params.label);
+            }
+
             if (params.directory.isValid())
                 query.where("t.directory_id = ?").bind(params.directory);