From dcc47d1b57025d532166da342591ea39b1decc46 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond@gmail.com" <craig.p.drummond@gmail.com>
Date: Fri, 15 Jun 2012 11:21:07 +0000
Subject: [PATCH] Fix/workaround issues with fetching lyrics from
 letras.mus.br# BUG:36

---
 ChangeLog                         |  1 +
 lyrics/ultimate_providers.xml     | 12 +++++++++++-
 lyrics/ultimatelyricsprovider.cpp |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0821cf2ed..3a423c1c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
     4 pixels instead.
 29. Workaround tab-widget issues with Gtk style. Only draw highlight for
     selected item, and item curretly under mouse - no fade in/out.
+30. Fix/workaround issues with fetching lyrics from letras.mus.br
 
 0.7.1
 -----
diff --git a/lyrics/ultimate_providers.xml b/lyrics/ultimate_providers.xml
index 847c5ee5f..b2e544407 100644
--- a/lyrics/ultimate_providers.xml
+++ b/lyrics/ultimate_providers.xml
@@ -34,13 +34,23 @@
     </exclude>
     <invalidIndicator value="Page not Found"/>
   </provider>
-  <provider name="letras.mus.br" title="" charset="iso-8859-1" url="http://letras.terra.com.br/winamp.php?musica={title}&amp;artista={artist}">
+  <provider name="letras.mus.br" title="" charset="utf-8" url="http://letras.terra.com.br/winamp.php?musica={title}&amp;artista={artist}">
     <urlFormat replace="_@,;&amp;\/&quot;" with="_"/>
     <urlFormat replace=" " with="+"/>
     <extract>
       <item begin="&lt;/div&gt;" end="&lt;/div&gt;"/>
     </extract>
+    <exclude>
+      <item begin="&lt;!--" end="--&gt;"/>
+      <!--
+      <item begin="&lt;ul&gt;&lt;li id=&quot;ico_plugin&quot; class=&quot;inativo border-top&quot; &gt;" end="&lt;/ul&gt;"/>
+      <item begin="&lt;div id=&quot;tudo&quot; class=&quot;aberto&quot;&gt;" end="&lt;/div&gt;"/>
+      <item begin="&lt;h3 id=&quot;logo&quot;&gt;" end="&lt;/h3&gt;"/>
+      <item begin="&lt;form target=&quot;_blank&quot; action=&quot;http://letras.terra.com.br/&quot; method=&quot;get&quot; id=&quot;busca&quot;&gt;" end="&lt;/form&gt;"/>
+      -->
+    </exclude>
     <invalidIndicator value="Verifique se o nome do seu arquivo e sua"/>
+    <invalidIndicator value="Resultados prováveis "/>
   </provider>
   <provider name="loudson.gs" title="" charset="utf-8" url="http://www.loudson.gs/{a}/{artist}/{album}/{title}">
     <urlFormat replace=" _@,;&amp;\/&quot;" with="-"/>
diff --git a/lyrics/ultimatelyricsprovider.cpp b/lyrics/ultimatelyricsprovider.cpp
index 09741f717..0a3d1baa7 100644
--- a/lyrics/ultimatelyricsprovider.cpp
+++ b/lyrics/ultimatelyricsprovider.cpp
@@ -163,6 +163,7 @@ void UltimateLyricsProvider::LyricsFetched() {
   emit Finished(id);
 #endif
 
+  lyrics=lyrics.trimmed();
   emit InfoReady(id, lyrics);
 }