Merge lp:~egormatirov/mpd-sound-menu/mpd-sound-menu into lp:mpd-sound-menu

[Mikhail Ivchenko]

Add option for choose size of artworks.
Last.fm api key changed because the test API key was deprecated (http://www.lastfm.ru/group/Last.fm+Web+Services/forum/21604/_/2188288).

[Vsevolod Velichko (torkvemada)]

Hi, you have indentation broken in src/options.cpp. Fix it and I'll accept the merge.

Have you thought about the situation when there's no image of required size available? I suppose you need to fetch the lesser one in such situation but in your patch image wouldn't be fetched at all.

review: Needs Fixing

[Mikhail Ivchenko (egormatirov)]

OK, I fixed indentation. I'll try to realize your idea.

[Vsevolod Velichko (torkvemada)]

"mainWindowUi->albumArtSizeComboBox..." block indentation is still broken.

[Mikhail Ivchenko (egormatirov)]

OK, I think, I fixed it. Thank you.

=== modified file 'res/mainwindow.ui'
--- res/mainwindow.ui	2011-01-29 22:13:23 +0000
+++ res/mainwindow.ui	2013-08-27 13:29:21 +0000
@@ -157,6 +157,13 @@
            </property>
           </widget>
          </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="mpdHostLabel">
+           <property name="text">
+            <string>MPD Host</string>
+           </property>
+          </widget>
+         </item>
          <item row="1" column="1">
           <widget class="QLineEdit" name="mpdHostEdit">
            <property name="sizePolicy">
@@ -234,13 +241,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="mpdHostLabel">
-           <property name="text">
-            <string>MPD Host</string>
-           </property>
-          </widget>
-         </item>
          <item row="4" column="0">
           <widget class="QLabel" name="albumArtLabel">
            <property name="text">
@@ -279,6 +279,37 @@
            </property>
           </widget>
          </item>
+         <item row="6" column="0">
+          <widget class="QLabel" name="albumArtSizeLabel">
+           <property name="text">
+            <string>Album Art Size</string>
+           </property>
+          </widget>
+         </item>
+         <item row="6" column="1">
+          <widget class="QComboBox" name="albumArtSizeComboBox">
+           <item>
+            <property name="text">
+             <string>Small</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Medium</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Large</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>Extra large</string>
+            </property>
+           </item>
+          </widget>
+         </item>
         </layout>
        </widget>
       </widget>
 
=== modified file 'res/mpd-sound-menu.conf'
--- res/mpd-sound-menu.conf	2011-04-15 22:12:19 +0000
+++ res/mpd-sound-menu.conf	2013-08-27 13:29:21 +0000
@@ -30,6 +30,13 @@
 # Default value: "1"
 artwork "1"
 
+#   artwork_size
+# Option to set size of artwork from internet sources.
+# "0" - Small, "1" - Medium, "2" - Large, "3" - Extra large.
+#
+# Default value: "0"
+artwork_size "0"
+
 #   debug
 # option to enable debug output to terminal
 #
 
=== modified file 'src/mpdconnector.cpp'
--- src/mpdconnector.cpp	2012-06-18 05:42:23 +0000
+++ src/mpdconnector.cpp	2013-08-27 13:29:21 +0000
@@ -83,8 +83,7 @@
 
 /**
  * @brief find Cover Art URL on Last.fm
- * api_key b25b959554ed76058ac220b7b2e0a026 posted
- * in last.fm api documentation is used :)
+ * api_key ec379790504799417bf43e4533089f18 is used
  *
  * @param d metadata already fetched
  *
@@ -97,17 +96,25 @@
 	request.addQueryItem("track", d["xesam:title"].toString());
 	if (d.contains("xesam:artist") && !d["xesam:artist"].toStringList()[0].isNull())
 		request.addQueryItem("artist", d["xesam:artist"].toStringList()[0]);
-	request.addQueryItem("api_key", "b25b959554ed76058ac220b7b2e0a026");
+	request.addQueryItem("api_key", "ec379790504799417bf43e4533089f18");
 	qDebug() << "Sending cover request:" << request.toEncoded();
 	QXmlQuery query;
 	query.setFocus(request);
-	query.setQuery("lfm/results/trackmatches/track[1]/image[1]/text()");
-	QString result;
-	query.evaluateTo(&result);
-	result = result.trimmed();
-	qDebug() << "Cover result:" << result;
-	if (!result.isEmpty())
+	query.setQuery("lfm/results/trackmatches/track[1]/image/string()");
+	//QString::number(Options::instance()["ArtworkSize"].toInt()+1
+	QStringList results;
+	query.evaluateTo(&results);
+	if(results.count() > 0)
+	{
+		QString result;
+		if(results.count() <= Options::instance()["ArtworkSize"].toInt())
+			result = results.last();
+		else
+			result = results.at(Options::instance()["ArtworkSize"].toInt());
+		result = result.trimmed();
+		qDebug() << "Cover result:" << result;
 		return result;
+	}
 	return QString();
 }
 
 
=== modified file 'src/options.cpp'
--- src/options.cpp	2011-04-15 22:12:19 +0000
+++ src/options.cpp	2013-08-27 13:29:21 +0000
@@ -48,6 +48,7 @@
 	/* Default values */
 	options["LibraryPath"] = QString::fromUtf8("file:///var/lib/mpd/music");
 	options["NoArtwork"] = false;
+	options["ArtworkSize"] = 0;
 	options["debug"] = false;
 	/* MPD Connection */
 	options["MpdHost"] = "localhost";
@@ -177,6 +178,8 @@
 				options["MpdPort"] = parameterTuple.cap(2).toInt();
 			else if(parameterTuple.cap(1).compare("artwork") == 0 && parameterTuple.cap(2).compare("0") == 0)
 				options["NoArtwork"] = true;
+			else if(parameterTuple.cap(1).compare("artwork_size") == 0)
+				options["ArtworkSize"] = parameterTuple.cap(2).toInt();
 			else if(parameterTuple.cap(1).compare("debug") == 0 && parameterTuple.cap(2).compare("0") != 0)
 				options["debug"] = true;
 			else if(parameterTuple.cap(1).compare("library_path") == 0)
@@ -256,6 +259,11 @@
 			? 0
 			: 1
 		);
+	mainWindowUi->albumArtSizeComboBox->setCurrentIndex(
+		(options.contains("ArtworkSize"))
+			? options["ArtworkSize"].toInt()
+			: 0
+		);
 	/* TODO: option for debug */
 }
 
@@ -265,6 +273,7 @@
 	options["MpdPort"] = mainWindowUi->mpdPortSpinBox->value();
 	options["MpdPassword"] = mainWindowUi->mpdPasswordEdit->text();
 	options["NoArtwork"] = (mainWindowUi->albumArtComboBox->currentIndex() == 0);
+	options["ArtworkSize"] = mainWindowUi->albumArtSizeComboBox->currentIndex();
 	options["LibraryPath"] = mainWindowUi->libraryPathEdit->text();
 	QFile configFile(QDir::homePath()+"/.config/mpd-sound-menu.conf");
 	if (!configFile.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text))
@@ -278,6 +287,7 @@
 		writer << "port \"" << options["MpdPort"].toInt() << "\"\n";
 		writer << "password \"" << options["MpdPassword"].toString() << "\"\n";
 		writer << "artwork \"" << (options["NoArtwork"].toBool() ? 0 : 1) << "\"\n";
+		writer << "artwork_size \"" << options["ArtworkSize"].toInt() << "\"\n";
 		writer << "library_path \"" << options["LibraryPath"].toString() << "\"\n";
 		configFile.close();
 	}