Support for covers downloaded via MussOrgsky
authorNikolay Tischenko <niktischenko@gmail.com>
Fri, 11 Mar 2011 19:45:46 +0000 (01:45 +0600)
committerNikolay Tischenko <niktischenko@gmail.com>
Fri, 11 Mar 2011 19:45:46 +0000 (01:45 +0600)
src/coverfinder.cpp
src/coverfinder.h

index b035419..a10dab0 100644 (file)
@@ -147,8 +147,7 @@ void CoverFinder::find(Track track) {
 
 bool CoverFinder::_async_find(QFileInfo filePath, Track track) {
        if (!_find(filePath.absolutePath()) && !_tfind(track.metadata().artist(), track.metadata().album()) &&
-           !_malfind(filePath.absolutePath()+"/.mediaartlocal/"+track.mediaArtLocal()) &&
-           !_extract(filePath.absoluteFilePath())) {
+           !_malfind(track) && !_extract(filePath.absoluteFilePath())) {
                emit found(_defaultCover);
                return false;
        }
@@ -175,7 +174,14 @@ bool CoverFinder::_tfind(QString artist, QString album) {
        return false;
 }
 
-bool CoverFinder::_malfind(QString path) {
+bool CoverFinder::_malfind(Track track) {
+       QString path = QFileInfo(track.source()).absolutePath()+"/.mediaartlocal/"+track.mediaArtLocal();
+       if (QFile::exists(path)) {
+               emit found(QImage(path));
+               emit foundPath(path);
+               return true;
+       }
+       path = QDir::homePath()+"/.cache/media-art/"+track.mediaArtLocal();
        if (QFile::exists(path)) {
                emit found(QImage(path));
                emit foundPath(path);
index 07fd72b..5d6654d 100644 (file)
@@ -46,7 +46,7 @@ private:
        bool _find(QString path);
        bool _extract(QString file);
        bool _tfind(QString artist, QString album);
-       bool _malfind(QString path); // .mediaartlocal
+       bool _malfind(Track); // .mediaartlocal
 
 private:
        QImage _defaultCover;