From: Thomas Jansen <mithi@mithi.net>
Date: Sat, 3 Oct 2009 18:09:25 +0000 (+0200)
Subject: lyricwiki plugin: updated to their latest layout
X-Git-Tag: release-0.16~189^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6a967efef031468731bb9a905bd167217036b404;p=ncmpc.git

lyricwiki plugin: updated to their latest layout
---

diff --git a/lyrics/02-lyricwiki.rb b/lyrics/02-lyricwiki.rb
index 2e1aed7..b3b7028 100755
--- a/lyrics/02-lyricwiki.rb
+++ b/lyrics/02-lyricwiki.rb
@@ -33,8 +33,8 @@ if not response =~ /<url>\s*(.*?)\s*<\/url>/im
 	exit(1)
 end
 
-url = $1.gsub(/wikia.com/, "wikia.com/lyrics");
-exit(69) if $1 =~ /action=edit$/
+url = $1
+exit(69) if url =~ /action=edit$/
 
 response = Net::HTTP.get(URI.parse(url))
 if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<!--/im
@@ -42,4 +42,9 @@ if not response =~ /<div class='lyricbox'>\s*(.*?)\s*<!--/im
 	exit(1)
 end
 
+if not $1 =~ /^.*<\/div>(.*?)$/im
+	$stderr.puts "Couldn't remove leading XML tags in lyricbox!\n"
+	exit(1)
+end
+
 puts $1.gsub(/<br \/>/, "\n")