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

Merge pull request #374 from arybczak/lyrics-fix

Browse Source 
Fix lyrics fetchers
This commit is contained in:
Andrzej Rybczak
2020-01-12 06:45:04 +01:00
committed by GitHub
parent 31ee76e8ee d86c965143
commit 608c779a4d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lyrics_fetcher.cpp
View File

@@ -240,7 +240,7 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist,
return result; return result;
} }
auto urls = getContent("<A HREF=\"(.*?)\">here</A>", data); auto urls = getContent("<A HREF=\"http://www.google.com/url\\?q=(.*?)\">here</A>", data);
if (urls.empty() || !isURLOk(urls[0])) if (urls.empty() || !isURLOk(urls[0]))
{ {

6
src/lyrics_fetcher.h
View File

@@ -103,10 +103,10 @@ protected:
struct Sing365Fetcher : public GoogleLyricsFetcher struct Sing365Fetcher : public GoogleLyricsFetcher
{ {
virtual const char *name() const override { return "sing365.com"; } virtual const char *name() const override { return "lyrics007.com"; }
protected: protected:
virtual const char *regex() const override { return "<div class=\"content\">.*?</script></div>(.*?)<script>"; } virtual const char *regex() const override { return "<div class=\"lyrics\">(.*?)</div>"; }
}; };
struct JustSomeLyricsFetcher : public GoogleLyricsFetcher struct JustSomeLyricsFetcher : public GoogleLyricsFetcher
@@ -162,7 +162,7 @@ struct ZeneszovegFetcher : public GoogleLyricsFetcher
virtual const char *name() const override { return "zeneszoveg.hu"; } virtual const char *name() const override { return "zeneszoveg.hu"; }
protected: protected:
virtual const char *regex() const override { return "<div class=\"lyrics-plain-text\">(.*?)</div>"; } virtual const char *regex() const override { return "<div class=\"lyrics-plain-text.*?\">(.*?)</div>"; }
}; };
struct InternetLyricsFetcher : public GoogleLyricsFetcher struct InternetLyricsFetcher : public GoogleLyricsFetcher