From 2f9a65e177dcbf9c1a94bcdd89266a5cdacba77a Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <andrzej@rybczak.net>
Date: Mon, 24 Feb 2025 01:13:48 +0100
Subject: [PATCH 1/2] Update lyrics fetchers

---
 CHANGELOG.md         | 3 +++
 configure.ac         | 2 +-
 src/lyrics_fetcher.h | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d5f7563..07fbd98b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# ncmpcpp-0.10.2 (2025-??-??)
+* Update lyrics fetchers.
+
 # ncmpcpp-0.10.1 (2024-10-24)
 * Fix compilation with `libc++`.
 * Remove `autogen.sh` in favour of `autoreconf`.
diff --git a/configure.ac b/configure.ac
index fbc8805d..a3303aaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ncmpcpp],[0.10.1])
+AC_INIT([ncmpcpp],[0.10.2_dev])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([subdir-objects])
diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h
index dc1b3f48..e626fa72 100644
--- a/src/lyrics_fetcher.h
+++ b/src/lyrics_fetcher.h
@@ -84,7 +84,7 @@ struct GeniusFetcher : public GoogleLyricsFetcher
 	virtual const char *name() const override { return "genius.com"; }
 
 protected:
-	virtual const char *regex() const override { return "<div.*?class=\"(?:lyrics|Lyrics__Container).*?>(.*?)</div>"; }
+	virtual const char *regex() const override { return "<div data-lyrics-container.*?>(.*?)</div>"; }
 };
 
 struct JahLyricsFetcher : public GoogleLyricsFetcher
@@ -116,7 +116,7 @@ struct ZeneszovegFetcher : public GoogleLyricsFetcher
 	virtual const char *name() const override { return "zeneszoveg.hu"; }
 
 protected:
-	virtual const char *regex() const override { return "<div id=\"tartalom_slide_content\"> (.*?)<style>"; }
+	virtual const char *regex() const override { return "<div class=\"lyrics-plain-text trans_original\">(.*?)</div>"; }
 };
 
 struct InternetLyricsFetcher : public GoogleLyricsFetcher

From e8f1c4bd48350789300c5f87c5ea21ea4256cf6f Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <andrzej@rybczak.net>
Date: Wed, 26 Feb 2025 02:35:09 +0100
Subject: [PATCH 2/2] Add support for hexadecimal HTML escape codes

---
 CHANGELOG.md         |  1 +
 src/utility/html.cpp | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07fbd98b..d48d84db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # ncmpcpp-0.10.2 (2025-??-??)
 * Update lyrics fetchers.
+* Add support for hexadecimal HTML escape codes.
 
 # ncmpcpp-0.10.1 (2024-10-24)
 * Fix compilation with `libc++`.
diff --git a/src/utility/html.cpp b/src/utility/html.cpp
index 9ef71bec..72553845 100644
--- a/src/utility/html.cpp
+++ b/src/utility/html.cpp
@@ -20,16 +20,29 @@
 
 #include <algorithm>
 #include <boost/algorithm/string/replace.hpp>
+#include <cstdlib>
 #include "utility/html.h"
 
 std::string unescapeHtmlUtf8(const std::string &data)
 {
+	int base;
+	size_t offset;
 	std::string result;
 	for (size_t i = 0, j; i < data.length(); ++i)
 	{
 		if (data[i] == '&' && data[i+1] == '#' && (j = data.find(';', i)) != std::string::npos)
 		{
-			int n = atoi(&data.c_str()[i+2]);
+			if (data[i+2] == 'x')
+			{
+				offset = 3;
+				base = 16;
+			}
+			else
+			{
+				offset = 2;
+				base = 10;
+			}
+			int n = strtol(&data.c_str()[i+offset], nullptr, base);
 			if (n >= 0x800)
 			{
 				result += (0xe0 | ((n >> 12) & 0x0f));