|
|
|
|
@ -203,8 +203,6 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist, cons |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
data = unescapeHtmlUtf8(urls[0]); |
|
|
|
|
//result.second = data;
|
|
|
|
|
//return result;
|
|
|
|
|
|
|
|
|
|
URL = data.c_str(); |
|
|
|
|
return LyricsFetcher::fetch("", ""); |
|
|
|
|
@ -217,6 +215,15 @@ bool GoogleLyricsFetcher::isURLOk(const std::string &url) |
|
|
|
|
|
|
|
|
|
/**********************************************************************/ |
|
|
|
|
|
|
|
|
|
void Sing365Fetcher::postProcess(std::string &data) |
|
|
|
|
{ |
|
|
|
|
// throw away ad
|
|
|
|
|
data = boost::regex_replace(data, boost::regex("<div.*</div>"), ""); |
|
|
|
|
LyricsFetcher::postProcess(data); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/**********************************************************************/ |
|
|
|
|
|
|
|
|
|
void MetrolyricsFetcher::postProcess(std::string &data) |
|
|
|
|
{ |
|
|
|
|
// throw away [ from ... ] info
|
|
|
|
|
|