The branch, dharma has been updated
via 9f40aaf146d8bb038a8f1c54bcf5f369d592e7f8 (commit)
from 90152d448e78810e9e987a9a2ca9edfaed5c5c87 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=9f40aaf146d8bb038a8f1c54bcf5f369d592e7f8
commit 9f40aaf146d8bb038a8f1c54bcf5f369d592e7f8
Author: olympia <[email protected]>
Date: Mon Jan 10 21:09:16 2011 +0100
[metadata.common.hdtrailers.net] agrh. real fix... sorry guys
diff --git a/metadata.common.hdtrailers.net/addon.xml
b/metadata.common.hdtrailers.net/addon.xml
index 8fb4286..55ad80c 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.5"
+ version="1.0.6"
provider-name="Bence Nádas (olympia)">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.common.hdtrailers.net/hdtrailers.xml
b/metadata.common.hdtrailers.net/hdtrailers.xml
index de56845..c898ba3 100644
--- a/metadata.common.hdtrailers.net/hdtrailers.xml
+++ b/metadata.common.hdtrailers.net/hdtrailers.xml
@@ -2,23 +2,23 @@
<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"
trim="1">([\w]+)</expression>
+ <expression repeat="yes" fixchars="1"
trim="1">([\w]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetHDTrailersnet480p>
<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 trim="1" noclean="1"
encode="1">([\w]+)</expression>
+ <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="<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 trim="1" noclean="1"
encode="1">([\w]+)</expression>
+ <RegExp input="$$1" output="\1-" dest="6">
+ <expression repeat="yes" fixchars="1"
trim="1">([\w]+)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -33,11 +33,11 @@
<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=\1";
dest="6">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
+ <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="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=\1";
dest="6">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
+ <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -46,15 +46,15 @@
<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=\1";
dest="6">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
+ <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="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=\1";
dest="6">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res720p</expression>
+ <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="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=\1";
dest="6">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res1080p</expression>
+ <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res1080p</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
diff --git a/metadata.imdb.com/addon.xml b/metadata.imdb.com/addon.xml
index a54be8c..718d202 100644
--- a/metadata.imdb.com/addon.xml
+++ b/metadata.imdb.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.imdb.com"
name="IMDb"
- version="2.1.5"
+ version="2.1.6"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -9,7 +9,7 @@
<import addon="metadata.common.movieposterdb.com" version="1.0.4"/>
<import addon="metadata.common.imdb.com" version="2.0.7"/>
<import addon="metadata.common.impa.com" version="1.0.3"/>
- <import addon="metadata.common.hdtrailers.net" version="1.0.5"/>
+ <import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="en"
diff --git a/metadata.imdb.com/changelog.txt b/metadata.imdb.com/changelog.txt
index 9cd71f0..e927b5a 100644
--- a/metadata.imdb.com/changelog.txt
+++ b/metadata.imdb.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]2.1.6[/B]
+- fixed: real fix for hd-trailers.net
+
[B]2.1.5[/B]
- fixed: trailer scraping from hd-trailers.net
diff --git a/metadata.themoviedb.org/addon.xml
b/metadata.themoviedb.org/addon.xml
index 5b161d9..54e4461 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.themoviedb.org"
name="The MovieDB"
- version="1.2.1"
+ version="1.2.2"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.7"/>
- <import addon="metadata.common.hdtrailers.net" version="1.0.5"/>
+ <import addon="metadata.common.hdtrailers.net" version="1.0.6"/>
<import addon="metadata.common.imdb.com" version="2.0.5"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
diff --git a/metadata.themoviedb.org/changelog.txt
b/metadata.themoviedb.org/changelog.txt
index 2d9b120..848f598 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.2.2[/B]
+- fixed: real fix for hd-trailers.net
+
[B]1.2.1[/B]
- fixed: trailer scraping from hd-trailers.net
-----------------------------------------------------------------------
Summary of changes:
metadata.common.hdtrailers.net/addon.xml | 2 +-
metadata.common.hdtrailers.net/hdtrailers.xml | 20 ++++++++++----------
metadata.imdb.com/addon.xml | 4 ++--
metadata.imdb.com/changelog.txt | 3 +++
metadata.themoviedb.org/addon.xml | 4 ++--
metadata.themoviedb.org/changelog.txt | 3 +++
6 files changed, 21 insertions(+), 15 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Gaining the trust of online customers is vital for the success of any company
that requires sensitive data to be transmitted over the Web. Learn how to
best implement a security strategy that keeps consumers' information secure
and instills the confidence they need to proceed with transactions.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
