Fix intermittent failures of the Genius fetcher

master
Andrzej Rybczak 5 years ago
parent ba2a4533ab
commit 37af7d8052
  1. 1
      CHANGELOG.md
  2. 5
      src/lyrics_fetcher.cpp
  3. 2
      src/lyrics_fetcher.h

@ -1,5 +1,6 @@
# ncmpcpp-0.10 (????-??-??)
* Add support for fetching lyrics from musixmatch.com.
* Fix intermittent failures of the Genius fetcher.
# ncmpcpp-0.9 (2020-12-20)
* Fix various Mopidy specific bugs.

@ -90,6 +90,9 @@ LyricsFetcher::Result LyricsFetcher::fetch(const std::string &artist,
if (lyrics.empty() || notLyrics(data))
{
//std::cerr << "Data: " << data << "\n";
//std::cerr << "Empty: " << lyrics.empty() << "\n";
//std::cerr << "Not Lyrics: " << notLyrics(data) << "\n";
result.second = msgNotFound;
return result;
}
@ -183,7 +186,7 @@ LyricsFetcher::Result GoogleLyricsFetcher::fetch(const std::string &artist,
}
data = unescapeHtmlUtf8(urls[0]);
URL = data.c_str();
return LyricsFetcher::fetch("", "");
}

@ -118,7 +118,7 @@ struct GeniusFetcher : public GoogleLyricsFetcher
virtual const char *name() const override { return "genius.com"; }
protected:
virtual const char *regex() const override { return "<div class=\"Lyrics__Container.*?\">(.*?)</div>"; }
virtual const char *regex() const override { return "<div class=\"[Ll]yrics.*?>(.*?)</div>"; }
};
struct JahLyricsFetcher : public GoogleLyricsFetcher

Loading…
Cancel
Save