- When matching wildcard genres, look case-insensitively for smart pl…

…aylists. - When matching wildcard genres, if no matches found then use a fake dummy genre so that no tracks will match rules. Issue #1519
CDrummond · Aug 12, 2019 · 095db04 · 095db04
1 parent addd65d
commit 095db04
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -40,6 +40,9 @@
 32. Added Dutch translaiton - thnaks to Heimen Stoffels.
 33. In dynamic/smart playlists, when specify a rating also allow to specify
     unrated tracks.
+34. When matching wildcard genres, look case-insensitively for smart playlists.
+35. When matching wildcard genres, if no matches found then use a fake dummy
+    genre so that no tracks will match rules.
 
 2.3.3
 -----

diff --git a/playlists/cantata-dynamic b/playlists/cantata-dynamic
@@ -520,6 +520,10 @@ sub readRules() {
                                     $pos++;
                                 }
                             }
+                            if ($pos == 0) {
+                                # No genres matching pattern - add dummy genre, so that no tracks will be found
+                                $genres[$pos]="XXXXXXXX";
+                            }
                         } elsif ($key eq "Artist" || $key eq "Album" || $key eq "AlbumArtist" || $key eq "Composer" || $key eq "Comment" || $key eq "Title" || $key eq "Genre"  || $key eq "File") {
                             $currentRule="${currentRule} ${key} \"${val}\"";
                         } elsif ($key eq "SimilarArtists") {

diff --git a/playlists/smartplaylistspage.cpp b/playlists/smartplaylistspage.cpp
@@ -425,11 +425,15 @@ void SmartPlaylistsPage::addSelectionToPlaylist(const QString &name, int action,
                         mpdGenres = MpdLibraryModel::self()->getGenres();
                     }
                     for (const QString &g: mpdGenres) {
-                        if (g.startsWith(find)) {
+                        if (g.startsWith(find, Qt::CaseInsensitive)) {
                             genres.append(g);
                         }
                     }
                 }
+                if (genres.isEmpty()) {
+                    // No genres matching pattern - add dummy genre, so that no tracks will be found
+                    genres.append("XXXXXXXXX");
+                }
             } else if (RulesPlaylists::constArtistKey==rIt.key() || RulesPlaylists::constAlbumKey==rIt.key() ||
                        RulesPlaylists::constAlbumArtistKey==rIt.key() || RulesPlaylists::constComposerKey==rIt.key() ||
                        RulesPlaylists::constCommentKey==rIt.key() || RulesPlaylists::constTitleKey==rIt.key() ||