lyrics: no extra XML tags in lyricbox anymore

diff --git a/NEWS b/NEWS
index 2fb18600b4bb876a2e5ea6bb56615293ec447dd7..70cf71b704bcf5521a4d02297ee7421758db000d 100644 (file)
--- 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 3e284ff9e532e48552f306e3e0bfdfcc036f9cb1..dbb50a3fb6638ec8c1a2d1a9ff5080a8b28779dd 100755 (executable)
--- 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)