Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lastfm: fix fetching artist info in language other than English

Browse Source
This commit is contained in:
Andrzej Rybczak
2017-01-28 16:33:09 +01:00
parent a5827cf1de
commit b2f29c6756
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -19,7 +19,8 @@ ncmpcpp-0.8 (????-??-??)
* Lyrics and last_fm can now be startup screens and are lockable. * Lyrics and last_fm can now be startup screens and are lockable.
* Action 'update_environment' now also synchronizes status with MPD. * Action 'update_environment' now also synchronizes status with MPD.
* Fixed an issue that could cause some MPD events to be missed. * Fixed an issue that could cause some MPD events to be missed.
* ACtion 'jump_to_playing_song' is not runnable now if there is no playing song. * Action 'jump_to_playing_song' is not runnable now if there is no playing song.
* Fixed fetching artist info in language other than English.
ncmpcpp-0.7.7 (2016-10-31) ncmpcpp-0.7.7 (2016-10-31)
* Fixed compilation on 32bit platforms. * Fixed compilation on 32bit platforms.

12
src/lastfm_service.cpp
View File

@@ -20,6 +20,7 @@
#include "lastfm_service.h" #include "lastfm_service.h"
#include <boost/algorithm/string/replace.hpp>
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <boost/locale/conversion.hpp> #include <boost/locale/conversion.hpp>
#include <fstream> #include <fstream>
@@ -52,7 +53,7 @@ Service::Result Service::fetch()
url += "="; url += "=";
url += Curl::escape(arg.second); url += Curl::escape(arg.second);
} }
std::string data; std::string data;
CURLcode code = Curl::perform(data, url); CURLcode code = Curl::perform(data, url);
@@ -63,7 +64,7 @@ Service::Result Service::fetch()
else else
{ {
result = processData(data); result = processData(data);
// if relevant part of data was not found and one of arguments // if relevant part of data was not found and one of arguments
// was language, try to fetch it again without that parameter. // was language, try to fetch it again without that parameter.
// otherwise just report failure. // otherwise just report failure.
@@ -118,6 +119,10 @@ Service::Result ArtistInfo::processData(const std::string &data)
std::string url = what[1], wiki; std::string url = what[1], wiki;
// unescape &amp;s // unescape &amp;s
unescapeHtmlEntities(url); unescapeHtmlEntities(url);
// fill in language info since url points to english version.
const auto &lang = m_arguments["lang"];
if (!lang.empty())
boost::replace_first(url, "last.fm/music/", "last.fm/" + lang + "/music/");
// ...try to get the content of it... // ...try to get the content of it...
CURLcode code = Curl::perform(wiki, url, "", true); CURLcode code = Curl::perform(wiki, url, "", true);
@@ -145,7 +150,10 @@ Service::Result ArtistInfo::processData(const std::string &data)
result.second += desc; result.second += desc;
} }
else else
{
result.second += "No description available for this artist."; result.second += "No description available for this artist.";
return result;
}
} }
else else
{ {