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

Fallback to SHA1 hash for cover filename if artist / album is stripped

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-17 17:22:50 +02:00
parent 94ba8614ec
commit 068939ca0b
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/covermanager/albumcoverloader.cpp
View File

@@ -151,6 +151,16 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString
} }
else { else {
switch (source) { switch (source) {
case Song::Source_Tidal:
filename = album_id + "-" + cover_url.fileName();
break;
case Song::Source_Subsonic:
case Song::Source_Qobuz:
filename = AlbumCoverFileName(artist, album);
if (filename.length() > 8 && (filename.length() - 5) >= (artist.length() + album.length() - 2)) {
break;
}
// fallthrough
case Song::Source_Collection: case Song::Source_Collection:
case Song::Source_LocalFile: case Song::Source_LocalFile:
case Song::Source_CDDA: case Song::Source_CDDA:
@@ -158,13 +168,7 @@ QString AlbumCoverLoader::CoverFilePath(const Song::Source source, const QString
case Song::Source_Stream: case Song::Source_Stream:
case Song::Source_Unknown: case Song::Source_Unknown:
filename = Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg"; filename = Utilities::Sha1CoverHash(artist, album).toHex() + ".jpg";
break; qLog(Debug) << filename << artist << album;
case Song::Source_Tidal:
filename = album_id + "-" + cover_url.fileName();
break;
case Song::Source_Qobuz:
case Song::Source_Subsonic:
filename = AlbumCoverFileName(artist, album);
break; break;
} }
} }
@@ -184,9 +188,10 @@ QString AlbumCoverLoader::AlbumCoverFileName(QString artist, QString album) {
QString filename = artist + "-" + album + ".jpg"; QString filename = artist + "-" + album + ".jpg";
filename = Utilities::UnicodeToAscii(filename.toLower()); filename = Utilities::UnicodeToAscii(filename.toLower());
filename.replace(' ', '-'); filename = filename.replace(' ', '-');
filename.replace("--", "-"); filename = filename.replace("--", "-");
filename.remove(OrganiseFormat::kInvalidFatCharacters); filename = filename.remove(OrganiseFormat::kInvalidFatCharacters);
filename = filename.trimmed();
return filename; return filename;