From: Lazaros Koromilas <lostd@2f30.org>
Date: Sun, 12 Jun 2016 18:55:46 +0000 (+0200)
Subject: lyrics: no extra XML tags in lyricbox anymore
X-Git-Tag: v0.25~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d3fa4666911bae9b7317b04cc6f286849b58db50;p=ncmpc.git

lyrics: no extra XML tags in lyricbox anymore
---

diff --git a/NEWS b/NEWS
index 2fb1860..70cf71b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
 ncmpc 0.25 - not yet released
 * lyricswiki: handle redirects
+* lyricswiki: update XML format
 
 
 ncmpc 0.24 - (2014-07-14)
diff --git a/lyrics/20-lyricwiki.rb b/lyrics/20-lyricwiki.rb
index 3e284ff..dbb50a3 100755
--- a/lyrics/20-lyricwiki.rb
+++ b/lyrics/20-lyricwiki.rb
@@ -49,11 +49,6 @@ if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<!--/im
 	exit(1)
 end
 
-if not $1 =~ /^.*<\/script>(.*?)$/im
-	$stderr.puts "Couldn't remove leading XML tags in lyricbox!\n"
-	exit(1)
-end
-
 lyrics = $1.gsub(/<br \/>/, "\n")
 
 if lyrics.respond_to?(:force_encoding)