From 3bd757140799351f176b522a018253fe21a72ead Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sat, 30 Aug 2014 12:11:09 +0200
Subject: [PATCH] lyrics fetcher: update sing365 fetcher

---
 src/lyrics_fetcher.cpp | 11 +++++++++--
 src/lyrics_fetcher.h   |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp
index e525e583..1a15fa4a 100644
--- a/src/lyrics_fetcher.cpp
+++ b/src/lyrics_fetcher.cpp
@@ -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
diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h
index 42d2d2d7..ef28261b 100644
--- a/src/lyrics_fetcher.h
+++ b/src/lyrics_fetcher.h
@@ -100,7 +100,9 @@ struct Sing365Fetcher : public GoogleLyricsFetcher
 	virtual const char *name() { return "sing365.com"; }
 	
 protected:
-	virtual const char *regex() { return "<div style=\"font-size: 14px;\">(.*?)</div>"; }
+	virtual const char *regex() { return "<script src=\"//srv.tonefuse.com/showads/showad.js\"></script>(.*?)<script>\n/\\* Sing365 - Below Lyrics"; }
+
+	virtual void postProcess(std::string &data);
 };
 
 struct JustSomeLyricsFetcher : public GoogleLyricsFetcher