From: Nikolay Tischenko <niktischenko@gmail.com>
Date: Fri, 11 Mar 2011 19:45:46 +0000 (+0600)
Subject: Support for covers downloaded via MussOrgsky
X-Git-Url: https://vcs.maemo.org/git/?p=someplayer;a=commitdiff_plain;h=c4439637ce05bd526fdced062963ead695b902fb

Support for covers downloaded via MussOrgsky
---

diff --git a/src/coverfinder.cpp b/src/coverfinder.cpp
index b035419..a10dab0 100644
--- a/src/coverfinder.cpp
+++ b/src/coverfinder.cpp
@@ -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);
diff --git a/src/coverfinder.h b/src/coverfinder.h
index 07fd72b..5d6654d 100644
--- a/src/coverfinder.h
+++ b/src/coverfinder.h
@@ -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;