The branch, frodo has been updated
via 8efaa1bcd64c58e111aa5172c6816404774e82d1 (commit)
from 9d65c3b82e78dfad752bdeaee7d561571b86ada8 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=8efaa1bcd64c58e111aa5172c6816404774e82d1
commit 8efaa1bcd64c58e111aa5172c6816404774e82d1
Author: olympia <[email protected]>
Date: Mon Sep 29 10:57:43 2014 +0200
[metadata.movieplayer.it] updated to version 1.5.0
diff --git a/metadata.movieplayer.it/addon.xml
b/metadata.movieplayer.it/addon.xml
index 26c8f49..10d074d 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.4.8"
- provider-name="KoTiX|Gulp">
+ version="1.5.0"
+ provider-name="KoTiX|Gulp|Maxgalbu">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
- <import addon="metadata.common.themoviedb.org" version="2.9.3"/>
- <import addon="metadata.common.imdb.com" version="2.7.6"/>
+ <import addon="metadata.common.themoviedb.org" version="2.12.1"/>
+ <import addon="metadata.common.imdb.com" version="2.7.8"/>
</requires>
<extension point="xbmc.metadata.scraper.movies"
language="it"
diff --git a/metadata.movieplayer.it/changelog.txt
b/metadata.movieplayer.it/changelog.txt
index 78e5f46..c650b36 100644
--- a/metadata.movieplayer.it/changelog.txt
+++ b/metadata.movieplayer.it/changelog.txt
@@ -1,4 +1,5 @@
Changelog:
+16/09/2013 - Fixed for new movieplayer site layout, thanks to maxgalbusera
25/03/2014 - Fixed trailer scraping
23/10/2013 - Fixed IMDB ID
29/05/2013 - Search fixed and tuned Year, for non corresponding year between
MP & IMDB
diff --git a/metadata.movieplayer.it/movieplayer.xml
b/metadata.movieplayer.it/movieplayer.xml
index 971a745..e39d3cb 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="2013-02-18" name="MoviePlayer.it" content="movies" language="en">
+<?xml version="1.0" encoding="UTF-8"?><scraper framework="11"
date="2014-09-16" 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>
@@ -7,8 +7,8 @@
<CreateSearchUrl 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 clear="yes">(.+)</expression>
+ </RegExp-->
<expression noclean="1" />
</RegExp>
<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">
@@ -20,14 +20,14 @@
</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
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 input="$$1"
output="<entity><title>\2 \3</title><url
cache="MoviePlayerPage.html"
spoof="http://www.movieplayer.it/film/\1/"</url><id>\1</id></entity>";
dest="7">
+ <expression repeat="yes"><a
href="/film/([^/]*)/">([^<]*)</a></h2>.+?<span
class="search-results-result-date">.+?([0-9]+)</span></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
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]+)/"[^>]+>(.+?(?=
- film)) - film ([0-9]+)</expression>
+ <RegExp input="$$1"
output="<entity><title>\3 (\4)</title><url
cache="MoviePlayerPage.html"
spoof="http://www.movieplayer.it/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]+)/"[^>]+>(.+?)\s*-\s*film\s*([0-9]+)</expression>
</RegExp>
<expression clear="yes" trim="1" noclean="1" />
</RegExp>
@@ -36,26 +36,43 @@
<RegExp input="$$13" output="<details>\1</details>"
dest="3">
<!--Title-->
<RegExp input="$$1"
output="<title>\1</title>" dest="13">
- <expression trim="1" noclean="1"><p
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
+ <!-- HTML da matchare:
+ <h1 itemprop="name">nomefilm</h1>
+ -->
+ <expression trim="1" noclean="1"><h1
itemprop="name">([^<]+)</h1></expression>
</RegExp>
+
<!--Year-->
<RegExp input="$$1"
output="<year>\1</year>" dest="13+">
- <expression trim="1" noclean="1"><h1
itemprop="name">.*?anno=([0-9]*)"></expression>
+ <!-- HTML da matchare:
+ <h1 itemprop="name">nomefilm</h1>
+ <p>anno, genere</p>
+ -->
+ <expression trim="1" noclean="1"><h1
itemprop="name">[^<]+</h1>\s*<p>([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)-->
+
+ <!--Uso il titolo in italiano-->
<RegExp input="$$1" output="\1" dest="4">
- <expression noclean="1"><p
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong></expression>
+ <expression trim="1" noclean="1"><h1
itemprop="name">([^<]+)</h1></expression>
</RegExp>
- <!--Try OriginalTitle (if MP site has original
title, take it)-->
- <RegExp input="$$1" output="\2" dest="3">
- <expression cs="true" clear="yes"
noclean="1"><p
itemprop="description"><strong>(?:&#x22;)?([^"]*?)(?:&#x22;)?</strong>
\(([^/"]*)\)</expression>
+
+ <!--Provo ad ottenere il titolo originale da
MoviePlayer-->
+ <RegExp input="$$1" output="\1" dest="3">
+ <!-- HTML da matchare:
+ <span
class="film-extra-info-label">Titolo originale:</span>
+ <span
class="film-extra-info-value">nomefilmoriginale</span>
+ -->
+ <expression cs="true" clear="yes"
noclean="1"><span class="film-extra-info-label">Titolo
originale:</span>\s*<span
class="film-extra-info-value">([^<]+)</span></expression>
</RegExp>
- <!--Test if exist a real original film title if
exist overwrite normal title-->
+
+ <!--Se esiste il titolo originale, sovrascrivo
il titolo italiano-->
<RegExp input="$$3" output="\1" dest="4">
<expression>(.+)</expression>
- </RegExp>
+ </RegExp>
+
<!-- IMDB doesn't like II or III or IV in the
title, so replace them with numbers -->
<RegExp input="$$4" output="\1 2" dest="4">
<expression>^(.+) II$</expression>
@@ -68,6 +85,7 @@
</RegExp>
<expression noclean="1" />
</RegExp>
+
<!--IMDB details-->
<RegExp input="$$9" output="<url
cache="IMDB_Search.html"
function="IMDBChains">http://akas.imdb.com/find?q=\1&s=tt</url>";
dest="13+">
<RegExp input="$$13" output="\1" dest="9">
@@ -78,66 +96,105 @@
</RegExp>
<expression />
</RegExp>
+
<!--Durata film-->
- <RegExp input="$$1"
output="<runtime>\2</runtime>" dest="13+">
- <expression trim="1" noclean="1">
datetime="([^"]*)">([0-9]*) min</time></expression>
- </RegExp>
- <!--Tagline-->
+ <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="13+">
+ <!-- HTML da matchare:
+ <time itemprop="duration"
datetime="PT102M">102 minuti</time>
+ -->
+ <expression trim="1" noclean="1"><time
itemprop="duration"[^>]+>([0-9]*) minuti</time></expression>
+ </RegExp>
+
+ <!--Tagline (non più presente in movieplayer?)
<RegExp input="$$1"
output="<tagline>\1</tagline>" dest="13+">
<expression noclean="1"><span
class="subheading">([^"]*)</span> </expression>
- </RegExp>
- <!--Outline-->
+ </RegExp>-->
+
+ <!--Outline (non più presente in movieplayer?)
<RegExp input="$$1"
output="<outline>\1</outline>" dest="13+">
<expression noclean="1"><h3>Perché
vederlo:</h3>[^<]*<p>([^<]+)</p></expression>
- </RegExp>
+ </RegExp>-->
+
<!--Plot-->
<RegExp input="$$1"
output="<plot>\1</plot>" dest="13+">
- <expression
noclean="1"><h2>Trama</h2>[\n]*[\s]*<p[^>]*>([^<]+)</p></expression>
- </RegExp>
+ <!-- HTML da matchare:
+ <p itemprop="description"
class="expandable-text">
+ descrizione
+ <span class="read-more">... <a
href="#">leggi tutto</a></span>
+ <span class="details"
style="display: none;">
+ Dio, Serse; e
Artemisia, la vendicativa comandante della Marina persiana.
+ <span
class="re-collapse"> <a href="#"></a></span>
+ </span>
+ </p>
+ -->
+ <expression noclean="1"><p
itemprop="description"[^>]+>(.+?)</p></expression>
+ </RegExp>
+
<!--Poster-->
- <RegExp input="$$1"
output="<thumb>\1.jpg</thumb>" dest="13+">
- <expression><div
class="poster">[^_]*src="([^_]*)_medium.jpg</expression>
- </RegExp>
+ <RegExp input="$$1"
output="<thumb>\1_jpg_600x800_crop_q85.jpg</thumb>" dest="13+">
+ <!-- HTML da matchare:
+ <div class="film-poster">
+ <img src-1="(max-width: 768px)
http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_100x148_crop_q85.jpg";
src-2="http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_191x283_crop_q85.jpg";
src="http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_191x283_crop_q85.jpg";
class="image-responsive prograsync-image prograsync-loaded" alt=""
itemprop="image" style="display: inline;">
+ </div>
+
+ Da trasformare in:
<thumb>\1_jpg_600x800_crop_q85.jpg</thumb>
+ (Movieplayer fornisce un'immagine dimensionata a seconda
dell'url richiesto)
+ -->
+ <expression noclean="1"><div
class="film-poster">\s*<img.+?src="([^_"]+)</expression>
+ </RegExp>
+
<!--Trailer-->
- <RegExp input="$$1"
output="<trailer>http://nl.video.\1</trailer>"; dest="13+">
- <expression>setupObject.file =
"http://nl.video.([^"]*)";</expression>
+ <RegExp input="$$1" output="<url
cache="\MoviePlayerTrailer.html"
spoof="http://www.movieplayer.it/\1/"
function="GetMPTrailer">http://www.movieplayer.it/\1</url>";
dest="13+">
+
<expression>href="(?!/video/video-recensione)[^"]+"\s+data-gallery-iframe="/([^"]+)"</expression>
</RegExp>
- <!--Posters-->
- <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>
+
+ <!--Posters from MoviePlayer-->
+ <RegExp conditional="AltPosters" input="$$1"
output="<url cache="\MoviePlayerPosters.html"
spoof="http://www.movieplayer.it/film/\1/"
function="GetMPPosters">http://www.movieplayer.it/film/\1/galleria/?tipologia=manifesti-e-poster</url>";
dest="13+">
+
<expression>href="/film/([^/]*)/galleria/"</expression>
</RegExp>
- <!--Fanart from Movieplayer-->
- <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>
+
+ <!--Fanart from Movieplayer-->
+ <RegExp conditional="Fan" input="$$1" output="<url
cache="\MoviePlayerFanart.html"
spoof="http://www.movieplayer.it/film/\1/"
function="GetMPFanart">http://www.movieplayer.it/film/\1/galleria/?tipologia=foto-di-scena</url>";
dest="13+">
+
<expression>href="/film/([^/]*)/galleria/"</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetDetails>
+
+ <!-- Get Trailer from MP -->
+ <GetMPTrailer dest="13">
+ <RegExp input="$$2" output="<details>\1</details>"
dest="13+">
+ <RegExp input="$$1"
output="<trailer>\1</trailer>" dest="2">
+ <!--
+ HTML (JSON) da matchare:
+ { file:
"http://video.movieplayer.it/trailer/2014/01/21/trailer-italiano-3-300-l-alba-di-un-impero-16653_hi.mp4";,
label: "720p HD", "default": true }
+ -->
+ <expression noclean="1">{ file: "([^"]+)",
[^,]+, "default": true }</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetMPTrailer>
+
<!-- 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">Manifesti e poster</h3>(.*?)<div
class="column"></expression>
- </RegExp>
- <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 input="$$1" output="<thumb
preview="http://images.movieplayer.it/t/\1\2.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="2">
+ <expression repeat="yes"
noclean="1">data-prograsync-background-image-1="\(max-width: [^)]+\)
url\(http://images.movieplayer.it/t/([^_]+)(_jpg_[^\.]+)\.jpg\)"</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</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="$$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 input="$$1" output="<thumb
preview="http://images.movieplayer.it/t/\1\2.jpg">http://images.movieplayer.it/\1.jpg</thumb>";
dest="2">
+ <expression repeat="yes"
noclean="1">data-prograsync-background-image-1="\(max-width: [^)]+\)
url\(http://images.movieplayer.it/t/([^_]+)(_jpg_[^\.]+)\.jpg\)"</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
</GetMPFanart>
+
<IMDBChains dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5+">
<!--ID titolo IMDB su buffer 2-->
-----------------------------------------------------------------------
Summary of changes:
metadata.movieplayer.it/addon.xml | 8 +-
metadata.movieplayer.it/changelog.txt | 1 +
metadata.movieplayer.it/movieplayer.xml | 151 +++++++++++++++++++++----------
3 files changed, 109 insertions(+), 51 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Slashdot TV. Videos for Nerds. Stuff that Matters.
http://pubads.g.doubleclick.net/gampad/clk?id=160591471&iu=/4140/ostg.clktrk
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_100x148_crop_q85.jpg"](http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_100x148_crop_q85.jpg"){kind=link}
![http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_191x283_crop_q85.jpg"](http://images.movieplayer.it/t/images/2013/11/19/300-l-alba-di-un-impero-il-teaser-poster-italiano-292808_jpg_191x283_crop_q85.jpg"){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}
![http://images.movieplayer.it/t/\1\2.jpg">http://images.movieplayer.it/\1.jpg</thumb>"](http://images.movieplayer.it/t/\1\2.jpg">http://images.movieplayer.it/\1.jpg</thumb>"){kind=link}