The branch, eden-pre has been updated
via 149a6bd905869ea78c944451390173b188f02815 (commit)
from 98956bdd8c9afc99d4b4755cd41562ae2e08c3cf (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=149a6bd905869ea78c944451390173b188f02815
commit 149a6bd905869ea78c944451390173b188f02815
Author: olympia <[email protected]>
Date: Wed Jul 13 07:27:04 2011 +0200
[metadata.movieplayer.it] updated to version 1.2.0
diff --git a/metadata.movieplayer.it/addon.xml
b/metadata.movieplayer.it/addon.xml
index 0ce781d..3833688 100644
--- a/metadata.movieplayer.it/addon.xml
+++ b/metadata.movieplayer.it/addon.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.movieplayer.it"
name="MoviePlayer.it"
- version="1.1.3"
+ version="1.2.0"
provider-name="KoTiX">
<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"/>
+ <import addon="metadata.common.imdb.com" version="2.1.1"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="it"
diff --git a/metadata.movieplayer.it/changelog.txt
b/metadata.movieplayer.it/changelog.txt
index 131b0e5..3474f9d 100644
--- a/metadata.movieplayer.it/changelog.txt
+++ b/metadata.movieplayer.it/changelog.txt
@@ -1,5 +1,9 @@
Changelog:
+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
+09/07/2011 - Almost completely rewritten: Bing is now the default search
engine, all the infos by default are taken from movieplayer.it the user will
enable the other features.
+Many, many fixes.....
07/03/2011 - Fixed Google search results.
13/02/2011 - Fixed studio's logos retrieving only one studio from imdb.
25/10/2010 - Fixed Trailers (it was deleted by mistake)
diff --git a/metadata.movieplayer.it/movieplayer.xml
b/metadata.movieplayer.it/movieplayer.xml
index ded1baa..6c2819c 100644
--- a/metadata.movieplayer.it/movieplayer.xml
+++ b/metadata.movieplayer.it/movieplayer.xml
@@ -1,155 +1,159 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="11" date="2011-02-13">
-
+<scraper framework="1.1" date="2011-07-13">
<NfoUrl dest="3">
<RegExp input="$$1" output="<url>\1</url>" dest="3">
- <expression noclean="1"
trim="1">(http://www\.movieplayer\.it/film/[0-9]+/[^"]+)</expression>
+ <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="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="Year" input="$$2" output="%20(\1)"
dest="4">
+ <expression clear="yes">(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
- <CreateSearchUrl dest="3">
- <RegExp conditional="!Google" input="$$1"
output="<url>http://www.movieplayer.it/ricerca/?t=film&q=\1</url>";
dest="3">
- <RegExp input="$$2" output="%20(\1)" dest="4">
- <expression clear="yes">(.+)</expression>
+ </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">
+ <expression repeat="yes"><a
href="/film/([^/]*)/">*[\n]*[\s]*<strong>([^/]*)</strong>([^/]*)</expression>
</RegExp>
- <expression noclean="1" />
+ <expression clear="yes" trim="1" noclean="1" />
</RegExp>
- <RegExp conditional="Google" input="$$1"
output="<url>http://www.google.com/cse?cx=010988534213966941752:gzbql2poc0a&amp;ie=UTF-8&amp;q=\1$$4%20site:movieplayer.it&sa=Cerca&amp;hl=it</url>";
dest="3">
- <RegExp input="$$2" output="%20(\1)" dest="4">
- <expression clear="yes">(.+)</expression>
+ <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">
+ <expression
repeat="yes">http://www\.movieplayer\.it/film/([^_]*)_([0-9]+)/[^>]*>([^\(]*)\(([^\)]*)\)</expression>
</RegExp>
- <expression noclean="1" />
- </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>\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">
- <expression repeat="yes"></small>
-[\s]*[\n]*[\s]*<h2>*[\n]*[\s]*<a
href="/film/([^/]*)/([^/]*)/">([^\(]*)([^<]*)</a></expression>
+ <expression clear="yes" trim="1" noclean="1" />
</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">
- <expression
repeat="yes">http://www\.movieplayer\.it/film/([0-9]+)/([^/]*)/[^>]*>([^\(]*)[^\d]*([0-9]*)[^=]*</a></expression>
- </RegExp>
- <expression clear="yes" trim="1" noclean="1"/>
- </RegExp>
-</GetSearchResults>
-
+ </GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$13" output="<details>\1</details>"
dest="3">
- <!--Title-->
+ <!--Title-->
<RegExp input="$$1"
output="<title>\1</title>" dest="13">
- <expression trim="1"
noclean="1"><title>([^/(]*)[^<]*</title></expression>
+ <expression trim="1" noclean="1"><meta
name="title" content="([^/(]*)[^<]*" /></expression>
</RegExp>
- <!--Original Title-->
+ <!--Original Title-->
<RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="13+">
- <expression><strong>Titolo
originale:</strong>[\n][\s]*<a
href="[^>]*>([^<]*)</a></expression>
+ <expression><meta name="titolo_originale"
content="([^/"]*)" /></expression>
</RegExp>
- <!--Year-->
+ <!--Year-->
<RegExp input="$$1"
output="<year>\1</year>" dest="13+">
-
<expression><title>[^\(]*\(([0-9]+)\)</expression>
+ <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)" /></expression>
</RegExp>
- <!--Country Film-->
+ <!--Country Film-->
<RegExp input="$$1"
output="<country>\1</country>" dest="13+">
- <expression repeat="yes"><a
href="/film/archivio/\?nazione=([^"]*)"</expression>
+ <expression repeat="yes"><meta
name="nazione" content="([^"]*)" /></expression>
</RegExp>
- <!--Director-->
+ <!--Director-->
<RegExp input="$$1"
output="<director>\1</director>" dest="13+">
-
<expression><li><strong>Regia:</strong></li>[^=]*="[^\"]*"
title="([^\"]*)"></expression>
+ <expression><meta name="regia"
content="([^\"]*)" /></expression>
</RegExp>
- <!--Credits-->
+ <!--Credits-->
<RegExp input="$$1"
output="<credits>\1</credits>" dest="13+">
- <expression
noclean="1"><li><strong>Sceneggiatura:</strong></li>[^=]*="[^\"]*"
title="([^\"]*)"></expression>
+ <expression noclean="1"><meta
name="sceneggiatura" content="([^\"]*)" /></expression>
</RegExp>
- <!--Runtime-->
+ <!--Runtime-->
<RegExp input="$$1"
output="<runtime>\1min</runtime>" dest="13+">
-
<expression><strong>Durata:</strong>[^\d]*([0-9]+)</expression>
+ <expression>durata di
[^\d]*([0-9]+)</expression>
</RegExp>
- <!--Genre-->
+ <!--Genre-->
<RegExp input="$$1"
output="<genre>\1</genre>" dest="13+">
- <expression repeat="yes" noclean="1"><a
href="/film/archivio/\?genere=([^"]*)" title="Archivio film -
genere</expression>
+ <expression repeat="yes" noclean="1"><meta
name="genere" content="([^"]*)" /></expression>
</RegExp>
+ <!--Tagline-->
<RegExp input="$$1"
output="<tagline>\1</tagline>" dest="13+">
- <expression noclean="1">title="([^"]*)"
class="read_review"><strong>Leggi la
recensione</strong></a></p></expression>
- </RegExp>
- <!--Outline-->
- <RegExp input="$$1"
output="<outline>\1</outline>" dest="13+">
- <expression noclean="1"><h2>Perch&eacute;
vederlo</h2>[^<]*<p>([^<]+)</p></expression>
- </RegExp>
- <!--Plot-->
- <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"[^<]*<span><a
href="/film/[0-9]*/[^/]*/statistiche/">([^<]*)</a></expression>
+ <expression noclean="1"><span
class="subheading">([^"]*)</span> </expression>
</RegExp>
- <!-- Italian votes-->
- <RegExp conditional="!IMDb" input="$$1"
output="<votes>\1</votes>" dest="13+">
- <expression>
id="users-vote"[^<]*<span><a href="/film/[0-9]*/[^/]*/statistiche/"
title="[^"]*">[\s]*([^\n]*)[\n][\s]*</a></expression>
+ <!--Outline-->
+ <RegExp input="$$1"
output="<outline>\1</outline>" dest="13+">
+ <expression noclean="1"><h3>Perché
vederlo:</h3>[^<]*<p>([^<]+)</p></expression>
</RegExp>
- <!--Poster-->
+ <!--Plot-->
+ <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
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/"
function="GetPosters">http://www.movieplayer.it\1manifesti-e-poster/1/</url>";
dest="13+">
- <expression><a href="([^"]*)"
title="[^"]*">Foto &amp; Trailer</a></expression>
+ <!--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-->
+ <!--Trailer-->
<RegExp input="$$1"
output="<trailer>\1</trailer>" dest="13+">
- <expression>file:
"([^"]+)"</expression>
- </RegExp>
- <!--Full Cast-->
- <RegExp conditional="FullCast" input="$$1"
output="<url
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/"
function="GetMovieCast">http://www.movieplayer.it\1#personaggi</url>";
dest="13+">
- <expression><li><a href="([^"]+)"
title="[^"]*">Cast</a></li></expression>
- </RegExp>
- <!--Cast-->
- <RegExp conditional="!FullCast" input="$$9"
output="<actor><name>\1</name><role>\3</role><thumb>\2.jpg</thumb></actor>"
dest="13+">
- <RegExp input="$$1" output="\1" dest="9">
- <expression
noclean="1"><li><strong>Attori:</strong></li>([^#]*)#</expression>
- </RegExp>
- <expression repeat="yes"><a
href="/personaggi/[0-9]*/[^/]*/"
title="([^"]*)">[\s]*<img
src="([^_]+)[^"]+" alt="</expression>
- </RegExp>
- <!--Studio-->
+ <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 and ratings from IMDB-->
- <RegExp conditional="IMDb" input="$$9" output="<url
cache="\1"
function="GetImdbLink">http://www.google.com/search?q=site:imdb.com%20"\1"</url>";
dest="13+">
+ <!--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"><strong>Titolo originale:</strong>[\n][\s]*<a
href="[^>]*>([^<]*)</a></expression>
+ <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
</RegExp>
<RegExp input="$$1" output="(\1)" dest="9+">
-
<expression><title>[^\(]*\(([0-9]+)\)</title></expression>
+ <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
</RegExp>
<expression />
</RegExp>
<!--Poster from TMDB-->
- <RegExp conditional="posterTMDB" input="$$9"
output="<url cache="\1"
function="ChainTMDBThumbs">http://www.google.com/search?q=site:imdb.com%20"\1"</url>";
dest="13+">
+ <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"><strong>Titolo originale:</strong>[\n][\s]*<a
href="[^>]*>([^<]*)</a></expression>
+ <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
</RegExp>
<RegExp input="$$1" output="(\1)" dest="9+">
-
<expression><title>[^\(]*\(([0-9]+)\)</title></expression>
+ <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
</RegExp>
<expression />
</RegExp>
<!--Fanart from TMDB-->
- <RegExp conditional="FanartTMDB" input="$$9"
output="<url cache="\1"
function="CustomTMDBFanartById">http://www.google.com/search?q=site:imdb.com%20"\1"</url>";
dest="13+">
+ <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"><strong>Titolo originale:</strong>[\n][\s]*<a
href="[^>]*>([^<]*)</a></expression>
+ <expression clear="yes" noclean="1"
encode="1"><meta name="titolo_originale" content="([^/"]*)"
/></expression>
</RegExp>
<RegExp input="$$1" output="(\1)" dest="9+">
-
<expression><title>[^\(]*\(([0-9]+)\)</title></expression>
+ <expression><meta name="title"
content="[^\(]*\(([0-9]+)\)</expression>
</RegExp>
<expression />
</RegExp>
<!--Fanart from Movieplayer-->
- <RegExp conditional="Fan" input="$$1" output="<url
spoof="http://www.movieplayer.it/adv/interstitial/1.html?next=/film/\1/\2/"
cache="\2-wall.html"
function="FanartGrabber">http://www.movieplayer.it/film/\1/\2/gallery-e-trailer/</url>";
dest="13+">
- <expression><a
href="/film/([0-9]+)/([^/]*)/gallery-e-trailer/" title="[^>]*>FOTO
&amp; TRAILER</a></expression>
+ <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" />
@@ -158,54 +162,75 @@
</RegExp>
</GetDetails>
<!-- FUNCTIONS -->
- <GetPosters dest="13">
- <RegExp input="$$6" output="<details>\1</details>"
dest="13+">
- <RegExp input="$$1"
output="<thumb>http://images.movieplayer.it/\1.jpg</thumb>";
dest="6+">
- <expression repeat="yes" noclean="1"><a
href="/gallery/[^>]*>[\s]*<img
src="http://images.movieplayer.it/([^_]+)_cropped.jpg" alt="</expression>
- </RegExp>
- <expression noclean="1" />
+ <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>
- </GetPosters>
-
+ <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">
<RegExp input="$$2" output="<details>\1</details>"
dest="13+">
- <RegExp input="$$8"
output="<actor><thumb>\1.jpg</thumb><name>\2</name><role>\3</role></actor>"
dest="2">
- <RegExp input="$$1" output="\1" dest="8">
- <expression noclean="1"><h2><a
name="personaggi"></a>Personaggi:</h2>([^#]*)</expression>
+ <RegExp input="$$1" output="\1" dest="6">
+ <expression noclean="1"><h3
class="general_border"><a
name="recitazione"></a>RECITAZIONE</h3>(.*?)</ul></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>
<expression noclean="1"/>
</RegExp>
</GetMovieCast>
-
<GetImdbLink dest="6">
- <RegExp input="$$1" output="<details><url
cache="\1"
function="GetImdbStuff">http://www.imdb.com/title/\1</url></details>";
dest="6">
+ <RegExp input="$$1" output="<details><url
cache="\1-main.html"
function="GetImdbStuff">http://www.imdb.com/title/\1</url></details>";
dest="6">
<expression>/title/([t0-9]*)</expression>
</RegExp>
</GetImdbLink>
-
<GetImdbStuff dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
- <RegExp input="$$1"
output="<top250>\1</top250>" dest="6+">
- <expression>Top 250
#([0-9]*)</strong></expression>
+ <!--ID titolo IMDB-->
+ <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><a
href="/mpaa">MPAA</a>\)</h4>[\n]*[\s]*Rated ([^\s]*)
for</expression>
- </RegExp>
- <RegExp input="$$1" output="<rating>\1</rating>"
dest="6+">
- <expression><span
class="rating-rating">([0-9.]+)<span>/10</span></expression>
- </RegExp>
- <RegExp input="$$1" output="<studio>\1</studio>"
dest="6+">
-
<expression>"/company/[^/]*/">([^<]*)</a></expression>
- </RegExp>
- <RegExp input="$$1" output="<votes>\1</votes>"
dest="6+">
- <expression>href="ratings"
>([0-9,]+) votes</a></expression>
- </RegExp>
- <expression noclean="1"/>
+
<expression>MPAA</a>\)</h4>\n?([^<]*)</expression>
+ </RegExp>
+ <!--IMDB rating-->
+ <RegExp input="$$1"
output="<rating>\1</rating>" dest="6+">
+ <expression><span class="value"
itemprop="ratingValue">([0-9.]+)</span></expression>
+ </RegExp>
+ <!--IMDB studio-->
+ <RegExp input="$$1"
output="<studio>\1</studio>" dest="6+">
+
<expression>"/company/[^/]*/">([^<]*)</a></expression>
+ </RegExp>
+ <!--IMDB Votes-->
+ <RegExp input="$$1"
output="<votes>\1</votes>" dest="6+">
+ <expression>href="ratings" title="([0-9,]+)
IMDb</expression>
+ </RegExp>
+ <!--Cast-->
+ <RegExp input="$$1" output="\1" dest="9">
+ <expression noclean="1"><table
class="cast_list">(.*?)</table></expression>
+ </RegExp>
+ <RegExp input="$$9"
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>
+ <RegExp input="$$9"
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>
+ </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>
+ <!--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">
@@ -217,7 +242,6 @@
<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">
@@ -232,22 +256,27 @@
<expression noclean="1" />
</RegExp>
</CustomTMDBFanart>
-
- <FanartGrabber clearbuffers="no" dest="13">
- <RegExp input="$$1" output="<thumb
preview="http://images.movieplayer.it/\1_cropped.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="7+">
- <expression repeat="yes" noclean="1"><a
href="/gallery/[^>]+>[\s]*<img
src="http://images.movieplayer.it/([^_]+)_cropped.jpg" alt="</expression>
+ <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
function="GetTMDBThumbsByIdChain">tt\1</chain></details>"
dest="13">
- <expression>/tt([0-9]+)</expression>
+ <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>
-</scraper>
+</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 179f917..0c19266 100644
--- a/metadata.movieplayer.it/resources/language/English/strings.xml
+++ b/metadata.movieplayer.it/resources/language/English/strings.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<strings>
<string id="30000">Search using Google</string>
- <string id="30001">Get MPAA, studio and rating from IMDb</string>
- <string id="30002">Full cast informations (slow)</string>
- <string id="30003">Get alternative Posters from Movieplayer.it</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>
<string id="30006">Get Fanarts from Movieplayer.it (SD)</string>
+ <string id="30007">Include the movie's "Year" in the search</string>
+ <string id="30008">Search using Bing</string>
+ <string id="30009">Results per page: </string>
</strings>
diff --git a/metadata.movieplayer.it/resources/language/Italian/strings.xml
b/metadata.movieplayer.it/resources/language/Italian/strings.xml
index 197176e..33756f6 100644
--- a/metadata.movieplayer.it/resources/language/Italian/strings.xml
+++ b/metadata.movieplayer.it/resources/language/Italian/strings.xml
@@ -1,10 +1,13 @@
<?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 e rating da IMDb</string>
- <string id="30002">Scarica le informazioni di tutto il cast
(lento)</string>
- <string id="30003">Scarica anche i poster alternativi di
Movieplayer.it</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 da TMDB.com (HD)</string>
- <string id="30006">Scarica gli sfondi Fanart da Movieplayer.it
(SD)</string>
+ <string id="30005">Scarica gli sfondi Fanart anche da TMDB (HD)</string>
+ <string id="30006">Scarica tutti gli sfondi Fanart di Movieplayer.it
(SD)</string>
+ <string id="30007">Includi l'anno nella ricerca</string>
+ <string id="30008">Usa Bing per la ricerca (più veloce ma meno
preciso)</string>
+ <string id="30009">Risultati per pagina: </string>
</strings>
diff --git a/metadata.movieplayer.it/resources/settings.xml
b/metadata.movieplayer.it/resources/settings.xml
index 3bdc7dd..47344e3 100644
--- a/metadata.movieplayer.it/resources/settings.xml
+++ b/metadata.movieplayer.it/resources/settings.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
- <setting label="30000" type="bool" id="Google" default="true"/>
+ <setting label="30008" type="bool" id="Google" default="true"/>
+ <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"/>
+ <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="30004" type="bool" id="posterTMDB" default="false"/>
+ <setting label="30006" type="bool" id="Fan" default="false"/>
<setting type="sep"/>
- <setting label="30005" type="bool" id="FanartTMDB" default="true"/>
- <setting label="30006" type="bool" id="Fan" default="true"/>
+ <setting label="30004" type="bool" id="posterTMDB" default="false"/>
+ <setting label="30005" type="bool" id="FanartTMDB" default="false"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.movieplayer.it/addon.xml | 5 +-
metadata.movieplayer.it/changelog.txt | 4 +
metadata.movieplayer.it/movieplayer.xml | 291 +++++++++++---------
.../resources/language/English/strings.xml | 9 +-
.../resources/language/Italian/strings.xml | 13 +-
metadata.movieplayer.it/resources/settings.xml | 14 +-
6 files changed, 190 insertions(+), 146 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
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_cropped.jpg">http://images.movieplayer.it/\1.jpg</thumb>"](http://images.movieplayer.it/\1_cropped.jpg">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}