Removed the dedicated search view, as it is actually too limiting. Added a search field in the album/artists/tracks views. This makes search now work together with sort mode

src/libs/database/impl/Listen.cpp

@@ -32,9 +32,8 @@ namespace lms::db
         Wt::Dbo::Query<ArtistId> createArtistsQuery(Session& session, const Listen::ArtistStatsFindParameters& params)
         {
             auto query{ session.getDboSession()->query<ArtistId>("SELECT a.id from artist a")
-                            .join("track t ON t.id = t_a_l.track_id")
                             .join("track_artist_link t_a_l ON t_a_l.artist_id = a.id")
-                            .join("listen l ON l.track_id = t.id") };
+                            .join("listen l ON l.track_id = t_a_l.track_id") };
 
             if (params.user.isValid())
                 query.where("l.user_id = ?").bind(params.user);
@@ -45,7 +44,10 @@ namespace lms::db
             assert(!params.artist.isValid()); // poor check
 
             if (params.library.isValid())
+            {
+                query.join("track t ON t.id = t_a_l.track_id");
                 query.where("t.media_library_id = ?").bind(params.library);
+            }
 
             if (params.linkType)
                 query.where("t_a_l.type = ?").bind(*params.linkType);
@@ -69,6 +71,26 @@ namespace lms::db
                 query.where(oss.str());
             }
 
+            if (!params.keywords.empty())
+            {
+                std::vector<std::string> clauses;
+                std::vector<std::string> sortClauses;
+
+                for (const std::string_view keyword : params.keywords)
+                {
+                    clauses.push_back("a.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'");
+                    query.bind("%" + utils::escapeLikeKeyword(keyword) + "%");
+                }
+
+                for (const std::string_view keyword : params.keywords)
+                {
+                    sortClauses.push_back("a.sort_name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'");
+                    query.bind("%" + utils::escapeLikeKeyword(keyword) + "%");
+                }
+
+                query.where("(" + core::stringUtils::joinStrings(clauses, " AND ") + ") OR (" + core::stringUtils::joinStrings(sortClauses, " AND ") + ")");
+            }
+
             return query;
         }
 
@@ -114,6 +136,9 @@ namespace lms::db
                 query.where(oss.str());
             }
 
+            for (std::string_view keyword : params.keywords)
+                query.where("r.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + utils::escapeLikeKeyword(keyword) + "%");
+
             return query;
         }
 
@@ -157,6 +182,9 @@ namespace lms::db
                 query.where(oss.str());
             }
 
+            for (std::string_view keyword : params.keywords)
+                query.where("t.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + utils::escapeLikeKeyword(keyword) + "%");
+
             return query;
         }
     }

src/libs/database/include/database/Listen.hpp

@@ -70,6 +70,7 @@ namespace lms::db
             UserId                              user;
             std::optional<ScrobblingBackend>    backend;
             std::vector<ClusterId>              clusters; // if non empty, entities that belong to these clusters
+            std::vector<std::string_view>   keywords; // if non empty, name must match all of these keywords
             std::optional<Range>                range;
             ArtistId                            artist; // if set, matching this artist
             MediaLibraryId                      library;
@@ -77,6 +78,7 @@ namespace lms::db
             StatsFindParameters& setUser(UserId _user) { user = _user; return *this; }
             StatsFindParameters& setScrobblingBackend(std::optional<ScrobblingBackend> _backend) { backend = _backend; return *this; }
             StatsFindParameters& setClusters(const std::vector<ClusterId>& _clusters) { clusters = _clusters; return *this; }
+            StatsFindParameters& setKeywords(const std::vector<std::string_view>& _keywords) { keywords = _keywords; return *this; }
             StatsFindParameters& setRange(std::optional<Range> _range) { range = _range; return *this; }
             StatsFindParameters& setArtist(ArtistId _artist) { artist = _artist; return *this; }
             StatsFindParameters& setMediaLibrary(MediaLibraryId _library) { library = _library; return *this; }

src/libs/database/include/database/Release.hpp

@@ -92,8 +92,8 @@ namespace lms::db
             UserId                              starringUser;				// only releases starred by this user
             std::optional<FeedbackBackend>      feedbackBackend;		    //    and for this backend
             ArtistId                            artist;						// only releases that involved this user
-            core::EnumSet<TrackArtistLinkType>        trackArtistLinkTypes; 			//    and for these link types
-            core::EnumSet<TrackArtistLinkType>        excludedTrackArtistLinkTypes; 	//    but not for these link types
+            core::EnumSet<TrackArtistLinkType>  trackArtistLinkTypes; 			//    and for these link types
+            core::EnumSet<TrackArtistLinkType>  excludedTrackArtistLinkTypes; 	//    but not for these link types
             std::string                         releaseType;    // If set, albums that has this release type
             MediaLibraryId                      mediaLibrary;   // If set, releases that has at least a track in this library