lyrics fetcher: add songlyrics.com and lyriczz.com support

1 files changed, 18 insertions, 0 deletions

diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp
index 40012642..d0c4200b 100644
--- a/src/lyrics_fetcher.cpp
+++ b/src/lyrics_fetcher.cpp
@@ -31,6 +31,8 @@
 LyricsFetcher *lyricsPlugins[] =
 {
 	new LyricwikiFetcher(),
+	new LyriczzFetcher(),
+	new SonglyricsFetcher(),
 	new LyricsmaniaFetcher(),
 	new LyricstimeFetcher(),
 	new MetrolyricsFetcher(),
@@ -183,6 +185,11 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist, cons
 	return LyricsFetcher::fetch("", "");
 }
 
+bool GoogleLyricsFetcher::notLyrics(const std::string &data)
+{
+	return LyricsFetcher::notLyrics(data);
+}
+
 bool GoogleLyricsFetcher::isURLOk(const std::string &url)
 {
 	return url.find(getSiteKeyword()) != std::string::npos;
@@ -230,5 +237,16 @@ void LyricsmaniaFetcher::postProcess(std::string &data)
 	LyricsFetcher::postProcess(data);
 }
 
+/**********************************************************************/
+
+void SonglyricsFetcher::postProcess(std::string &data)
+{
+	size_t i = data.find('['), j = data.find(']');
+	if (i != std::string::npos && i != std::string::npos)
+		data.replace(i, j-i+2, "");
+	data = unescapeHtmlUtf8(data);
+	LyricsFetcher::postProcess(data);
+}
+
 #endif // HAVE_CURL_CURL_H