The branch, dharma has been updated
via f8c288cdcd13db3e5946fe60df99d0ccf4d3e150 (commit)
from 88f78b5c9738e416ebd9d263a75366708e38bdbc (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=f8c288cdcd13db3e5946fe60df99d0ccf4d3e150
commit f8c288cdcd13db3e5946fe60df99d0ccf4d3e150
Author: olympia <[email protected]>
Date: Thu Jul 14 19:50:26 2011 +0200
[metadata.movieplayer.it] updated to version 1.2.1
diff --git a/metadata.movieplayer.it/addon.xml
b/metadata.movieplayer.it/addon.xml
index 3833688..b7aa6c9 100644
--- a/metadata.movieplayer.it/addon.xml
+++ b/metadata.movieplayer.it/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.movieplayer.it"
name="MoviePlayer.it"
- version="1.2.0"
+ version="1.2.1"
provider-name="KoTiX">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.movieplayer.it/changelog.txt
b/metadata.movieplayer.it/changelog.txt
index 3474f9d..c8c3e61 100644
--- a/metadata.movieplayer.it/changelog.txt
+++ b/metadata.movieplayer.it/changelog.txt
@@ -1,5 +1,6 @@
Changelog:
+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
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.
diff --git a/metadata.movieplayer.it/movieplayer.xml
b/metadata.movieplayer.it/movieplayer.xml
index 6c2819c..0484795 100644
--- a/metadata.movieplayer.it/movieplayer.xml
+++ b/metadata.movieplayer.it/movieplayer.xml
@@ -1,25 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
-<scraper framework="1.1" date="2011-07-13">
+<scraper framework="1.1" date="2011-07-14">
<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="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>
+ <CreateSearchUrl dest="3">
+ <RegExp conditional="!Google" input="$$1"
output="<url>http://www.movieplayer.it/ricerca/?t=film&q=\1</url>"
dest="3">
+ <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>
<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">
@@ -102,7 +98,7 @@
<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" />
+ <expression noclean="1" />
</RegExp>
<!--Cast-->
<RegExp conditional="!IMDb" input="$$7"
output="\1" dest="13+">
@@ -112,7 +108,7 @@
</RegExp>
<expression repeat="yes"
noclean="1">([^,]*),</expression>
</RegExp>
-
<expression noclean="1" />
+ <expression noclean="1" />
</RegExp>
<!--Studio-->
<RegExp conditional="!IMDb" input="$$1"
output="<studio>\1</studio>" dest="13+">
@@ -165,7 +161,7 @@
<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>
+ <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>
@@ -173,24 +169,32 @@
<expression noclean="1"/>
</RegExp>
</GetPosters>
-<GetMovieCast dest="13" clearbuffers="no">
- <RegExp input="$$2" output="<details>\1</details>"
dest="13+">
+ <GetMovieCast dest="13" clearbuffers="no">
+ <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>
</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>
+ <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-main.html"
function="GetImdbStuff">http://www.imdb.com/title/\1</url></details>"
dest="6">
- <expression>/title/([t0-9]*)</expression>
</RegExp>
- </GetImdbLink>
+ </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>
+ </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>
+ <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>
+ </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-->
<RegExp input="$$1" output="<id>\1</id>"
dest="6+">
<expression>/title/([t0-9]*)</expression>
@@ -200,34 +204,17 @@
<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 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>
<!--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>
+
<expression>"/company/[^>]+>([^<]+)</a></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>
+ </RegExp>
<expression noclean="1" />
</RegExp>
</GetImdbStuff>
@@ -262,12 +249,12 @@
<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>
+ <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">
-----------------------------------------------------------------------
Summary of changes:
metadata.movieplayer.it/addon.xml | 2 +-
metadata.movieplayer.it/changelog.txt | 1 +
metadata.movieplayer.it/movieplayer.xml | 101 +++++++++++++-----------------
3 files changed, 46 insertions(+), 58 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