From bb4aa9e1068ee4aa83ffec2f805ae37e9b336317 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Wed, 8 Dec 2010 23:34:08 +0100 Subject: [PATCH] lyrics fetcher: if lyrics weren't found, attempt to search for them globally --- src/lyrics_fetcher.cpp | 19 +++++++++++++++++++ src/lyrics_fetcher.h | 16 ++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index 39d43ce0..9b675852 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -38,6 +38,7 @@ LyricsFetcher *lyricsPlugins[] = new LyricstimeFetcher(), new MetrolyricsFetcher(), new LyrcComArFetcher(), + new InternetLyricsFetcher(), 0 }; @@ -239,5 +240,23 @@ void SonglyricsFetcher::postProcess(std::string &data) LyricsFetcher::postProcess(data); } +/**********************************************************************/ + +LyricsFetcher::Result InternetLyricsFetcher::fetch(const std::string &artist, const std::string &title) +{ + GoogleLyricsFetcher::fetch(artist, title); + LyricsFetcher::Result result; + result.first = false; + result.second = "The following site may contain lyrics for this song: "; + result.second += URL; + return result; +} + +bool InternetLyricsFetcher::isURLOk(const std::string &url) +{ + URL = url; + return false; +} + #endif // HAVE_CURL_CURL_H diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h index 070ecef4..e61eea1d 100644 --- a/src/lyrics_fetcher.h +++ b/src/lyrics_fetcher.h @@ -160,6 +160,22 @@ struct Sing365Fetcher : public GoogleLyricsFetcher virtual const char *getCloseTag() { return "