From 16b9faca9af88b80386c826d88ab74808b545533 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Wed, 21 Nov 2012 12:10:07 +0100
Subject: [PATCH] Update lyrics parsing for tekstowo.pl. Fixes issue #3303

---
 data/lyrics/ultimate_providers.xml    | 19 ++++++++-----------
 tools/ultimate_lyrics_parser/sites.js | 21 ++++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/data/lyrics/ultimate_providers.xml b/data/lyrics/ultimate_providers.xml
index 33e77f5cf..e88da7efe 100644
--- a/data/lyrics/ultimate_providers.xml
+++ b/data/lyrics/ultimate_providers.xml
@@ -192,27 +192,24 @@
     <invalidIndicator value="Sorry, we have no"/>
     <invalidIndicator value="This is an upcoming album and we do not have the"/>
   </provider>
-  <provider name="tekstowo.pl (Polish translations)" title="                                   {artist} - {title} - " charset="iso-8859-2" url="http://www.tekstowo.pl/piosenka,{artist},{title}.html">
+  <provider name="tekstowo.pl (Polish translations)" title="{artist} - {title} - tekst" charset="utf-8" url="http://www.tekstowo.pl/piosenka,{artist},{title}.html">
     <urlFormat replace=" _@,;&amp;\/'&quot;." with="_"/>
     <extract>
-      <item tag="&lt;div id=&quot;tran&quot; style=&quot;display:none&quot;&gt;"/>
+      <item begin="&lt;div class=&quot;song-text&quot;&gt;" end="&lt;a href=&quot;javascript:;&quot;"/>
     </extract>
     <extract>
-      <item tag="&lt;div id=&quot;tex&quot; style=&quot;display:block&quot;&gt;"/>
+      <item tag="&lt;div class=&quot;tlumaczenie&quot;&gt;"/>
     </extract>
     <exclude>
-      <item begin="&lt;div style=&quot;float:left&quot;" end="&gt;"/>
+      <item begin="&lt;h2&gt;" end="&lt;/h2&gt;&lt;br /&gt;"/>
     </exclude>
   </provider>
-  <provider name="teksty.org" title="{Artist} - {Title2} - tekst" charset="UTF-8" url="http://www.teksty.org/{artist},{title},tekst-piosenki">
-    <urlFormat replace=" _@,;&amp;\/&quot;." with="_"/>
-    <urlFormat replace="'" with=""/>
+  <provider name="teksty.org" title="{artist} - {title} - tekst" charset="utf-8" url="http://teksty.org/{artist},{title},tekst-piosenki">
+    <urlFormat replace=" _@,;&amp;\/&quot;'" with="-"/>
+    <urlFormat replace="." with=""/>
     <extract>
-      <item tag="&lt;span class=&quot;text&quot; id='text25534-dta'&gt;"/>
+      <item begin="&lt;div class=&quot;songText&quot; id=&quot;songContent&quot;&gt;" end="&lt;/div&gt;"/>
     </extract>
-    <exclude>
-      <item begin="&lt;div style=&quot;float:left&quot;" end="&gt;"/>
-    </exclude>
   </provider>
   <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="-"/>
diff --git a/tools/ultimate_lyrics_parser/sites.js b/tools/ultimate_lyrics_parser/sites.js
index 24b1cd011..a1ec54559 100644
--- a/tools/ultimate_lyrics_parser/sites.js
+++ b/tools/ultimate_lyrics_parser/sites.js
@@ -328,22 +328,21 @@ const siteDescriptors = {
 	},
 	"teksty.org": {
 		title: "{artist} - {title} - tekst",
-		charset: "UTF-8",
-		extract: "<span class=\"text\" id='text25534-dta'>",
-		exclude: [['<div style="float:left"','>']],
+		charset: "utf-8",
+		extract: [['<div class="songText" id="songContent">','</div>']],
 
-		url: "http://www.teksty.org/{Artist},{Title2}",
+		url: "http://teksty.org/{artist},{title},tekst-piosenki",
 		urlFormat : [
-			{rep: "_", punct: " _@,;&\\/\"." },	//	removed '
-			{rep: "", punct: "'" },
+			{rep: "-", punct: " _@,;&\\/\"'" },
+			{rep: "", punct: "."},
 		]
 	},
 	"tekstowo.pl (Polish translations)": {
-		title: "                                   {artist} - {title} - ",
-		charset: "iso-8859-2",
-		extract: '<div id="tran" style="display:none">',	//	original
-		extract2: '<div id="tex" style="display:block">',	//	translated
-		exclude: [['<div style="float:left"','>']],
+		title: "{artist} - {title} - tekst",
+		charset: "utf-8",
+		extract: [['<div class="song-text">','<a href="javascript:;"']],	//	original
+		extract2: '<div class="tlumaczenie">',	//	translated
+		exclude: [["<h2>","</h2><br />"]],
 
 		url: "http://www.tekstowo.pl/piosenka,{artist},{title}.html",
 		urlFormat : [