From 49d621858ffa456313a0f14ea162ce0bacd73d87 Mon Sep 17 00:00:00 2001 From: Fatih Emre YILDIZ Date: Mon, 22 Aug 2022 13:26:58 +0300 Subject: [PATCH 1/2] cautils&fileinfo: compBaseName add for cart update --- src/library/coverartutils.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/library/coverartutils.cpp b/src/library/coverartutils.cpp index 7a750a4e42c..897506c8fa9 100644 --- a/src/library/coverartutils.cpp +++ b/src/library/coverartutils.cpp @@ -107,13 +107,17 @@ CoverInfoRelative CoverArtUtils::selectCoverArtForTrack( // TODO(XXX) Sort instead so that we can fall-back if one fails to // open? foreach (const QFileInfo& file, covers) { - const QString coverBaseName = file.baseName(); + const QString coverBaseName = file.completeBaseName(); if (bestType > TRACK_BASENAME && - coverBaseName.compare(trackFile.baseName(), - Qt::CaseInsensitive) == 0) { + coverBaseName.compare(trackFile.completeBaseName(), + Qt::CaseInsensitive) == 0) { bestInfo = &file; // This is the best type (TRACK_BASENAME) so we know we're done. break; + } else if (bestType > TRACK_BASENAME && + coverBaseName.compare(trackFile.fileName(), + Qt::CaseInsensitive) == 0) { + bestInfo = &file; } else if (bestType > ALBUM_NAME && coverBaseName.compare(albumName, Qt::CaseInsensitive) == 0) { From e7bfa37b29bed70286ae7a7a8150698a86da2d3a Mon Sep 17 00:00:00 2001 From: Fatih Emre YILDIZ Date: Mon, 22 Aug 2022 17:01:50 +0300 Subject: [PATCH 2/2] coverartutils: bestType added. --- src/library/coverartutils.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/library/coverartutils.cpp b/src/library/coverartutils.cpp index 897506c8fa9..cf50e2cc7f0 100644 --- a/src/library/coverartutils.cpp +++ b/src/library/coverartutils.cpp @@ -117,6 +117,7 @@ CoverInfoRelative CoverArtUtils::selectCoverArtForTrack( } else if (bestType > TRACK_BASENAME && coverBaseName.compare(trackFile.fileName(), Qt::CaseInsensitive) == 0) { + bestType = TRACK_BASENAME; bestInfo = &file; } else if (bestType > ALBUM_NAME && coverBaseName.compare(albumName,