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

Remove Lyricsmania fetcher as it doesn't work

Browse Source
This commit is contained in:
Andrzej Rybczak
2020-12-13 08:46:32 +01:00
parent ecc2fefa7c
commit 5b6736b543
5 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/config
View File

@@ -360,7 +360,7 @@
# #
#lines_scrolled = 2 #lines_scrolled = 2
# #
#lyrics_fetchers = azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet #lyrics_fetchers = azlyrics, genius, sing365, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet
# #
#follow_now_playing_lyrics = no #follow_now_playing_lyrics = no
# #

1
src/configuration.cpp
View File

@@ -159,7 +159,6 @@ bool configure(int argc, char **argv)
std::make_tuple("azlyrics", "rihanna", "umbrella"), std::make_tuple("azlyrics", "rihanna", "umbrella"),
std::make_tuple("genius", "rihanna", "umbrella"), std::make_tuple("genius", "rihanna", "umbrella"),
std::make_tuple("sing365", "rihanna", "umbrella"), std::make_tuple("sing365", "rihanna", "umbrella"),
std::make_tuple("lyricsmania", "rihanna", "umbrella"),
std::make_tuple("metrolyrics", "rihanna", "umbrella"), std::make_tuple("metrolyrics", "rihanna", "umbrella"),
std::make_tuple("justsomelyrics", "rihanna", "umbrella"), std::make_tuple("justsomelyrics", "rihanna", "umbrella"),
std::make_tuple("jahlyrics", "sean kingston", "dry your eyes"), std::make_tuple("jahlyrics", "sean kingston", "dry your eyes"),

2
src/lyrics_fetcher.cpp
View File

@@ -44,8 +44,6 @@ std::istream &operator>>(std::istream &is, LyricsFetcher_ &fetcher)
fetcher = std::make_unique<GeniusFetcher>(); fetcher = std::make_unique<GeniusFetcher>();
else if (s == "sing365") else if (s == "sing365")
fetcher = std::make_unique<Sing365Fetcher>(); fetcher = std::make_unique<Sing365Fetcher>();
else if (s == "lyricsmania")
fetcher = std::make_unique<LyricsmaniaFetcher>();
else if (s == "metrolyrics") else if (s == "metrolyrics")
fetcher = std::make_unique<MetrolyricsFetcher>(); fetcher = std::make_unique<MetrolyricsFetcher>();
else if (s == "justsomelyrics") else if (s == "justsomelyrics")

8
src/lyrics_fetcher.h
View File

@@ -79,14 +79,6 @@ protected:
virtual bool isURLOk(const std::string &url) override; virtual bool isURLOk(const std::string &url) override;
}; };
struct LyricsmaniaFetcher : public GoogleLyricsFetcher
{
virtual const char *name() const override { return "lyricsmania.com"; }
protected:
virtual const char *regex() const override { return "<div class=\"lyrics-body\".*?</div>(.*?)</div>"; }
};
struct Sing365Fetcher : public GoogleLyricsFetcher struct Sing365Fetcher : public GoogleLyricsFetcher
{ {
virtual const char *name() const override { return "lyrics007.com"; } virtual const char *name() const override { return "lyrics007.com"; }

2
src/settings.cpp
View File

@@ -464,7 +464,7 @@ bool Configuration::read(const std::vector<std::string> &config_paths, bool igno
p.add("cyclic_scrolling", &use_cyclic_scrolling, "no", yes_no); p.add("cyclic_scrolling", &use_cyclic_scrolling, "no", yes_no);
p.add("lines_scrolled", &lines_scrolled, "2"); p.add("lines_scrolled", &lines_scrolled, "2");
p.add("lyrics_fetchers", &lyrics_fetchers, p.add("lyrics_fetchers", &lyrics_fetchers,
"azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet", "azlyrics, genius, sing365, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet",
list_of<LyricsFetcher_>); list_of<LyricsFetcher_>);
p.add("follow_now_playing_lyrics", &now_playing_lyrics, "no", yes_no); p.add("follow_now_playing_lyrics", &now_playing_lyrics, "no", yes_no);
p.add("fetch_lyrics_for_current_song_in_background", &fetch_lyrics_in_background, p.add("fetch_lyrics_for_current_song_in_background", &fetch_lyrics_in_background,