Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2025-01-24 06:33:41 +01:00
Code Issues Releases Wiki Activity

GeniusLyricsProvider: Use new function for parsing HTML

Browse Source
This commit is contained in:
Jonas Kvinge 2022-10-15 14:34:09 +02:00
parent 1a25faa5b9
commit e46b92dd7d
1 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/lyrics/geniuslyricsprovider.cpp
View File

@ -478,52 +478,18 @@ void GeniusLyricsProvider::HandleLyricReply(QNetworkReply *reply, const int sear
EndSearch(search, lyric); EndSearch(search, lyric);
return; return;
} }
QString content = data;
// Extract the lyrics from HTML. QString content = QString::fromUtf8(data);
QString lyrics = ParseLyricsFromHTML(content, QRegularExpression("<div[^>]*>"), QRegularExpression("<\\/div>"), QRegularExpression("<div data-lyrics-container=[^>]+>"));
QString tag_begin = "<div class=\"lyrics\">"; if (lyrics.isEmpty()) {
QString tag_end = "</div>"; lyrics = ParseLyricsFromHTML(content, QRegularExpression("<div[^>]*>"), QRegularExpression("<\\/div>"), QRegularExpression("<div class=\"lyrics\">"));
qint64 begin_idx = content.indexOf(tag_begin);
QString lyrics;
if (begin_idx > 0) {
begin_idx += tag_begin.length();
qint64 end_idx = content.indexOf(tag_end, begin_idx);
if (end_idx > 0) {
QString text = content.mid(begin_idx, end_idx - begin_idx);
text = text.replace(QRegularExpression("<br[^>]+>"), "\n");
text = text.remove(QRegularExpression("<[^>]*>"));
text = text.trimmed();
if (text.length() < 6000) {
lyrics = text;
}
}
}
else {
QRegularExpressionMatch rematch = QRegularExpression("<div data-lyrics-container=[^>]+>").match(content);
if (rematch.hasMatch()) {
begin_idx = content.indexOf(rematch.captured());
if (begin_idx > 0) {
begin_idx += rematch.captured().length();
qint64 end_idx = content.indexOf("</div>", begin_idx + rematch.captured().length());
if (end_idx > 0) {
QString text = content.mid(begin_idx, end_idx - begin_idx);
text = text.replace(QRegularExpression("<br[^>]+>"), "\n");
text = text.remove(QRegularExpression("<[^>]*>"));
text = text.trimmed();
if (text.length() < 6000 && !text.contains("there are no lyrics to", Qt::CaseInsensitive)) {
lyrics = text;
}
}
}
}
} }
if (!lyrics.isEmpty()) { if (!lyrics.isEmpty()) {
LyricsSearchResult result; LyricsSearchResult result;
result.artist = lyric.artist; result.artist = lyric.artist;
result.title = lyric.title; result.title = lyric.title;
result.lyrics = Utilities::DecodeHtmlEntities(lyrics); result.lyrics = lyrics;
search->results.append(result); search->results.append(result);
} }