Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix vagalume lyrics. Thanks ikojba

Browse Source
This commit is contained in:
David Sansome 2011-06-09 16:32:45 +00:00
parent 827d37e64b
commit 5488b37447
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/lyrics/ultimate_providers.xml
View File

@ -205,16 +205,16 @@
<item begin="&lt;div style=&quot;float:left&quot;" end="&gt;"/> <item begin="&lt;div style=&quot;float:left&quot;" end="&gt;"/>
</exclude> </exclude>
</provider> </provider>
<provider name="vagalume.uol.com.br" title="{title} de {artist} no VAGALUME" charset="iso-8859-1" url="http://vagalume.uol.com.br/{artist}/{title}.html"> <provider name="vagalume.com.br" title="{title} de {artist} no VAGALUME" charset="iso-8859-1" url="http://vagalume.com.br/{artist}/{title}.html">
<urlFormat replace=" _@,;&amp;\/'&quot;." with="-"/> <urlFormat replace=" _@,;&amp;\/'&quot;." with="-"/>
<extract> <extract>
<item tag="&lt;div class=&quot;tab_original&quot;&gt;"/> <item tag="&lt;span class=&quot;editable_area&quot;&gt;"/>
</extract> </extract>
</provider> </provider>
<provider name="vagalume.uol.com.br (Portuguese translations)" title="{title} de {artist} no VAGALUME" charset="iso-8859-1" url="http://vagalume.uol.com.br/{artist}/{title}-traducao.html"> <provider name="vagalume.com.br (Portuguese translations)" title="{title} de {artist} no VAGALUME" charset="iso-8859-1" url="http://vagalume.com.br/{artist}/{title}-traducao.html">
<urlFormat replace=" _@,;&amp;\/'&quot;." with="-"/> <urlFormat replace=" _@,;&amp;\/'&quot;." with="-"/>
<extract> <extract>
<item tag="&lt;div class=&quot;tab_tra_pt&quot;&gt;"/> <item tag="&lt;div class=&quot;tab_traducao sideBySide lyricArea tab_tra_pt&quot;&gt;"/>
</extract> </extract>
</provider> </provider>
</lyricproviders> </lyricproviders>

4
src/songinfo/ultimatelyricsprovider.cpp
View File

@ -56,6 +56,7 @@ void UltimateLyricsProvider::FetchInfo(int id, const Song& metadata) {
DoUrlReplace("{a}", FirstChar(metadata.artist()), &url_text); DoUrlReplace("{a}", FirstChar(metadata.artist()), &url_text);
QUrl url(url_text); QUrl url(url_text);
qLog(Debug) << "Fetching lyrics from" << url;
// Fetch the URL, follow redirects // Fetch the URL, follow redirects
redirect_count_ = 0; redirect_count_ = 0;
@ -106,6 +107,7 @@ void UltimateLyricsProvider::LyricsFetched() {
// Check for invalid indicators // Check for invalid indicators
foreach (const QString& indicator, invalid_indicators_) { foreach (const QString& indicator, invalid_indicators_) {
if (original_content.contains(indicator)) { if (original_content.contains(indicator)) {
qLog(Debug) << "Found invalid indicator" << indicator;
emit Finished(id); emit Finished(id);
return; return;
} }
@ -116,6 +118,8 @@ void UltimateLyricsProvider::LyricsFetched() {
QString content = original_content; QString content = original_content;
ApplyExtractRule(rule, &content); ApplyExtractRule(rule, &content);
qLog(Debug) << "Extract rule" << rule << "matched" << content.length();
if (!content.isEmpty()) if (!content.isEmpty())
lyrics = content; lyrics = content;
} }

12
tools/ultimate_lyrics_parser/sites.js
View File

@ -350,24 +350,24 @@ const siteDescriptors = {
{rep: "_", punct: " _@,;&\\/'\"." }, {rep: "_", punct: " _@,;&\\/'\"." },
] ]
}, },
"vagalume.uol.com.br": { "vagalume.com.br": {
title: "{title} de {artist} no VAGALUME", title: "{title} de {artist} no VAGALUME",
charset: "iso-8859-1", charset: "iso-8859-1",
extract: '<div class="tab_original">', extract: '<span class="editable_area">',
// exclude: [['<div style="float:left"','>']], // exclude: [['<div style="float:left"','>']],
url: "http://vagalume.uol.com.br/{artist}/{title}.html", url: "http://vagalume.com.br/{artist}/{title}.html",
urlFormat : [ urlFormat : [
{rep: "-", punct: " _@,;&\\/'\"." }, {rep: "-", punct: " _@,;&\\/'\"." },
] ]
}, },
"vagalume.uol.com.br (Portuguese translations)": { "vagalume.com.br (Portuguese translations)": {
title: "{title} de {artist} no VAGALUME", title: "{title} de {artist} no VAGALUME",
charset: "iso-8859-1", charset: "iso-8859-1",
extract: '<div class="tab_tra_pt">', extract: '<div class="tab_traducao sideBySide lyricArea tab_tra_pt">',
// exclude: [['<div style="float:left"','>']], // exclude: [['<div style="float:left"','>']],
url: "http://vagalume.uol.com.br/{artist}/{title}-traducao.html", url: "http://vagalume.com.br/{artist}/{title}-traducao.html",
urlFormat : [ urlFormat : [
{rep: "-", punct: " _@,;&\\/'\"." }, {rep: "-", punct: " _@,;&\\/'\"." },
] ]