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

lyrics fetcher: update lyricsmania fetcher

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-08-30 12:19:35 +02:00
parent 3bd7571407
commit 10ceacea7c
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lyrics_fetcher.cpp
View File

@@ -247,16 +247,6 @@ bool MetrolyricsFetcher::isURLOk(const std::string &url)
/**********************************************************************/ /**********************************************************************/
void LyricsmaniaFetcher::postProcess(std::string &data)
{
// lyricsmania.com uses iso-8859-1 as the encoding
// so we need to convert obtained lyrics to utf-8
data = Charset::toUtf8From(data, "iso-8859-1");
LyricsFetcher::postProcess(data);
}
/**********************************************************************/
LyricsFetcher::Result InternetLyricsFetcher::fetch(const std::string &artist, const std::string &title) LyricsFetcher::Result InternetLyricsFetcher::fetch(const std::string &artist, const std::string &title)
{ {
GoogleLyricsFetcher::fetch(artist, title); GoogleLyricsFetcher::fetch(artist, title);

4
src/lyrics_fetcher.h
View File

@@ -90,9 +90,7 @@ struct LyricsmaniaFetcher : public GoogleLyricsFetcher
virtual const char *name() { return "lyricsmania.com"; } virtual const char *name() { return "lyricsmania.com"; }
protected: protected:
virtual const char *regex() { return "<div id='songlyrics_h' class='dn'>(.*?)</div>"; } virtual const char *regex() { return "<div class=\"lyrics-body\".*?</strong>(.*?)</div>"; }
virtual void postProcess(std::string &data);
}; };
struct Sing365Fetcher : public GoogleLyricsFetcher struct Sing365Fetcher : public GoogleLyricsFetcher