The branch, eden-pre has been updated
via e64eac7174b7560e27ce8c77a87a162769092998 (commit)
from 5f6dd09b5fa93701805fa77e4325f58168a0b280 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=e64eac7174b7560e27ce8c77a87a162769092998
commit e64eac7174b7560e27ce8c77a87a162769092998
Author: olympia <[email protected]>
Date: Wed Sep 7 20:52:55 2011 +0200
[metadata.movieplayer.it] updated to version 1.3.1
diff --git a/metadata.movieplayer.it/addon.xml
b/metadata.movieplayer.it/addon.xml
index 5866dbf..8abeff3 100644
--- a/metadata.movieplayer.it/addon.xml
+++ b/metadata.movieplayer.it/addon.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.movieplayer.it"
name="MoviePlayer.it"
- version="1.3"
+ version="1.3.1"
provider-name="KoTiX and Gulp">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
- <import addon="metadata.common.themoviedb.org" version="1.0.7"/>
- <import addon="metadata.common.imdb.com" version="2.1.1"/>
+ <import addon="metadata.common.themoviedb.org" version="1.1.0"/>
+ <import addon="metadata.common.imdb.com" version="2.1.3"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="it"
diff --git a/metadata.movieplayer.it/changelog.txt
b/metadata.movieplayer.it/changelog.txt
index ace6131..f88f272 100644
--- a/metadata.movieplayer.it/changelog.txt
+++ b/metadata.movieplayer.it/changelog.txt
@@ -1,5 +1,5 @@
Changelog:
-
+05/09/2011 - Tuning of year & originaltitle regexp
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.
diff --git a/metadata.movieplayer.it/movieplayer.xml
b/metadata.movieplayer.it/movieplayer.xml
index 830bccb..ac0be1d 100644
--- a/metadata.movieplayer.it/movieplayer.xml
+++ b/metadata.movieplayer.it/movieplayer.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><scraper framework="11"
date="2011-08-12" name="MoviePlayer.it" content="movies" language="en">
+<?xml version="1.0" encoding="utf-8"?><scraper framework="11"
date="2011-09-06" 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>
@@ -20,13 +20,13 @@
</CreateSearchUrl>
<GetSearchResults dest="8">
<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">
+ <RegExp input="$$1"
output="<entity><title>\2 \3</title><url
cache="MoviePlayerPage.html"
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="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">
+ <RegExp input="$$1"
output="<entity><title>\3 (\4)</title><url
cache="MoviePlayerPage.html"
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" />
@@ -39,19 +39,27 @@
<expression trim="1" noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
</RegExp>
<!--Year-->
- <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>
- <!--Try OriginalTitle (put Title just in case MP site
hasn't original title)-->
- <RegExp input="$$1"
output="<originaltitle>\1</originaltitle>" dest="13+">
+ <RegExp input="$$1"
output="<year>\1</year>" dest="13+">
+ <expression trim="1" noclean="1"><span
class="year">.*?anno=([0-9]*)"></expression>
+ </RegExp>
+ <!--Original title-->
+ <RegExp input="$$4"
output="<originaltitle>\1</originaltitle>" dest="13+">
+ <!--Try OriginalTitle (putTitle just in case MP
site hasn't original title) & (get before)-->
+ <RegExp input="$$1" output="\1" dest="4">
+ <expression noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
+ </RegExp>
<!--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 input="$$1" output="\2" dest="3">
+ <expression cs="true" clear="yes"
noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong>
\(([^/"]*)\) </expression>
</RegExp>
- <expression trim="1" noclean="1"><span
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
+ <!--Test if exist a real original film title if
exist overwrite normal title-->
+ <RegExp input="$$3" output="\1" dest="4">
+ <expression>(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
</RegExp>
<!--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="$$9" output="<url
cache="IMDB_Search.html"
function="IMDBChains">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>
@@ -81,11 +89,11 @@
<expression>file: "([^"]+)"</expression>
</RegExp>
<!--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+">
+ <RegExp conditional="AltPosters" input="$$1"
output="<url cache="\MoviePlayerFoto.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/2.html?next=/film/\1/"
function="GetMPFanart">http://www.movieplayer.it/film/\1/foto/</url>";
dest="13+">
+ <RegExp conditional="Fan" input="$$1" output="<url
cache="\MoviePlayerFoto.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" />
@@ -116,7 +124,7 @@
<expression noclean="1" />
</RegExp>
</GetMPFanart>
- <GetImdbStuff dest="5">
+ <IMDBChains dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5+">
<!--ID titolo IMDB su buffer 2-->
<RegExp input="$$1" output="\1" dest="2">
@@ -126,46 +134,18 @@
<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<span
itemprop="contentRating">?([^<]*)</span></expression>
- </RegExp>
<!--IMDB rating-->
<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>
- <!--Anno-->
- <RegExp input="$$1"
output="<year>\2</year>" dest="6+">
- <expression><meta name="title"
content="([^"]*?) \([^\(]*?([0-9]{4})\)</expression>
- </RegExp>
- <!--Durata-->
- <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="6+">
- <expression
trim="1"><h4[^>]*?>Runtime:</h4>[^0-9]*([0-9]+)</expression>
- </RegExp>
- <!--Country-->
- <RegExp input="$$1"
output="<country>\1</country>" dest="6+">
- <expression repeat="yes"><a
href="/country/[^>]+>([^<]+)</expression>
- </RegExp>
<!--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 />
@@ -182,7 +162,39 @@
<RegExp conditional="FanartTMDB" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">$$2</chain>" dest="6+">
<expression />
</RegExp>
+ <RegExp input="$$2" output="<url
cache="$$2-main.html"
function="IMDBLocal">www.imdb.com/title/$$2</url>" dest="6+">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </IMDBChains>
+ <IMDBLocal dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5+">
+ <!--IMDB MPAA-->
+ <RegExp input="$$1"
output="<mpaa>\1</mpaa>" dest="6+">
+
<expression>MPAA</a>\)</h4>\n?<span
itemprop="contentRating">([^<]*)</expression>
+ </RegExp>
+ <!--IMDB studio-->
+ <RegExp input="$$1"
output="<studio>\1</studio>" dest="6+">
+
<expression>"/company/[^>]+>([^<]+)</a></expression>
+ </RegExp>
+ <!--IMDB top250-->
+ <RegExp input="$$1"
output="<top250>\1</top250>" dest="6+">
+ <expression>Top 250 #([0-9]*)</</expression>
+ </RegExp>
+ <!--Durata-->
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="6+">
+ <expression
trim="1"><h4[^>]*?>Runtime:</h4>[^0-9]*([0-9]+)</expression>
+ </RegExp>
+ <!--Country-->
+ <RegExp input="$$1"
output="<country>\1</country>" dest="6+">
+ <expression repeat="yes"><a
href="/country/[^>]+>([^<]+)</expression>
+ </RegExp>
+ <!--Genere-->
+ <RegExp input="$$1"
output="<genre>\1</genre>" dest="6+">
+ <expression repeat="yes"><a
href="/genre/([^"]+)</expression>
+ </RegExp>
<expression noclean="1" />
</RegExp>
- </GetImdbStuff>
+ </IMDBLocal>
</scraper>
\ No newline at end of file
diff --git a/metadata.movieplayer.it/resources/settings.xml
b/metadata.movieplayer.it/resources/settings.xml
index 88e9aa2..90e78b5 100644
--- a/metadata.movieplayer.it/resources/settings.xml
+++ b/metadata.movieplayer.it/resources/settings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<settings>
- <setting label="30008" type="bool" id="Bing" default="false"/>
- <setting label="30007" type="bool" id="Year" default="false"
enable="!eq(-1,false)"/>
+ <setting label="30008" type="bool" id="Bing" default="true"/>
+ <setting label="30007" type="bool" id="Year" default="true"
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="30003" type="bool" id="AltPosters" default="true"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.movieplayer.it/addon.xml | 6 +-
metadata.movieplayer.it/changelog.txt | 2 +-
metadata.movieplayer.it/movieplayer.xml | 100 +++++++++++++----------
metadata.movieplayer.it/resources/settings.xml | 4 +-
4 files changed, 62 insertions(+), 50 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Using storage to extend the benefits of virtualization and iSCSI
Virtualization increases hardware utilization and delivers a new level of
agility. Learn what those decisions are and how to modernize your storage
and backup environments for virtualization.
http://www.accelacomm.com/jaw/sfnl/114/51434361/
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
