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

Fix InternetLyricsFetcher

Browse Source
This commit is contained in:
Andrzej Rybczak
2017-04-08 14:19:42 +02:00
parent 890eaf61c7
commit 67df6b556b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lyrics_fetcher.cpp
View File

@@ -207,8 +207,14 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist,
Result result; Result result;
result.first = false; result.first = false;
std::string search_str = "site:"; std::string search_str;
search_str += Curl::escape(siteKeyword()); if (siteKeyword() != nullptr)
{
search_str += "site:";
search_str += Curl::escape(siteKeyword());
}
else
search_str = "lyrics";
search_str += "+"; search_str += "+";
search_str += Curl::escape(artist); search_str += Curl::escape(artist);
search_str += "+"; search_str += "+";

2
src/lyrics_fetcher.h
View File

@@ -161,7 +161,7 @@ struct InternetLyricsFetcher : public GoogleLyricsFetcher
virtual Result fetch(const std::string &artist, const std::string &title) override; virtual Result fetch(const std::string &artist, const std::string &title) override;
protected: 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 const char *regex() const override { return ""; }
virtual bool isURLOk(const std::string &url) override; virtual bool isURLOk(const std::string &url) override;