[addons] sync addons to repo

2 files changed, 21 insertions, 39 deletions

diff --git a/addons/metadata.common.hdtrailers.net/addon.xml b/addons/metadata.common.hdtrailers.net/addon.xml
index 0a71e092de..fb097de830 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.9"
+       version="2.0.2"
        provider-name="Bence Nádas (olympia)">
   <requires>
     <import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/addons/metadata.common.hdtrailers.net/hdtrailers.xml b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
index 485e72b4a3..c5eae9a234 100644
--- a/addons/metadata.common.hdtrailers.net/hdtrailers.xml
+++ b/addons/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -2,7 +2,7 @@
 	<GetHDTrailersnet480p dest="3">
 		<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>
+				<expression repeat="yes" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -10,7 +10,7 @@
 	<GetHDTrailersnet720p dest="3">
 		<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>
+				<expression repeat="yes" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
@@ -18,66 +18,48 @@
 	<GetHDTrailersnet1080p dest="3">
 		<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>
+				<expression repeat="yes" trim="1">([\w]+)</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</GetHDTrailersnet1080p>
 	<Parse480pTrailer dest="5">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
+		<RegExp input="$$6" output="&lt;details&gt;\1&lt;/details&gt;" dest="5">
 			<!--fetch 480p trailer link from hdtrailers.net-->
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_480p_dl.mov)"\srel=&quot;lightbox\[res480p</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</Parse480pTrailer>
 	<Parse720pTrailer dest="5">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
+		<RegExp input="$$6" output="&lt;details&gt;\1&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=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_480p_dl.mov)"\srel=&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=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_720p_dl.mov)"\srel=&quot;lightbox\[res720p</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</Parse720pTrailer>
 	<Parse1080pTrailer dest="5">
-		<RegExp input="$$6" output="&lt;details&gt;&lt;trailer&gt;\1&lt;/trailer&gt;&lt;/details&gt;" dest="5">
+		<RegExp input="$$6" output="&lt;details&gt;\1&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=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res480p</expression>
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_480p_dl.mov)"\srel=&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=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res720p</expression>
+			<!--Fetch 720p trailer link from hdtrailers.net-->
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_720p_dl.mov)"\srel=&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=\2" dest="6">
-				<expression noclean="1">&quot;&gt;(Theatrical )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
-			</RegExp>
-			<RegExp input="$$1" output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&amp;pt=rd&amp;sid=\2" dest="6+">
-				<expression noclean="1">&quot;&gt;(Teaser  )?Trailer&lt;/span&gt;&lt;/td&gt;.*?sid=(\d*)&quot; rel=&quot;lightbox\[res1080p</expression>
+			<RegExp input="$$1" output="&lt;trailer&gt;http://pdl.stream.aol.com/\1&lt;/trailer&gt;" dest="6">
+				<expression noclean="1">http://pdl\.stream\.aol\.com/([^&quot;]*?_1080p_dl.mov)"\srel=&quot;lightbox\[res1080p</expression>
 			</RegExp>
 			<expression noclean="1" />
 		</RegExp>
 	</Parse1080pTrailer>
-</scraperfunctions>
+</scraperfunctions>
\ No newline at end of file