The branch, eden-pre has been updated
via f8dad9b4d777500c3076603d176696577bcd2334 (commit)
from fc703e2f4b38c632fa346b2ed0d7b303efd3f7de (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=f8dad9b4d777500c3076603d176696577bcd2334
commit f8dad9b4d777500c3076603d176696577bcd2334
Author: olympia <[email protected]>
Date: Sat Aug 13 08:27:33 2011 +0200
[metadata.movieplayer.it] updated to version 1.3
diff --git a/metadata.movieplayer.it/addon.xml
b/metadata.movieplayer.it/addon.xml
index b7aa6c9..5866dbf 100644
--- a/metadata.movieplayer.it/addon.xml
+++ b/metadata.movieplayer.it/addon.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.movieplayer.it"
name="MoviePlayer.it"
- version="1.2.1"
- provider-name="KoTiX">
+ version="1.3"
+ provider-name="KoTiX and Gulp">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.0"/>
+ <import addon="metadata.common.themoviedb.org" version="1.0.7"/>
<import addon="metadata.common.imdb.com" version="2.1.1"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
diff --git a/metadata.movieplayer.it/changelog.txt
b/metadata.movieplayer.it/changelog.txt
index c8c3e61..ace6131 100644
--- a/metadata.movieplayer.it/changelog.txt
+++ b/metadata.movieplayer.it/changelog.txt
@@ -1,5 +1,9 @@
Changelog:
+11/08/2011 - added "" to bing search, fixed original title and mpaa fields.
+07/08/2011 - updated main scraper to use new MoviePlayer layout .
+07/08/2011 - Removed optional IMDB, now it's used by default to retrieve all
data except plot,tagline,outline,fanart and poster.
+07/08/2011 - Commit test.
14/07/2011 - Fixed IMDb missing stuff and some cosmetics.
13/07/2011 - Added Results per page and "Year" option in settings, but it's
best to keep it off.
Optimized the cache for IMDb and tmdb and other fixes
diff --git a/metadata.movieplayer.it/movieplayer.xml
b/metadata.movieplayer.it/movieplayer.xml
index 0484795..830bccb 100644
--- a/metadata.movieplayer.it/movieplayer.xml
+++ b/metadata.movieplayer.it/movieplayer.xml
@@ -1,15 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2011-07-14">
+<?xml version="1.0" encoding="utf-8"?><scraper framework="11"
date="2011-08-12" name="MoviePlayer.it" content="movies" language="en">
<NfoUrl dest="3">
<RegExp input="$$1" output="<url>\1</url>" dest="3">
<expression trim="1"
noclean="1">(http://www\.movieplayer\.it/film/[^_]+_[0-9]+/)</expression>
</RegExp>
</NfoUrl>
<CreateSearchUrl dest="3">
- <RegExp conditional="!Google" input="$$1"
output="<url>http://www.movieplayer.it/ricerca/?t=film&q=\1</url>";
dest="3">
+ <RegExp conditional="!Bing" input="$$1"
output="<url>http://www.movieplayer.it/ricerca/?t=film&q=\1</url>";
dest="3">
+ <!--RegExp conditional="Year" input="$$2"
output="%20(\1)" dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp-->
<expression noclean="1" />
</RegExp>
- <RegExp conditional="Google" input="$$1"
output="<url>http://it.bing.com/search?q=\1$$4+site%3Amovieplayer.it%2Ffilm%2F+-site%3Amovieplayer.it%2Ffilm%2Fnews%2F+-site%3Amovieplayer.it%2Ffilm%2Farticoli%2F+-site%3Amovieplayer.it%2Ffilm%2Fprossimamente%2F+-site%3Amovieplayer.it%2Ffilm%2Fboxoffice%2F&count=$INFO[count]</url>";
dest="3">
+ <RegExp conditional="Bing" input="$$1"
output="<url>http://it.bing.com/search?q="\1$$4"+site%3Amovieplayer.it%2Ffilm%2F+-site%3Amovieplayer.it%2Ffilm%2Fnews%2F+-site%3Amovieplayer.it%2Ffilm%2Farticoli%2F+-site%3Amovieplayer.it%2Ffilm%2Fprossimamente%2F+-site%3Amovieplayer.it%2Ffilm%2Fboxoffice%2F&count=$INFO[count]</url>";
dest="3">
<RegExp conditional="Year" input="$$2" output="%20(\1)"
dest="4">
<expression clear="yes">(.+)</expression>
</RegExp>
@@ -17,14 +19,14 @@
</RegExp>
</CreateSearchUrl>
<GetSearchResults dest="8">
- <RegExp conditional="!Google" input="$$7" output="<?xml
version="1.0" encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
- <RegExp input="$$1"
output="<entity><title>\2 \3</title><url
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/">http://www.movieplayer.it/film/\1/</url><id>\1</id></entity>";
dest="7">
+ <RegExp conditional="!Bing" input="$$7" output="<?xml
version="1.0" encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
+ <RegExp input="$$1"
output="<entity><title>\2 \3</title><url
spoof="http://www.movieplayer.it/adv/interstitial/2.html?next=/film/\1/">http://www.movieplayer.it/film/\1/</url><id>\1</id></entity>";
dest="7">
<expression repeat="yes"><a
href="/film/([^/]*)/">*[\n]*[\s]*<strong>([^/]*)</strong>([^/]*)</expression>
</RegExp>
<expression clear="yes" trim="1" noclean="1" />
</RegExp>
- <RegExp conditional="Google" input="$$7" output="<?xml
version="1.0" encoding="iso-8859-1"
standalone="yes"?><results
sorted="yes">\1</results>" dest="8">
- <RegExp input="$$1"
output="<entity><title>\3 (\4)</title><url
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1_\2/">http://www.movieplayer.it/film/\1_\2/</url><id>\1</id></entity>";
dest="7">
+ <RegExp conditional="Bing" input="$$7" output="<?xml
version="1.0" encoding="iso-8859-1"
standalone="yes"?><results
sorted="yes">\1</results>" dest="8">
+ <RegExp input="$$1"
output="<entity><title>\3 (\4)</title><url
spoof="http://www.movieplayer.it/adv/interstitial/2.html?next=/film/\1_\2/">http://www.movieplayer.it/film/\1_\2/</url><id>\1</id></entity>";
dest="7">
<expression
repeat="yes">http://www\.movieplayer\.it/film/([^_]*)_([0-9]+)/[^>]*>([^\(]*)\(([^\)]*)\)</expression>
</RegExp>
<expression clear="yes" trim="1" noclean="1" />
@@ -34,35 +36,29 @@
<RegExp input="$$13" output="<details>\1</details>"
dest="3">
<!--Title-->
<RegExp input="$$1"
output="<title>\1</title>" dest="13">
- <expression trim="1" noclean="1"><meta
name="title" content="([^/(]*)[^<]*" /></expression>
- </RegExp>
- <!--Original Title-->
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="13+">
- <expression><meta name="titolo_originale"
content="([^/"]*)" /></expression>
+ <expression trim="1" noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
</RegExp>
<!--Year-->
- <RegExp input="$$1"
output="<year>\1</year>" dest="13+">
- <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)" /></expression>
- </RegExp>
- <!--Country Film-->
- <RegExp input="$$1"
output="<country>\1</country>" dest="13+">
- <expression repeat="yes"><meta
name="nazione" content="([^"]*)" /></expression>
- </RegExp>
- <!--Director-->
- <RegExp input="$$1"
output="<director>\1</director>" dest="13+">
- <expression><meta name="regia"
content="([^\"]*)" /></expression>
- </RegExp>
- <!--Credits-->
- <RegExp input="$$1"
output="<credits>\1</credits>" dest="13+">
- <expression noclean="1"><meta
name="sceneggiatura" content="([^\"]*)" /></expression>
+ <RegExp input="$$1"
output="<year>\2</year>" dest="13+">
+ <expression trim="1" noclean="1"><meta
property="og:title" content="(?:&#x22;)?([^"]*?)(?:&#x22;)?
\([^\(]*?([0-9]{4})\)</expression>
</RegExp>
- <!--Runtime-->
- <RegExp input="$$1"
output="<runtime>\1min</runtime>" dest="13+">
- <expression>durata di
[^\d]*([0-9]+)</expression>
+ <!--Try OriginalTitle (put Title just in case MP site
hasn't original title)-->
+ <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="13+">
+ <!--Try OriginalTitle (if MP site has original
title, take it)-->
+ <RegExp input="$$1"
output="<originaltitle>\2</originaltitle>" dest="13+">
+ <expression trim="1"
noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong>
\(([^/"]*)\) </expression>
+ </RegExp>
+ <expression trim="1" noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
</RegExp>
- <!--Genre-->
- <RegExp input="$$1"
output="<genre>\1</genre>" dest="13+">
- <expression repeat="yes" noclean="1"><meta
name="genere" content="([^"]*)" /></expression>
+ <!--IMDB details-->
+ <RegExp input="$$9" output="<url
cache="\1-main.html"
function="GetImdbStuff">http://akas.imdb.com/find?s=tt;q=\1</url>";
dest="13+">
+ <RegExp input="$$13" output="\1%20" dest="9">
+ <expression clear="yes" noclean="1"
encode="1"><originaltitle>([^/"]*)</originaltitle></expression>
+ </RegExp>
+ <RegExp input="$$13" output="(\1)" dest="9+">
+
<expression><year>([^/"]*)</year></expression>
+ </RegExp>
+ <expression />
</RegExp>
<!--Tagline-->
<RegExp input="$$1"
output="<tagline>\1</tagline>" dest="13+">
@@ -76,194 +72,117 @@
<RegExp input="$$1"
output="<plot>\1</plot>" dest="13+">
<expression
noclean="1"><h2>Trama</h2>[\n]*[\s]*<p[^>]*>([^<]+)</p></expression>
</RegExp>
- <!--Italian rating-->
- <RegExp conditional="!IMDb" input="$$1"
output="<rating>\1</rating>" dest="13+">
-
<expression>id="staff-vote">[\n]*[\s]*<span><a
href="/film/[^/]*/opinioni/">[\n]*[\s]*([^<
]*)[\n]*[\s]*</a></span></expression>
- </RegExp>
<!--Poster-->
<RegExp input="$$1"
output="<thumb>\1.jpg</thumb>" dest="13+">
<expression><div
class="poster">[^_]*<img src="([^_]*)_medium.jpg</expression>
</RegExp>
- <!--Posters-->
- <RegExp conditional="AltPosters" input="$$1"
output="<url cache="\1-foto.html"
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/"
function="GetPosters">http://www.movieplayer.it/film/\1/foto/</url>";
dest="13+">
- <expression><li><a
href="/film/([^/]*)/foto/">Foto</a></expression>
- </RegExp>
<!--Trailer-->
<RegExp input="$$1"
output="<trailer>\1</trailer>" dest="13+">
<expression>file: "([^"]+)"</expression>
</RegExp>
- <!-- Movieplayer Cast -->
- <!--Full Cast-->
- <RegExp conditional="!IMDb" input="$$7"
output="\1" dest="13+">
- <RegExp conditional="FullCast" input="$$1"
output="<url cache="\1-cast.html"
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/"
function="GetMovieCast">http://www.movieplayer.it/film/\1/cast/</url>";
dest="7">
- <expression><li><a
href="/film/([^/]*)/cast/">Cast</a></expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- <!--Cast-->
- <RegExp conditional="!IMDb" input="$$7"
output="\1" dest="13+">
- <RegExp conditional="!FullCast" input="$$9"
output="<actor><name>\1</name><role>\3</role><thumb>\2.jpg</thumb></actor>"
dest="7">
- <RegExp input="$$1" output="\1"
dest="9">
- <expression repeat="yes"
noclean="1"> <meta name="cast" content="([^"]*)"</expression>
- </RegExp>
- <expression repeat="yes"
noclean="1">([^,]*),</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- <!--Studio-->
- <RegExp conditional="!IMDb" input="$$1"
output="<studio>\1</studio>" dest="13+">
- <expression
noclean="1"><strong>Distribuzione:</strong>[\n][\s]*<a
href="[^\"]*" title="[^\"]*">([^<]*)</a></expression>
- </RegExp>
- <!--MPAA, studio, ratings and cast from IMDB-->
- <RegExp conditional="IMDb" input="$$9" output="<url
cache="\1-main.html"
function="GetImdbStuff">http://akas.imdb.com/find?s=tt;q=\1</url>";
dest="13+">
- <RegExp input="$$1" output="\1%20" dest="9+">
- <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
- </RegExp>
- <RegExp input="$$1" output="(\1)" dest="9+">
- <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
- </RegExp>
- <expression />
- </RegExp>
- <!--Poster from TMDB-->
- <RegExp conditional="posterTMDB" input="$$9"
output="<url cache="\1-main.html"
function="ChainTMDBThumbs">http://akas.imdb.com/find?s=tt;q=\1</url>";
dest="13+">
- <RegExp input="$$1" output="\1%20" dest="9+">
- <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
- </RegExp>
- <RegExp input="$$1" output="(\1)" dest="9+">
- <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
- </RegExp>
- <expression />
- </RegExp>
- <!--Fanart from TMDB-->
- <RegExp conditional="FanartTMDB" input="$$9"
output="<url cache="\1-main.html"
function="CustomTMDBFanartById">http://akas.imdb.com/find?s=tt;q=\1</url>";
dest="13+">
- <RegExp input="$$1" output="\1%20" dest="9+">
- <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
- </RegExp>
- <RegExp input="$$1" output="(\1)" dest="9+">
- <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
- </RegExp>
- <expression />
+ <!--Posters-->
+ <RegExp conditional="AltPosters" input="$$1"
output="<url cache="\1-foto.html"
spoof="http://www.movieplayer.it/adv/interstitial/2.html?next=/film/\1/"
function="GetMPPosters">http://www.movieplayer.it/film/\1/foto/</url>";
dest="13+">
+ <expression><li><a
href="/film/([^/]*)/foto/">Foto</a></expression>
</RegExp>
<!--Fanart from Movieplayer-->
- <RegExp conditional="Fan" input="$$1" output="<url
cache="\1-foto.html"
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/"
function="FanartGrabber">http://www.movieplayer.it/film/\1/foto/</url>";
dest="13+">
- <expression><li><a
href="/film/([^/]*)/foto/">Foto</a></expression>
- </RegExp>
- <RegExp conditional="!Fan" input="$$1" output="<url
function="FanartGrabber">$$3</url>" dest="13+">
- <expression noclean="1" />
- </RegExp>
- <RegExp input="$$1" output="<url
function="FanartCollector">$$3</url>" dest="13+">
- <expression noclean="1" />
+ <RegExp conditional="Fan" input="$$1" output="<url
cache="\1-foto.html"
spoof="http://www.movieplayer.it/adv/interstitial/2.html?next=/film/\1/"
function="GetMPFanart">http://www.movieplayer.it/film/\1/foto/</url>";
dest="13+">
+ <expression><li><a
href="/film/([^/]*)/foto/">Foto</a></expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetDetails>
- <!-- FUNCTIONS -->
- <GetPosters dest="13">
- <RegExp input="$$2" output="<details>\1</details>"
dest="13+">
- <RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><h3
class="general_border">Manifesti e poster</h3>(.*?)<div
class="column"></expression>
- </RegExp>
- <RegExp input="$$6"
output="<thumb>http://images.movieplayer.it/\1.jpg</thumb>";
dest="2">
- <expression repeat="yes" noclean="1"><img
src="http://images.movieplayer.it/([^_]*)_thumb.jpg"
alt="</expression>
- </RegExp>
- <expression noclean="1"/>
- </RegExp>
- </GetPosters>
- <GetMovieCast dest="13" clearbuffers="no">
+ <!-- GetPosters from MP -->
+ <GetMPPosters dest="13">
<RegExp input="$$2" output="<details>\1</details>"
dest="13+">
<RegExp input="$$1" output="\1" dest="6">
- <expression noclean="1"><h3
class="general_border"><a
name="recitazione"></a>RECITAZIONE</h3>(.*?)</ul></expression>
+ <expression noclean="1"><h3
class="general_border">Manifesti e poster</h3>(.*?)<div
class="column"></expression>
</RegExp>
- <RegExp input="$$6"
output="<actor><thumb>\1.jpg</thumb><name>\2</name><role>\3</role></actor>"
dest="2">
- <expression repeat="yes" noclean="1"><img
height="[0-9]+"
src="([^_]+)_cropped.jpg"[\s]+alt="([^"]+)"
/>[^\(]*\(([^\)]*)\)</expression>
+ <RegExp input="$$6" output="<thumb
preview="http://images.movieplayer.it/\1_thumb.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="2">
+ <expression repeat="yes" noclean="1"><img
src="http://images.movieplayer.it/([^_]*)_thumb.jpg" alt="</expression>
</RegExp>
- <expression noclean="1"/>
+ <expression noclean="1" />
</RegExp>
- </GetMovieCast>
- <GetImdbStuff dest="5">
- <RegExp input="$$6" output="<details>\1</details>"
dest="5">
- <!--Cast-->
- <RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1"><table
class="cast_list">(.*?)</table></expression>
+ </GetMPPosters>
+ <!-- GetFanart from MP -->
+ <GetMPFanart dest="8">
+ <RegExp input="$$2"
output="<details><fanart>\1</fanart></details>"
dest="8+">
+ <!--Fanart in foto page-->
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression noclean="1"><h3
class="general_border">Foto di scena</h3>(.*?)<h3
class="general_border">Manifesti e poster</h3></expression>
</RegExp>
- <RegExp input="$$8"
output="<actor><thumb>\2_SX$INFO[imdbscale]_SY$INFO[imdbscale]_\3</thumb><name>\1</name><role>\5</role></actor>"
dest="7">
- <expression repeat="yes" clear="yes" trim="3,4"
noclean="1,2"><noscript><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:([^"]*\.)[^"]*(\.jpg))[^>]*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
+ <RegExp input="$$6" output="<thumb
preview="http://images.movieplayer.it/\1_thumb.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="2">
+ <expression repeat="yes" noclean="1"><img
src="http://images.movieplayer.it/([^_]*)_thumb.jpg" alt="</expression>
</RegExp>
- <RegExp input="$$8"
output="<actor><thumb></thumb><name>\1</name><role>\3</role></actor>"
dest="7+">
- <expression repeat="yes" trim="1,2"
noclean="1,2"><img
\n[^a]*alt="([^"]*)"[^"]*"[^"]*"[^s]*src="(?:[^"]*\.[^"]*\.png)"
class=""
/>*.*?ter">[^>]*>\n\s*(<[^>]*>)?([^<\(]*)?</expression>
+ <expression noclean="1" />
+ </RegExp>
+ </GetMPFanart>
+ <GetImdbStuff dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5+">
+ <!--ID titolo IMDB su buffer 2-->
+ <RegExp input="$$1" output="\1" dest="2">
+ <expression>/title/([t0-9]*)</expression>
</RegExp>
- <RegExp input="$$7"
output="<actor><thumb>\1</thumb>\2</actor>" dest="6+">
- <expression repeat="yes" clear="yes"
noclean="1,2,3"><actor><thumb>(?:(http.*?)|_SX[0-9]+_SY[0-9]+_)?</thumb>(.*?)</actor></expression>
- </RegExp>
- <!--ID titolo IMDB-->
+ <!--ID-->
<RegExp input="$$1" output="<id>\1</id>"
dest="6+">
<expression>/title/([t0-9]*)</expression>
</RegExp>
<!--IMDB MPAA-->
<RegExp input="$$1"
output="<mpaa>\1</mpaa>" dest="6+">
-
<expression>MPAA</a>\)</h4>\n?([^<]*)</expression>
+
<expression>MPAA</a>\)</h4>\n<span
itemprop="contentRating">?([^<]*)</span></expression>
</RegExp>
<!--IMDB rating-->
- <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="6+">
-
<expression>"star-bar-user-rate"><b>([0-9.]+).*?>.*?title="([0-9,]+)\s</expression>
+ <RegExp input="$$2" output="<chain
function="GetIMDBRatingById">$$2</chain>" dest="6+">
+ <expression />
</RegExp>
<!--IMDB studio-->
<RegExp input="$$1"
output="<studio>\1</studio>" dest="6+">
<expression>"/company/[^>]+>([^<]+)</a></expression>
</RegExp>
+ <!--Cast-->
+ <RegExp input="$$2" output="<chain
function="GetIMDBScaledCastById">$$2</chain>" dest="6+">
+ <expression />
+ </RegExp>
<!--IMDB top250-->
<RegExp input="$$1"
output="<top250>\1</top250>" dest="6+">
<expression>Top 250 #([0-9]*)</</expression>
- </RegExp>
- <expression noclean="1" />
- </RegExp>
- </GetImdbStuff>
- <CustomTMDBFanartById dest="4">
- <RegExp input="$$5" output="<details>\1</details>"
dest="4">
- <RegExp input="$$1" output="<url
function="CustomTMDBFanart"
cache="tmdb-images-tt\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/tt\1</url>";
dest="5">
- <expression>/tt([0-9]+)</expression>
</RegExp>
- <RegExp input="$$1" output="<url
function="CustomTMDBFanart"
cache="tmdb-images-\1.xml">http://api.themoviedb.org/2.1/Movie.getImages/en/xml/57983e31fb435df4df77afb854740ea9/\1</url>";
dest="5">
-
<expression><id>([0-9]*)</id></expression>
+ <!--Anno-->
+ <RegExp input="$$1"
output="<year>\2</year>" dest="6+">
+ <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
</RegExp>
- <expression noclean="1" />
- </RegExp>
- </CustomTMDBFanartById>
- <CustomTMDBFanart clearbuffers="no" dest="13">
- <RegExp input="$$2" output="\1" dest="7+">
- <RegExp input="$$1"
output="<thumb>\1</thumb>" dest="3">
- <expression repeat="yes"
noclean="1"><backdrop[^>]*>(.*?)</backdrop></expression>
+ <!--Durata-->
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="6+">
+ <expression
trim="1"><h4[^>]*?>Runtime:</h4>[^0-9]*([0-9]+)</expression>
</RegExp>
- <RegExp input="$$3" output="<thumb
preview="\2">\1\3</thumb>" dest="4">
- <expression repeat="yes"
noclean="1,3"><thumb>(.*?)url="([^"]*)"
size="poster"(.*?)</thumb></expression>
+ <!--Country-->
+ <RegExp input="$$1"
output="<country>\1</country>" dest="6+">
+ <expression repeat="yes"><a
href="/country/[^>]+>([^<]+)</expression>
</RegExp>
- <RegExp input="$$4"
output="<thumb\1>\2</thumb>" dest="2">
- <expression repeat="yes"
noclean="1"><thumb([^>]*)>.*?url="([^"]*)"
size="original".*?</thumb></expression>
+ <!--Regia-->
+ <RegExp input="$$2" output="<chain
function="GetIMDBDirectorsById">$$2</chain>" dest="6+">
+ <expression />
+ </RegExp>
+ <!--Genere-->
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="6+">
+ <expression repeat="yes"><a
href="/genre/([^/"]*)</expression>
+ </RegExp>
+ <!--Sceneggiatura-->
+ <RegExp input="$$2" output="<chain
function="GetIMDBWritersById">$$2</chain>" dest="6+">
+ <expression />
+ </RegExp>
+ <!--IMDB Thumbs-->
+ <RegExp input="$$2" output="<chain
function="GetIMDBThumbsById">$$2</chain>" dest="6+">
+ <expression />
+ </RegExp>
+ <!--Poster from TMDB-->
+ <RegExp conditional="posterTMDB" input="$$2"
output="<chain
function="GetTMDBThumbsByIdChain">$$2</chain>" dest="6+">
+ <expression />
+ </RegExp>
+ <!--Fanart from TMDB-->
+ <RegExp conditional="FanartTMDB" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="6+">
+ <expression />
</RegExp>
<expression noclean="1" />
</RegExp>
- </CustomTMDBFanart>
- <FanartGrabber dest="13" clearbuffers="no">
- <!--in main page-->
- <RegExp conditional="!Fan" input="$$1" output="\1" dest="6">
- <expression noclean="1"><h2>Le Immagini
<span>(.*?)</div></expression>
- </RegExp>
- <!--in foto page-->
- <RegExp conditional="Fan" input="$$1" output="\1" dest="6">
- <expression noclean="1"><h3
class="general_border">Foto di scena</h3>(.*?)<h3
class="general_border">Manifesti e poster</h3></expression>
- </RegExp>
- <RegExp input="$$6" output="<thumb
preview="http://images.movieplayer.it/\1_thumb.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="7+">
- <expression repeat="yes" noclean="1"><img
src="http://images.movieplayer.it/([^_]+)_thumb.jpg"
alt="</expression>
- </RegExp>
- </FanartGrabber>
- <FanartCollector clearbuffers="no" dest="13">
- <RegExp input="$$7"
output="<details><fanart>\1</fanart></details>"
dest="13">
- <expression noclean="1" />
- </RegExp>
- </FanartCollector>
- <ChainTMDBThumbs clearbuffers="no" dest="13">
- <RegExp input="$$1" output="<details><chain
cache="tmdb-images-thumb\1.xml"
function="GetTMDBThumbsByIdChain">\1</chain></details>"
dest="13">
- <expression>/title/([t0-9]*)</expression>
- </RegExp>
- </ChainTMDBThumbs>
+ </GetImdbStuff>
</scraper>
\ No newline at end of file
diff --git a/metadata.movieplayer.it/resources/language/English/strings.xml
b/metadata.movieplayer.it/resources/language/English/strings.xml
index 0c19266..b379a7a 100644
--- a/metadata.movieplayer.it/resources/language/English/strings.xml
+++ b/metadata.movieplayer.it/resources/language/English/strings.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
- <string id="30000">Search using Google</string>
- <string id="30001">Get MPAA, studio, rating and cast from IMDb</string>
- <string id="30002">Full cast informations from movieplayer.it
(slow)</string>
<string id="30003">Get all Posters from Movieplayer.it</string>
<string id="30004">Get Posters from TMDB too (in English)</string>
<string id="30005">Get Fanarts from TMDB.com (HD)</string>
diff --git a/metadata.movieplayer.it/resources/language/Italian/strings.xml
b/metadata.movieplayer.it/resources/language/Italian/strings.xml
index 33756f6..c3d13a7 100644
--- a/metadata.movieplayer.it/resources/language/Italian/strings.xml
+++ b/metadata.movieplayer.it/resources/language/Italian/strings.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<strings>
- <string id="30000">Usa Google per la ricerca (più veloce ma meno
preciso)</string>
- <string id="30001">Scarica MPAA, studio, rating ed il cast da IMDb</string>
- <string id="30002">Scarica tutto il cast da Movieplayer.it (lento)</string>
<string id="30003">Scarica tutti i Poster di Movieplayer.it</string>
<string id="30004">Scarica i Poster anche da TMDB (in Inglese)</string>
<string id="30005">Scarica gli sfondi Fanart anche da TMDB (HD)</string>
diff --git a/metadata.movieplayer.it/resources/settings.xml
b/metadata.movieplayer.it/resources/settings.xml
index 47344e3..88e9aa2 100644
--- a/metadata.movieplayer.it/resources/settings.xml
+++ b/metadata.movieplayer.it/resources/settings.xml
@@ -1,15 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
- <setting label="30008" type="bool" id="Google" default="true"/>
+ <setting label="30008" type="bool" id="Bing" default="false"/>
<setting label="30007" type="bool" id="Year" default="false"
enable="!eq(-1,false)"/>
<setting label="30009" type="labelenum" values="10|20|35|50" id="count"
default="10" enable="!eq(-2,false)"/>
<setting type="sep"/>
- <setting label="30001" type="bool" id="IMDb" default="false"/>
- <setting label="30002" type="bool" id="FullCast" default="false"
enable="!eq(-1,true)"/>
- <setting type="sep"/>
- <setting label="30003" type="bool" id="AltPosters" default="false"/>
- <setting label="30006" type="bool" id="Fan" default="false"/>
+ <setting label="30003" type="bool" id="AltPosters" default="true"/>
+ <setting label="30006" type="bool" id="Fan" default="true"/>
<setting type="sep"/>
- <setting label="30004" type="bool" id="posterTMDB" default="false"/>
- <setting label="30005" type="bool" id="FanartTMDB" default="false"/>
+ <setting label="30004" type="bool" id="posterTMDB" default="true"/>
+ <setting label="30005" type="bool" id="FanartTMDB" default="true"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.movieplayer.it/addon.xml | 6 +-
metadata.movieplayer.it/changelog.txt | 4 +
metadata.movieplayer.it/movieplayer.xml | 277 +++++++-------------
.../resources/language/English/strings.xml | 3 -
.../resources/language/Italian/strings.xml | 5 +-
metadata.movieplayer.it/resources/settings.xml | 13 +-
6 files changed, 111 insertions(+), 197 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://images.movieplayer.it/\1.jpg</thumb>"](http://images.movieplayer.it/\1.jpg</thumb>"){kind=link}
![http://images.movieplayer.it/\1_thumb.jpg">http://images.movieplayer.it/\1.jpg</thumb>"](http://images.movieplayer.it/\1_thumb.jpg">http://images.movieplayer.it/\1.jpg</thumb>"){kind=link}