diff --git a/doc/config b/doc/config index 5aca3e37..fe6d4252 100644 --- a/doc/config +++ b/doc/config @@ -353,7 +353,7 @@ # #lines_scrolled = 2 # -#lyrics_fetchers = lyricwiki, azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, internet +#lyrics_fetchers = lyricwiki, azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet # #follow_now_playing_lyrics = no # diff --git a/src/configuration.cpp b/src/configuration.cpp index 005b27ee..a3617426 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -162,6 +162,7 @@ bool configure(int argc, char **argv) std::make_tuple("jahlyrics", "sean kingston", "dry your eyes"), std::make_tuple("plyrics", "offspring", "genocide"), std::make_tuple("tekstowo", "rihanna", "umbrella"), + std::make_tuple("zeneszoveg", "rihanna", "umbrella"), }; for (auto &data : fetcher_data) { diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index b32230cf..69340c51 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -58,6 +58,8 @@ std::istream &operator>>(std::istream &is, LyricsFetcher_ &fetcher) fetcher = std::make_unique(); else if (s == "tekstowo") fetcher = std::make_unique(); + else if (s == "zeneszoveg") + fetcher = std::make_unique(); else if (s == "internet") fetcher = std::make_unique(); else diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h index ce26c9ae..119f9ffd 100644 --- a/src/lyrics_fetcher.h +++ b/src/lyrics_fetcher.h @@ -157,6 +157,14 @@ protected: virtual const char *regex() const override { return "
.*?(.*?)(.*?)
"; } +}; + struct InternetLyricsFetcher : public GoogleLyricsFetcher { virtual const char *name() const override { return "the Internet"; } diff --git a/src/settings.cpp b/src/settings.cpp index 92cd2f71..76b2f2e0 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -462,7 +462,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, - "lyricwiki, azlyrics, genius, sing365, lyricsmania, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, internet", + "lyricwiki, azlyrics, genius, sing365, lyricsmania, 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,