The branch, eden has been updated
via 599a8b59a7906ee2b3be7d4b1058aa3b866c0fe7 (commit)
from 32a79378a847e697e863f7e462457db30e64fb52 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=599a8b59a7906ee2b3be7d4b1058aa3b866c0fe7
commit 599a8b59a7906ee2b3be7d4b1058aa3b866c0fe7
Author: olympia <[email protected]>
Date: Wed Mar 28 22:10:13 2012 +0200
[metadata.sratim.co.il] updated to version 1.1.9
diff --git a/metadata.sratim.co.il/addon.xml b/metadata.sratim.co.il/addon.xml
index 0b40cb4..ab9de11 100644
--- a/metadata.sratim.co.il/addon.xml
+++ b/metadata.sratim.co.il/addon.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.sratim.co.il"
name="Sratim"
- version="1.1.9"
+ version="1.2.0"
provider-name="Lev Waisberg">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
<import addon="metadata.common.themoviedb.org" version="1.0.7"/>
+ <import addon="metadata.common.movieposterdb.com" version="1.0.5"/>
<import addon="metadata.common.imdb.com" version="2.1.3"/>
+ <import addon="metadata.common.youtubetrailers" version="1.0.4"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="he"
diff --git a/metadata.sratim.co.il/changelog.txt
b/metadata.sratim.co.il/changelog.txt
index 00c7540..17e9460 100644
--- a/metadata.sratim.co.il/changelog.txt
+++ b/metadata.sratim.co.il/changelog.txt
@@ -1,3 +1,10 @@
+[B]1.2.0[/B]
+- fix extraction of director, genres, english title, studio due to changes in
sratim website
+- add YouTube trailers
+- remove hdTrailers.net trailers
+- add MoviePosterDB thumbs
+- remove Google fanart
+
[B]1.1.9[/B]
- fix extracting TMDB thumbs
diff --git a/metadata.sratim.co.il/resources/language/English/strings.xml
b/metadata.sratim.co.il/resources/language/English/strings.xml
index 36ad984..bca3b9c 100644
--- a/metadata.sratim.co.il/resources/language/English/strings.xml
+++ b/metadata.sratim.co.il/resources/language/English/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Enable full cast credits</string>
- <string id="30001">Get Trailers from HD-Trailers.net in </string>
+ <string id="30001">Get Trailers from </string>
<string id="30002">Get fanart from</string>
<string id="30003">Get thumb (Movie Poster) from </string>
<string id="30004">Get rating from </string>
diff --git a/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
b/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
index 31af063..a150ad2 100644
--- a/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
+++ b/metadata.sratim.co.il/resources/language/Hebrew/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">×פשר ××××¢ ××× ×¢× ×©××§× ××</string>
- <string id="30001">××× ×§××××× ×× ×HD-Trailers
×ר××××צ××</string>
+ <string id="30001">××× ×§××××× ×× ×</string>
<string id="30002">××× ×¤×× ××¨× ×</string>
<string id="30003">××× ×¤×ס×ר ×</string>
<string id="30004">××× ×¦××× ×¡×¨× ×</string>
diff --git a/metadata.sratim.co.il/resources/settings.xml
b/metadata.sratim.co.il/resources/settings.xml
index 3a5a072..e7e4944 100644
--- a/metadata.sratim.co.il/resources/settings.xml
+++ b/metadata.sratim.co.il/resources/settings.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<setting label="30000" type="bool" id="fullcredits" default="false" />
- <setting label="30001" type="labelenum" values="No|480p|720p|1080p"
id="TrailerQ" default="480p" />
- <setting label="30002" type="labelenum" values="MovieDB|Google|None"
id="fanart" default="MovieDB" />
- <setting label="30003" type="labelenum" values="Sratim|TMDB"
id="thumbFrom" default="Sratim" />
+ <setting label="30001" type="labelenum" values="YouTube|None"
id="trailersFrom" default="YouTube" />
+ <setting label="30002" type="labelenum" values="MovieDB|None"
id="fanart" default="MovieDB" />
+ <setting label="30003" type="labelenum"
values="Sratim|TMDB|MoviePosterDB" id="thumbFrom" default="Sratim" />
<setting label="30004" type="labelenum" values="IMDB|Sratim"
id="ratingFrom" default="Sratim"/>
<setting label="30005" type="labelenum" values="Hebrew|English"
id="titleLang" default="Hebrew"/>
</settings>
diff --git a/metadata.sratim.co.il/sratim.xml b/metadata.sratim.co.il/sratim.xml
index 45ad62c..dbdc342 100644
--- a/metadata.sratim.co.il/sratim.xml
+++ b/metadata.sratim.co.il/sratim.xml
@@ -38,7 +38,7 @@
</RegExp>
<RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
<RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="14">
- <expression trim="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ <expression trim="1"><span
class="Gray">In English:</span>\s*([^<]*)</expression>
</RegExp>
<expression>Hebrew</expression>
</RegExp>
@@ -50,7 +50,7 @@
</RegExp>
<RegExp input="$INFO[titleLang]" output="$$14"
dest="5+">
<RegExp input="$$1"
output="<title>\1</title>" dest="14">
- <expression trim="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ <expression trim="1"><span
class="Gray">In English:</span>\s*([^<]*)</expression>
</RegExp>
<expression>English</expression>
</RegExp>
@@ -60,17 +60,18 @@
<expression trim="1"><meta
name="description"
content="(([^<]*(<br\s*/?>)?[^<]*)*)"</expression>
</RegExp>
- <!--geners (7)-->
- <RegExp input="$$1" output="\1" dest="7">
+ <!--geners (14)-->
+ <RegExp input="$$1" output="\1" dest="14">
<expression
noclean="1">class="Box_Blue"(.*?)class="profilelrgstars"</expression>
</RegExp>
- <RegExp input="$$7"
output="<genre>\1</genre>" dest="5+">
- <expression repeat="yes" trim="1"><a
href="browse.php\?g=[^"]*">([^<]*)</a></expression>
+ <RegExp input="$$14"
output="<genre>\1</genre>" dest="5+">
+ <expression repeat="yes" trim="1"><span
itemprop="genre">([^<]*)</span></expression>
</RegExp>
<!--studio -->
<RegExp input="$$1"
output="<studio>\1</studio>" dest="5+">
- <expression><td
class[^>]*>×פק×:</td>[^<]*<td>([^<]*)</td></expression>
+ <!--<expression><td
class[^>]*>×פק×:</td>[^<]*<td>([^<]*)</td></expression>-->
+ <expression repeat="yes" trim="1"><span
itemprop="productionCompany">([^<]*)</span></expression>
</RegExp>
<!-- actors lower list -->
@@ -84,12 +85,9 @@
<expression repeat="yes"><a
href="profileview.php\?id=([^"]*)"><b>[^<]*</b></expression>
</RegExp>
- <!--director (12)-->
- <RegExp input="$$1" output="\1" dest="12">
- <expression noclean="1"><td
class[^>]*>×××××:</td><td>(.*?)</td></expression>
- </RegExp>
- <RegExp input="$$12"
output="<director>\1</director>" dest="5+">
- <expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*">([^<]*)</a></expression>
+ <!--director -->
+ <RegExp input="$$1"
output="<director>\1</director>" dest="5+">
+ <expression repeat="yes" trim="1"><a
href="profileview.php\?id=[^"]*"
itemprop="director">([^<]*)</a></expression>
</RegExp>
<!--runtime-->
@@ -136,6 +134,12 @@
</RegExp>
<expression>Sratim</expression>
</RegExp>
+ <RegExp input="$INFO[thumbFrom]" output="<chain
function="GetMoviePosterDBThumbs">$$9</chain>" dest="5+">
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression
trim="1">http://www.imdb.com/title/(tt[^"]+)</expression>
+ </RegExp>
+ <expression>MoviePosterDB</expression>
+ </RegExp>
<!-- Fan Art (13)-->
<RegExp input="$INFO[fanart]" output="<chain
function="GetTMDBFanartByIdChain">$$13</chain>" dest="5+">
@@ -144,31 +148,16 @@
</RegExp>
<expression>MovieDB</expression>
</RegExp>
- <RegExp input="$INFO[fanart]" output="<chain
function="GetGoogleFanart">$$13</chain>" dest="5+">
- <RegExp input="$$1" output="\1" dest="13">
- <expression
trim="1">class="smtext".+?right;">(.*?)<</expression>
- </RegExp>
- <expression>Google</expression>
- </RegExp>
- <!-- Trailers (6) -->
- <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet480p">$$6</chain>" dest="5+">
+ <!-- Trailers (6, 7) -->
+ <RegExp input="$INFO[trailersFrom]" output="<chain
function="GetYoutubeTrailer">$$6=$$7</chain>" dest="5+">
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ <expression trim="1"><span
class="Gray">In English:</span>\s*([^<]*)</expression><!--english
title-->
</RegExp>
- <expression>480p</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet720p">$$6</chain>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
- </RegExp>
- <expression>720p</expression>
- </RegExp>
- <RegExp input="$INFO[TrailerQ]" output="<chain
function="GetHDTrailersnet1080p">$$6</chain>" dest="5+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><div
class="smtext"
style="direction:ltr;text-align:right;">([^<]*)</span></expression>
+ <RegExp input="$$1" output="\1" dest="7">
+ <expression trim="1"><a
href="browse.php\?uy=[^>]*>([^<]*)</a></expression><!--year-->
</RegExp>
- <expression>1080p</expression>
+ <expression>YouTube</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -181,64 +170,4 @@
<expression noclean="1" />
</RegExp>
</GetActorDetails>
- <GetHDTrailersnet480p dest="3">
- <RegExp input="$$6" output="<details><url
function="Parse480pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1|User-Agent=XBMC/10.0</url></details>"
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="<details><url
function="Parse720pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1|User-Agent=XBMC/10.0</url></details>"
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="<details><url
function="Parse1080pTrailer"
cache="hd-trailers-\1.xml">http://xbmc.hd-trailers.net/movie/\1|User-Agent=XBMC/10.0</url></details>"
dest="3">
- <RegExp input="$$1" output="\1-" dest="6">
- <expression repeat="yes" fixchars="1"
trim="1">([\w]+)</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </GetHDTrailersnet1080p>
- <Parse480pTrailer dest="5">
- <!--Fetch 480p trailer link from hdtrailers.net-->
- <RegExp input="$$1"
output="<details><trailer>http://playlist.yahoo.com/makeplaylist.dll?sdm=web&pt=rd&sid=\1</trailer></details>";
dest="5">
- <expression
noclean="1">">Trailer</td>.*?sid=(\d*)"
rel="lightbox\[res480p</expression>
- </RegExp>
- </Parse480pTrailer>
- <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=\1";
dest="6">
- <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>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </Parse720pTrailer>
- <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=\1";
dest="6">
- <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>
- </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>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </Parse1080pTrailer>
</scraper>
\ No newline at end of file
-----------------------------------------------------------------------
Summary of changes:
metadata.sratim.co.il/addon.xml | 4 +-
metadata.sratim.co.il/changelog.txt | 7 +
.../resources/language/English/strings.xml | 2 +-
.../resources/language/Hebrew/strings.xml | 2 +-
metadata.sratim.co.il/resources/settings.xml | 6 +-
metadata.sratim.co.il/sratim.xml | 117 ++++----------------
6 files changed, 38 insertions(+), 100 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
