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

lyrics fetcher: add a few comments and improve postprocessing of MetrolyricsFetcher

Browse Source
This commit is contained in:
Andrzej Rybczak
2010-12-30 19:12:10 +01:00
parent 2002d4dfc6
commit 735faa75b9
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lyrics_fetcher.cpp
View File

@@ -209,6 +209,15 @@ void LyricstimeFetcher::postProcess(std::string &data)
void MetrolyricsFetcher::postProcess(std::string &data) void MetrolyricsFetcher::postProcess(std::string &data)
{ {
// throw away [ from ... ] info
size_t i = data.find('['), j = data.find(']');
if (i != std::string::npos && i != std::string::npos)
data.replace(i, j-i+1, "");
// some of lyrics have both \n chars and <br />, html tags
// are always present whereas \n chars are not, so we need to
// throw them away to avoid having line breaks doubled.
Replace(data, "&#10;", "");
Replace(data, "<br />", "\n");
data = unescapeHtmlUtf8(data); data = unescapeHtmlUtf8(data);
LyricsFetcher::postProcess(data); LyricsFetcher::postProcess(data);
} }
@@ -233,6 +242,9 @@ void LyricsmaniaFetcher::postProcess(std::string &data)
void SonglyricsFetcher::postProcess(std::string &data) void SonglyricsFetcher::postProcess(std::string &data)
{ {
// throw away [ ... lyrics are found on www.songlyrics.com ] info.
// there is +2 instead of +1 in third line because there is extra
// space after ] we also want to get rid of
size_t i = data.find('['), j = data.find(']'); size_t i = data.find('['), j = data.find(']');
if (i != std::string::npos && i != std::string::npos) if (i != std::string::npos && i != std::string::npos)
data.replace(i, j-i+2, ""); data.replace(i, j-i+2, "");