From 67df6b556b8563fb1117ade1c0eec9757919afc2 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 8 Apr 2017 14:19:42 +0200 Subject: [PATCH] Fix InternetLyricsFetcher --- src/lyrics_fetcher.cpp | 10 ++++++++-- src/lyrics_fetcher.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lyrics_fetcher.cpp b/src/lyrics_fetcher.cpp index b7de1ffc..1c438f15 100644 --- a/src/lyrics_fetcher.cpp +++ b/src/lyrics_fetcher.cpp @@ -207,8 +207,14 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist, Result result; result.first = false; - std::string search_str = "site:"; - search_str += Curl::escape(siteKeyword()); + std::string search_str; + if (siteKeyword() != nullptr) + { + search_str += "site:"; + search_str += Curl::escape(siteKeyword()); + } + else + search_str = "lyrics"; search_str += "+"; search_str += Curl::escape(artist); search_str += "+"; diff --git a/src/lyrics_fetcher.h b/src/lyrics_fetcher.h index 05f73db8..f6578175 100644 --- a/src/lyrics_fetcher.h +++ b/src/lyrics_fetcher.h @@ -161,7 +161,7 @@ struct InternetLyricsFetcher : public GoogleLyricsFetcher virtual Result fetch(const std::string &artist, const std::string &title) override; protected: - virtual const char *siteKeyword() const override { return "lyrics"; } + virtual const char *siteKeyword() const override { return nullptr; } virtual const char *regex() const override { return ""; } virtual bool isURLOk(const std::string &url) override;