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

Make sure albums in cover manager are unique

Browse Source 
Fixes #529
This commit is contained in:
Jonas Kvinge
2020-09-05 18:59:35 +02:00
parent da51580299
commit 31dd910289
1 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/collection/collectionbackend.cpp
View File

@@ -1000,10 +1000,8 @@ void CollectionBackend::UpdateCompilations(QSqlQuery &find_song, QSqlQuery &upda
CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist, const bool compilation_required, const QueryOptions &opt) { CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist, const bool compilation_required, const QueryOptions &opt) {
AlbumList ret;
CollectionQuery query(opt); CollectionQuery query(opt);
query.SetColumnSpec("album, artist, albumartist, compilation, compilation_detected, art_automatic, art_manual, url"); query.SetColumnSpec("url, artist, albumartist, album, compilation_effective, art_automatic, art_manual");
query.SetOrderBy("album"); query.SetOrderBy("album");
if (compilation_required) { if (compilation_required) {
@@ -1016,20 +1014,24 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
{ {
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());
if (!ExecQuery(&query)) return ret; if (!ExecQuery(&query)) return AlbumList();
} }
QString last_album; QMap<QString, Album> albums;
QString last_artist;
QString last_album_artist;
while (query.Next()) { while (query.Next()) {
bool is_compilation = query.Value(3).toBool() | query.Value(4).toBool(); bool is_compilation = query.Value(4).toBool();
Album info; Album info;
info.artist = is_compilation ? QString() : query.Value(1).toString(); QString directory;
info.album_artist = is_compilation ? QString() : query.Value(2).toString(); info.first_url = QUrl::fromEncoded(query.Value(0).toByteArray());
info.album_name = query.Value(0).toString(); if (is_compilation) {
info.first_url = QUrl::fromEncoded(query.Value(7).toByteArray()); directory = info.first_url.toString(QUrl::PreferLocalFile|QUrl::RemoveFilename);
}
else {
info.artist = query.Value(1).toString();
info.album_artist = query.Value(2).toString();
}
info.album_name = query.Value(3).toString();
QString art_automatic = query.Value(5).toString(); QString art_automatic = query.Value(5).toString();
if (art_automatic.contains(QRegularExpression("..+:.*"))) { if (art_automatic.contains(QRegularExpression("..+:.*"))) {
@@ -1047,17 +1049,27 @@ CollectionBackend::AlbumList CollectionBackend::GetAlbums(const QString &artist,
info.art_manual = QUrl::fromLocalFile(art_manual); info.art_manual = QUrl::fromLocalFile(art_manual);
} }
if ((info.artist == last_artist || info.album_artist == last_album_artist) && info.album_name == last_album) QString effective_albumartist = info.album_artist.isEmpty() ? info.artist : info.album_artist;
continue; QString key;
if (!effective_albumartist.isEmpty()) {
key.append(effective_albumartist);
}
if (!directory.isEmpty()) {
if (!key.isEmpty()) key.append("-");
key.append(directory);
}
if (!info.album_name.isEmpty()) {
if (!key.isEmpty()) key.append("-");
key.append(info.album_name);
}
ret << info; if (key.isEmpty()) continue;
if (!albums.contains(key)) albums.insert(key, info);
last_album = info.album_name;
last_artist = info.artist;
last_album_artist = info.album_artist;
} }
return ret; return albums.values();
} }