dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CollectionModel: Fix compilation requirement query

Browse Source 
Fixes #1140
This commit is contained in:
Jonas Kvinge
2023-02-18 16:40:12 +01:00
parent 506e670aa7
commit 79bf194ed6
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/collection/collectionmodel.cpp
View File

@@ -869,7 +869,13 @@ CollectionModel::QueryResult CollectionModel::RunQuery(const CollectionFilterOpt
for (const CollectionQueryOptions::Where &where_clauses : query_options.where_clauses()) {
q.AddWhere(where_clauses.column, where_clauses.value, where_clauses.op);
}
q.AddCompilationRequirement(query_options.compilation_requirement());
if (result.create_va) {
q.AddCompilationRequirement(false);
}
else if (query_options.compilation_requirement() != CollectionQueryOptions::CompilationRequirement::None) {
q.AddCompilationRequirement(query_options.compilation_requirement() == CollectionQueryOptions::CompilationRequirement::On);
}
if (q.Exec()) {
while (q.Next()) {
@@ -1090,21 +1096,21 @@ void CollectionModel::AddQueryWhere(const GroupBy group_by, const bool separate_
switch (group_by) {
case GroupBy::AlbumArtist:
if (IsCompilationArtistNode(item)) {
query_options->set_compilation_requirement(true);
query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::On);
}
else {
// Don't duplicate compilations outside the Various artists node
query_options->set_compilation_requirement(false);
query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::Off);
query_options->AddWhere("effective_albumartist", item->metadata.effective_albumartist());
}
break;
case GroupBy::Artist:
if (IsCompilationArtistNode(item)) {
query_options->set_compilation_requirement(true);
query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::On);
}
else {
// Don't duplicate compilations outside the Various artists node
query_options->set_compilation_requirement(false);
query_options->set_compilation_requirement(CollectionQueryOptions::CompilationRequirement::Off);
query_options->AddWhere("artist", item->metadata.artist());
}
break;