From f66f7fa1290ad353c14df4de7c0befb2ae546d7b Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Sun, 21 Jun 2015 14:46:45 +0200
Subject: [PATCH] lyrics fetcher: update regexes for a few sites

---
 NEWS                 | 1 +
 src/lyrics_fetcher.h | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 8806c0bc..273017f6 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ ncmpcpp-0.6.5 (????-??-??)
 * Possible access of already freed memory when downloading artist info is fixed.
 * Name of an item is now displayed correctly if present.
 * Assertion failure when resizing terminal window with no active MPD connection is fixed.
+* Lyrics fetchers were updated to work with sites that changed their HTML structure.
 
 ncmpcpp-0.6.4 (2015-05-02)
 
diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h
index 8687bd7d..d7683d88 100644
--- a/src/lyrics_fetcher.h
+++ b/src/lyrics_fetcher.h
@@ -98,7 +98,7 @@ struct Sing365Fetcher : public GoogleLyricsFetcher
 	virtual const char *name() { return "sing365.com"; }
 	
 protected:
-	virtual const char *regex() { return "<script src=\"//srv.tonefuse.com/showads/showad.js\"></script>(.*?)<script>\n/\\* Sing365 - Below Lyrics"; }
+	virtual const char *regex() { return "<!-Lyrics Begin->(.*?)<!-Lyrics End->"; }
 
 	virtual void postProcess(std::string &data);
 };
@@ -108,7 +108,7 @@ struct JustSomeLyricsFetcher : public GoogleLyricsFetcher
 	virtual const char *name() { return "justsomelyrics.com"; }
 	
 protected:
-	virtual const char *regex() { return "<div class=\"core-left\">(.*?)</div>"; }
+	virtual const char *regex() { return "<div class=\"content.*?</div>(.*?)</div>"; }
 };
 
 struct AzLyricsFetcher : public GoogleLyricsFetcher
@@ -116,7 +116,7 @@ struct AzLyricsFetcher : public GoogleLyricsFetcher
 	virtual const char *name() { return "azlyrics.com"; }
 	
 protected:
-	virtual const char *regex() { return "<!-- start of lyrics -->(.*?)<!-- end of lyrics -->"; }
+	virtual const char *regex() { return "<div class=\"lyricsh\">.*?</h2>.*<div>(.*?)</div>"; }
 };
 
 struct InternetLyricsFetcher : public GoogleLyricsFetcher