From 5b6736b54347215f2f2ba245b72e6d46570276fe Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sun, 13 Dec 2020 08:46:32 +0100 Subject: [PATCH] Remove Lyricsmania fetcher as it doesn't work --- doc/config | 2 +- src/configuration.cpp | 1 - src/lyrics_fetcher.cpp | 2 -- src/lyrics_fetcher.h | 8 -------- src/settings.cpp | 2 +- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/doc/config b/doc/config index 18165a3e..fc61a5f0 100644 --- a/doc/config +++ b/doc/config @@ -360,7 +360,7 @@ # #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 # diff --git a/src/configuration.cpp b/src/configuration.cpp index 69b8e4b8..ee8b4b50 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -159,7 +159,6 @@ bool configure(int argc, char **argv) std::make_tuple("azlyrics", "rihanna", "umbrella"), std::make_tuple("genius", "rihanna", "umbrella"), std::make_tuple("sing365", "rihanna", "umbrella"), - std::make_tuple("lyricsmania", "rihanna", "umbrella"), std::make_tuple("metrolyrics", "rihanna", "umbrella"), std::make_tuple("justsomelyrics", "rihanna", "umbrella"), std::make_tuple("jahlyrics", "sean kingston", "dry your eyes"), diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index 76ff5f49..5a41cabd 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -44,8 +44,6 @@ std::istream &operator>>(std::istream &is, LyricsFetcher_ &fetcher) fetcher = std::make_unique(); else if (s == "sing365") fetcher = std::make_unique(); - else if (s == "lyricsmania") - fetcher = std::make_unique(); else if (s == "metrolyrics") fetcher = std::make_unique(); else if (s == "justsomelyrics") diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h index 227ed2b7..0e27dade 100644 --- a/src/lyrics_fetcher.h +++ b/src/lyrics_fetcher.h @@ -79,14 +79,6 @@ protected: 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 "
(.*?)
"; } -}; - struct Sing365Fetcher : public GoogleLyricsFetcher { virtual const char *name() const override { return "lyrics007.com"; } diff --git a/src/settings.cpp b/src/settings.cpp index d6924f37..6d323848 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -464,7 +464,7 @@ bool Configuration::read(const std::vector &config_paths, bool igno p.add("cyclic_scrolling", &use_cyclic_scrolling, "no", yes_no); p.add("lines_scrolled", &lines_scrolled, "2"); 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); 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,