The branch, frodo has been updated
via 7aadbbab0015fe471b49db50d4525987d50f3784 (commit)
from a9ecad87696d6178cd05c485d5f401b43ddde287 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=7aadbbab0015fe471b49db50d4525987d50f3784
commit 7aadbbab0015fe471b49db50d4525987d50f3784
Author: olympia <olym...@xbmc.org>
Date: Sat Jun 29 10:32:25 2013 +0200
[metadata.common.hdtrailers.net] updated to 2.0.0
diff --git a/metadata.common.hdtrailers.net/addon.xml
b/metadata.common.hdtrailers.net/addon.xml
index 88891bb..0a7742a 100644
--- a/metadata.common.hdtrailers.net/addon.xml
+++ b/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.0"
provider-name="Bence Nádas (olympia)">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.common.hdtrailers.net/hdtrailers.xml
b/metadata.common.hdtrailers.net/hdtrailers.xml
index 485e72b..90c01fd 100644
--- a/metadata.common.hdtrailers.net/hdtrailers.xml
+++ b/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -2,7 +2,7 @@
<GetHDTrailersnet480p dest="3">
<RegExp input="$$6" output="<details><url
function="Parse480pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1</url></details>";
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="<details><url
function="Parse720pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1</url></details>";
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,19 +18,16 @@
<GetHDTrailersnet1080p dest="3">
<RegExp input="$$6" output="<details><url
function="Parse1080pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1</url></details>";
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="<details><trailer>\1</trailer></details>"
dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
<!--fetch 480p trailer link from hdtrailers.net-->
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
+ <RegExp input="$$1"
output="<trailer>http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_480p_dl.mov</trailer>";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_480p_dl.mov"\srel="lightbox\[res480p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -38,18 +35,12 @@
<Parse720pTrailer dest="5">
<RegExp input="$$6"
output="<details><trailer>\1</trailer></details>"
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&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
+ <RegExp input="$$1"
output="http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_480p_dl.mov";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_480p_dl.mov"\srel="lightbox\[res480p</expression>
</RegExp>
<!--Fetch 720p trailer link from hdtrailers.net-->
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
+ <RegExp input="$$1"
output="http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_720p_dl.mov";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_720p_dl.mov"\srel="lightbox\[res720p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -57,27 +48,18 @@
<Parse1080pTrailer dest="5">
<RegExp input="$$6"
output="<details><trailer>\1</trailer></details>"
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&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
+ <RegExp input="$$1"
output="http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_480p_dl.mov";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_480p_dl.mov"\srel="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&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
+ <RegExp input="$$1"
output="http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_720p_dl.mov";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_720p_dl.mov"\srel="lightbox\[res720p</expression>
</RegExp>
<!--Fetch 1080p trailer link from hdtrailers.net-->
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6">
- <expression noclean="1">">(Theatrical
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res1080p</expression>
- </RegExp>
- <RegExp input="$$1"
output="http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\2";
dest="6+">
- <expression noclean="1">">(Teaser
)?Trailer</span></td>.*?sid=(\d*)"
rel="lightbox\[res1080p</expression>
+ <RegExp input="$$1"
output="http://pdl.stream.aol.com/aol/us/moviefone/movies/\1\2_\3_trlr_\4_1080p_dl.mov";
dest="6">
+ <expression
noclean="1">http://pdl.stream.aol.com/aol/us/moviefone/movies/(\d*)([^_]*)_([^_]*)_trlr_(\d*)_1080p_dl.mov"\srel="lightbox\[res1080p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</Parse1080pTrailer>
-</scraperfunctions>
+</scraperfunctions>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
metadata.common.hdtrailers.net/addon.xml | 2 +-
metadata.common.hdtrailers.net/hdtrailers.xml | 52 ++++++++-----------------
2 files changed, 18 insertions(+), 36 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Xbmc-addons mailing list
Xbmc-addons@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
