sync: hdtrailers with addons repo

2 files changed, 19 insertions, 21 deletions

diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml
index d6e9f4847c..55ad80c9b9 100644
--- a/addons/metadata.common.hdtrailers.net/addon.xml
+++ b/addons/metadata.common.hdtrailers.net/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.common.hdtrailers.net"
        name="HD-Trailers common scraper functions"
-       version="1.0.4"
+       version="1.0.6"
        provider-name="Bence Nádas (olympia)">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
@@ -14,22 +14,20 @@
     <summary lang="es">Scraper de Trailers de HD-Trailers.net</summary>
     <summary lang="fr">Scraper HD-Trailers.net pour les bande-annonces</summary>
     <summary lang="hu">HD-Trailers.net leolvasó-könyvtár</summary>
-    <summary lang="nl">HTBackdrops-scraperfuncties</summary>
-    <summary lang="pl">Scraper biblioteki HD-Trailers.net</summary>
+    <summary lang="nl">HD-Trailers.net Scraper Collectie</summary>
+    <summary lang="pl">Scraper zwiastunów HD-Trailers.net</summary>
     <summary lang="pt">Scraper de trailers de HD-Trailers.net</summary>
     <summary lang="ru">Обработчик для трейлеров с HD-Trailers.net</summary>
-    <summary lang="se">Skrapa för trailers från HD-Trailers.net</summary>
     <summary lang="zh">HD-Trailers.net刮削器代码库</summary>
     <description lang="en">Download Movie Trailers from www.hd-trailers.net</description>
     <description lang="de">Downloade Trailer von www.hd-trailers.net</description>
     <description lang="es">Descarga trailers de www.hd-trailers.net</description>
     <description lang="fr">Télécharge les bande-annonces de films depuis www.hd-trailers.net</description>
     <description lang="hu">Filmelőzetesek letöltése a www.hd-trailers.net-ről</description>
-    <description lang="nl">Achtergronden ophalen van www.htbackdrops.com</description>
+    <description lang="nl">Download trailers van www.hd-trailers.net</description>
     <description lang="pl">Pobieraj zwiastuny filmowe z www.hd-trailers.net</description>
     <description lang="pt">Descarregar trailers de www.hd-trailers.net</description>
     <description lang="ru">Загружать трейлеры с www.hd-trailers.net</description>
-    <description lang="se">Ladda ner trailers från www.hd-trailers.net</description>
     <description lang="zh">从www.hd-trailers.net下载电影预告片</description>
     <minversion>20000</minversion>
     <platform>all</platform>
diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
index 1c1aadccd7..c898ba3c32 100644
--- a/addons/metadata.common.hdtrailers.net/hdtrailers.xml
+++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -1,24 +1,24 @@
 <scraperfunctions>
 	<GetHDTrailersnet480p dest="3">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
+		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse480pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="\1-" dest="6">
+				<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</GetHDTrailersnet480p>
 	<GetHDTrailersnet720p dest="3">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
+		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse720pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="\1-" dest="6">
+				<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</GetHDTrailersnet720p>
 	<GetHDTrailersnet1080p dest="3">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot;&gt;http://www.hd-trailers.net/blog/?s=&quot;\1%20%28Theatrical%20Trailer%29%22&lt;/url&gt;&lt;/details&gt;" dest="3">
-			<RegExp input="$$1" output="\1" dest="6">
-				<expression noclean="1" fixchars="1" trim="1" encode="1">(.*)</expression>
+		<RegExp input="$$6" output="&lt;details&gt;&lt;url function=&quot;Parse1080pTrailer&quot; cache=&quot;hd-trailers-\1.xml&quot;&gt;http://xbmc.hd-trailers.net/movie/\1&lt;/url&gt;&lt;/details&gt;" dest="3">
+			<RegExp input="$$1" output="\1-" dest="6">
+				<expression repeat="yes" fixchars="1" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -26,18 +26,18 @@
 	<Parse480pTrailer dest="5">
 		<!--Fetch 480p trailer link from hdtrailers.net-->
 		<RegExp input="$$1" output="&lt;details&gt;&lt;trailer&gt;http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
-			<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
+			<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
 		</RegExp>
 	</Parse480pTrailer>
 	<Parse720pTrailer dest="5">
 		<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
 			<!--Fallback to fetch 480p trailer link if 720p is not available-->
 			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
-				<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
+				<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
 			</RegExp>
 			<!--Fetch 720p trailer link from hdtrailers.net-->
 			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
-				<expression noclean="1">sid=(\d*)"&gt;720p&lt;/a&gt;</expression>
+				<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -46,15 +46,15 @@
 		<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
 			<!--Fallback to fetch 480p trailer link if 720p and 1080p are not available-->
 			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
-				<expression noclean="1">sid=(\d*)"&gt;480p&lt;/a&gt;</expression>
+				<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
 			</RegExp>
 			<!--Fallback to fetch 720p trailer link if 1080p is not available-->
 			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
-				<expression noclean="1">sid=(\d*)"&gt;720p&lt;/a&gt;</expression>
+				<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
 			</RegExp>
 			<!--Fetch 1080p trailer link from hdtrailers.net-->
 			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\1" dest="6">
-				<expression noclean="1">sid=(\d*)"&gt;1080p&lt;/a&gt;</expression>
+				<expression noclean="1">&quot;&gt;Trailer&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>