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

Merge branch '0.6.x'

Browse Source
This commit is contained in:
Andrzej Rybczak
2015-09-13 00:32:13 +02:00
parent 61ba262a0f 2b258a84d8
commit 1acaaa4064
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lastfm_service.cpp
View File

@@ -116,9 +116,11 @@ Service::Result ArtistInfo::processData(const std::string &data)
rx.assign("<link rel=\"original\" href=\"(.*?)\"");
if (boost::regex_search(data, what, rx))
{
std::string url = what[1], wiki;
// unescape &amp;s
unescapeHtmlEntities(url);
// ...try to get the content of it...
std::string wiki;
CURLcode code = Curl::perform(wiki, what[1]);
CURLcode code = Curl::perform(wiki, url, "", true);
if (code != CURLE_OK)
{
@@ -128,7 +130,7 @@ Service::Result ArtistInfo::processData(const std::string &data)
else
{
// ...and filter it to get the whole description.
rx.assign("<div id=\"wiki\">(.*?)</div>");
rx.assign("<div class=\"wiki\">(.*?)</div>");
if (boost::regex_search(wiki, what, rx))
desc = unescapeHtmlUtf8(what[1]);
}