The branch, dharma has been updated
via 4a414d6d518f9336ac31425ec63fd2c83e7cb1e6 (commit)
from aedb55b384258a95a14d1e173e753b6425cf43c0 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=4a414d6d518f9336ac31425ec63fd2c83e7cb1e6
commit 4a414d6d518f9336ac31425ec63fd2c83e7cb1e6
Author: olympia <[email protected]>
Date: Thu Dec 2 18:12:43 2010 +0100
[metadata.mymovies.it] updated to version 1.1.0
diff --git a/metadata.mymovies.it/addon.xml b/metadata.mymovies.it/addon.xml
index 9a6a889..d7462ef 100644
--- a/metadata.mymovies.it/addon.xml
+++ b/metadata.mymovies.it/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.mymovies.it"
name="MyMovies.it"
- version="1.0.6"
+ version="1.1.0"
provider-name="muttley">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -17,8 +17,7 @@
<summary lang="kr">MyMovies.it ìí ì¤í¬ëí¼</summary>
<summary lang="pt">Scraper de filmes MyMovies.it</summary>
<description lang="it">Scarica le informazioni dei film da www.mymovies.it.
-
-Per approfondimenti, domande e/o suggerimenti visita muttley.eb2a.com.
+Per problemi, segnalazioni o suggerimenti:
http://code.google.com/p/mymovies-xbmc-scraper/
Buona visione! :)</description>
<description lang="en">Download Movie information from
www.mymovies.it</description>
diff --git a/metadata.mymovies.it/changelog.txt
b/metadata.mymovies.it/changelog.txt
index 3f0b3d5..2fdc8a4 100644
--- a/metadata.mymovies.it/changelog.txt
+++ b/metadata.mymovies.it/changelog.txt
@@ -1,3 +1,14 @@
+[B]Note:[/B] if the scraper is very slow, i suggest to disable setting tagged
with "(slow)" in scraper settings.
+
+[B]1.1.0[/B]
+- Fixed problem for long title
+- Added support for new title (asterix votes)
+- Used tag <rating max="*">
+- Fixed problem with single poster in low res
+- Fixed trailer
+- Fixed TMDB FanART
+- Improved append varius stuff to plot
+
[B]1.0.6[/B]
- Aggiunto il supporto a XBMC 10.5 (addons system)
- Fixed trailer
diff --git a/metadata.mymovies.it/mymovies.xml
b/metadata.mymovies.it/mymovies.xml
old mode 100644
new mode 100755
index 43037ee..3812bcc
--- a/metadata.mymovies.it/mymovies.xml
+++ b/metadata.mymovies.it/mymovies.xml
@@ -24,12 +24,12 @@
<GetSearchResults dest="8">
<RegExp input="$$5" output="<?xml version="1.0"
encoding="iso-8859-1"
standalone="yes"?><results>\1</results>" dest="8">
<!-- Add new link style to Search result
(http://www.mymovies.it/film/<year>/<film_name>/) -->
- <RegExp input="$$1"
output="<entity><title>\2 (\4
\3)</title><url>\1</url><id>\1</id></entity>"
dest="5">
- <expression repeat="yes" cs="true"><a
href="(http://www\.mymovies\.it/film/[0-9]{4}/[^/]+/)" target=_top
class=l>(.+?) \([^0-9]*([0-9]{4})[^0-9]*\) +\| +MYmovies</a><table
border=0 cellpadding=0 cellspacing=0><tr><td
class="j"><div class=std>(?(?=Un film di )Un film di (.+?)
con)</expression>
+ <RegExp input="$$1"
output="<entity><title>\2 \3</title><url
cache="\1-main.html">\1</url><id>\1</id></entity>"
dest="5">
+ <expression repeat="yes" cs="true"><a
href="(http://www\.mymovies\.it/film/[0-9]{4}/[^/]+/)" target=_top
class=l>(.+?)(?: +- +MYmovies)?(?: +\| +MYmovies)?</a><table
border=0 cellpadding=0 cellspacing=0><tr><td
class="j"><div class=std>(?(?=Un film di )Un film di (.+?)
con)</expression>
</RegExp>
<!-- Add OLD link style to Search result
(www.mymovies.it/dizionario/recensione.asp?id=[0-9]) -->
- <RegExp input="$$1"
output="<entity><title>\2 (\4
\3)</title><url>\1</url><id>\1</id></entity>"
dest="5+">
- <expression repeat="yes" cs="true"><a
href="(http://www\.mymovies\.it/dizionario/recensione\.asp\?id=[0-9]+)"
target=_top class=l>(.+?) \([^0-9]*([0-9]{4})[^0-9]*\) +\|
+MYmovies</a><table border=0 cellpadding=0
cellspacing=0><tr><td class="j"><div
class=std>(?(?=Un film di )Un film di (.+?) con)</expression>
+ <RegExp input="$$1"
output="<entity><title>\2 \3</title><url
cache="\1-main.html">\1</url><id>\1</id></entity>"
dest="5+">
+ <expression repeat="yes" cs="true"><a
href="(http://www\.mymovies\.it/dizionario/recensione\.asp\?id=[0-9]+)"
target=_top class=l>(.+?)(?: +\| +MYmovies)?</a><table border=0
cellpadding=0 cellspacing=0><tr><td class="j"><div
class=std>(?(?=Un film di )Un film di (.+?) con)</expression>
</RegExp>
<expression noclean="1" />
</RegExp>
@@ -40,7 +40,7 @@
<!-- Title, Year -->
<RegExp input="$$1"
output="<title>\1</title><year>\2</year>" dest="5">
- <expression noclean="1,2"><title>([^\(]+)
\(([0-9]{4})</expression>
+ <expression
noclean="1,2"><title>([^\(|\|]+)[^0-9]+([0-9]{4})</expression>
</RegExp>
<!-- Genre -->
@@ -73,29 +73,19 @@
<expression trim="1"><strong
class="rec_lancio" >(.+?)</strong></expression>
</RegExp>
- <!-- Rating -->
- <!-- rating map array -->
- <RegExp conditional="rating_ten"
- output="<r>0.1-No rating
found</r><r>0.1-0.2</r><r>0.2-0.4</r><r>0.3-0.6</r><r>0.4-0.8</r><r>0.5-1.0</r><r>0.6-1.2</r><r>0.7-1.4</r><r>0.8-1.6</r><r>0.9-1.8</r><r>1.0-2.0</r><r>1.1-2.2</r><r>1.2-2.4</r><r>1.3-2.6</r><r>1.4-2.8</r><r>1.5-3.0</r><r>1.6-3.2</r><r>1.7-3.4</r><r>1.8-3.6</r><r>1.9-3.8</r><r>2.0-4.0</r><r>2.1-4.2</r><r>2.2-4.4</r><r>2.3-4.6</r><r>2.4-4.8</r><r>2.5-5.0</r><r>2.6-5.2</r><r>2.7-5.4</r><r>2.8-5.6</r><r>2.9-5.8</r><r>3.0-6.0</r><r>3.1-6.2</r><r>3.2-6.4</r><r>3.3-6.6</r><r>3.4-6.8</r><r>3.5-7.0</r><r>3.6-7.2</r><r>3.7-7.4</r><r>3.8-7.6</r><r>3.9-7.8</r><r>4.0-8.0</r><r>4.1-8.2</r><r>4.2-8.4</r><r>4.3-8.6</r><r>4.4-8.8</r><r>4.5-9.0</r><r>4.6-9.2</r><r>4.7-9.4</r><r>4.8-9.6</r><r>4.9-9.8</r><r>5.0-10.0</r><r>n.d-
</r>"
- dest="4">
- <expression noclean="1" />
- </RegExp>
- <!-- Average -->
- <RegExp input="$$1" output="\1.\2" dest="6">
- <expression noclean="1" clear="yes"><div
style="text-align:center; font-size:23px; font-weight:bold;
letter-spacing:1px; margin:0px 11px 7px
11px">([0-9]),([0-9]{2})</expression>
- </RegExp>
- <!-- Rating x of 10 -->
- <RegExp conditional="rating_ten" input="$$4"
output="\1" dest="6">
- <!-- number rounding -->
- <RegExp input="$$6" output="\1.\2" dest="6">
- <expression
noclean="1">([0-9])\.([0-9])</expression>
- </RegExp>
- <expression
noclean="1">$$6-([^<]+)</expression>
- </RegExp>
- <RegExp input="$$6"
output="<rating>\1</rating>" dest="5+">
- <expression noclean="1" />
- </RegExp>
-
+ <!-- Get Average Rating -->
+ <RegExp input="$$1" output="\1.\2" dest="6">
+ <expression noclean="1" clear="yes"><div
style="text-align:center; font-size:23px; font-weight:bold;
letter-spacing:1px; margin:0px 11px 7px
11px">([0-9]),([0-9]{2})</expression>
+ </RegExp>
+ <!-- Convert to 10eseimi -->
+ <RegExp conditional="rating_ten" input="$$6" output="<rating
max="5">\1</rating>" dest="5+">
+ <expression noclean="1" />
+ </RegExp>
+ <!-- Not convert -->
+ <RegExp conditional="!rating_ten" input="$$6"
output="<rating>\1</rating>" dest="5+">
+ <expression noclean="1" />
+ </RegExp>
+
<!-- Others Rating -->
<RegExp conditional="other_rating" input="$$8"
output="<$INFO[tag_other_rating]>\1</$INFO[tag_other_rating]>"
dest="5+">
<!-- Dizionari -->
@@ -124,7 +114,7 @@
<!-- Thumb -->
<RegExp conditional="!thumbs" input="$$1"
output="<thumb>\1</thumb>" dest="5+">
- <expression cs="true" noclean="1"><img
style="[^"]+" src="([^"]+)"
width="150px" height="215px"
alt="Locandina</expression>
+ <expression cs="true" noclean="1"><img
style="[^"]+" src="([^"]+)"
width="150px" alt="Locandina</expression>
</RegExp>
<!-- else All Thumbs -->
<RegExp conditional="thumbs" input="$$1"
output="<url function="GetMovieThumbs">\1</url>"
dest="5+">
@@ -138,24 +128,24 @@
<!-- Tmdb Backdrops through imdbId -->
- <!-- Get imdbId -->
+ <!-- Get Original title and date if present -->
<RegExp conditional="backdrops" input="$$6"
output="<url
function="GetTMDBFanartByIMDBSearchPage">http://akas.imdb.com/find?s=tt;q=\1</url>";
dest="5+">
<!-- Italian film title -->
<RegExp input="$$1" output="\1" dest="4">
- <expression
noclean="1"><title>([^\(]+) \(</expression>
+ <expression
noclean="1"><title>([^\(|\|]+)</expression>
</RegExp>
<!-- Original film title: not always present -->
<RegExp input="$$1" output="\1" dest="3">
<expression cs="true" noclean="1"
clear="yes">Titolo originale[^>]+>([^<]+)<</expression>
</RegExp>
- <!-- Test Original film title -->
+ <!-- Test Original film title => if exist
overwrite italina title ($4) -->
<RegExp input="$$3" output="\1" dest="4">
<expression>(.+)</expression>
</RegExp>
<!-- For better serach -->
<!-- Get Film Date -->
<RegExp input="$$1" output="$$4 (\1)" dest="4">
- <expression
noclean="1"><title>[^\(]+ \(([0-9]{4})</expression>
+ <expression
noclean="1"><title>[^\(|\|]+[^0-9]+([0-9]{4})</expression>
</RegExp>
<!-- Substitute "space" with "%20"...a sort of
urlencoding -->
<RegExp input="$$4" output="\1" dest="6">
@@ -163,37 +153,33 @@
</RegExp>
<expression noclean="1" />
</RegExp>
-
-
- <!-- Plot: It is used for report many information... -->
- <!-- Custum function are used only for see all buffer
-->
- <!-- I buffer della GetDetails non sono visibili alle
funzioni custom e non risco a trovare un approccio differente per appendere
informazioni al plot
--->
- <RegExp input="$$1" output="<url
function="GetMoviePlot">$$2</url>" dest="5+">
- <expression />
- </RegExp>
-
-
- <!-- Plot: all that you want append... -->
- <RegExp conditional="critic" input="$$1"
output="<url function="GetMovieCritic">\1</url>"
dest="5+">
- <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Critica</a></td></expression>
- </RegExp>
- <RegExp conditional="public" input="$$1"
output="<url function="GetMoviePublic">\1</url>"
dest="5+">
- <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Pubblico</a></td></expression>
- </RegExp>
- <RegExp conditional="forum" input="$$1" output="<url
function="GetMovieForum">\1</url>" dest="5+">
- <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Forum</a></td></expression>
- </RegExp>
- <RegExp conditional="frasi_celebri" input="$$1"
output="<url function="GetMovieFrasiCelebri">\1</url>"
dest="5+">
- <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Frasi</a></td></expression>
- </RegExp>
-
- <!-- Plot: ...at the end -->
- <!-- Non serve a un c***o l'url (già cached), ma è
l'unico modo per vedere i buffer 10,11,12,13,14 istanziati nelle custom
function e non scaricare nessuna pagina -->
- <RegExp output="<url
cache="$$2-fullcredits.html"
function="AppendToPlot">$$2</url>" dest="5+">
- <expression noclean="1" />
- </RegExp>
-
+
+ <!-- Plot: It is used for report many information... -->
+ <!-- Custum function are used only for see all buffer -->
+ <!-- I buffer della GetDetails non sono visibili alle funzioni
custom e non risco a trovare un approccio differente per appendere informazioni
al plot -->
+ <RegExp input="$$1" output="<url
cache="$$2-main.html"
function="GetMoviePlot">$$2</url>" dest="5+">
+ <expression />
+ </RegExp>
+
+ <!-- Plot: all that you want append... -->
+ <RegExp conditional="critic" input="$$1" output="<url
function="GetMovieCritic">\1</url>" dest="5+">
+ <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Critica</a></td></expression>
+ </RegExp>
+ <RegExp conditional="public" input="$$1" output="<url
function="GetMoviePublic">\1</url>" dest="5+">
+ <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Pubblico</a></td></expression>
+ </RegExp>
+ <RegExp conditional="forum" input="$$1" output="<url
function="GetMovieForum">\1</url>" dest="5+">
+ <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Forum</a></td></expression>
+ </RegExp>
+ <RegExp conditional="frasi_celebri" input="$$1" output="<url
function="GetMovieFrasiCelebri">\1</url>" dest="5+">
+ <expression noclean="1"><td
class="rec_link_disattivo"><a title="[^"]+"
href="([^"]+)">Frasi</a></td></expression>
+ </RegExp>
+
+ <!-- Plot: ...concat all stuff at the end -->
+ <RegExp output="<chain
function="AppendToPlot">$$2</chain>" dest="5+">
+ <expression noclean="1" />
+ </RegExp>
+
<expression noclean="1" />
</RegExp>
</GetDetails>
@@ -208,8 +194,8 @@
</GetMovieWriters>
<GetMovieTrailer dest="5">
- <RegExp input="$$1"
output="<details><trailer>\1</trailer></details>"
dest="5">
- <expression
noclean="1">so\.addVariable\('file','[^=]+=([^']+)'\);</expression>
+ <RegExp input="$$1"
output="<details><trailer>\1.flv</trailer></details>"
dest="5">
+ <expression
noclean="1">so\.addVariable\('file','[^=]+=([^=]+).flv</expression>
</RegExp>
</GetMovieTrailer>
@@ -255,7 +241,7 @@
<RegExp input="$$4" output="\1" dest="5">
<expression noclean="1"
clear="yes">([t0-9]+)</expression>
</RegExp>
- <RegExp input="$$5" output="<url
function="GetTMDBFanartById">http://www.imdb.com/title/\1/</url>";
dest="6">
+ <RegExp input="$$5" output="<url
function="GetTMDBFanartByIdChain">http://www.imdb.com/title/\1/</url>";
dest="6">
<expression noclean="1" />
</RegExp>
<expression noclean="1" />
@@ -307,17 +293,16 @@
</RegExp>
</GetMovieFullCast>
- <!-- All stuff append to plot -->
-
- <GetMoviePlot clearbuffers="no" dest="10">
- <!-- Simple Trim left -->
- <RegExp input="$$4" output="\1" dest="10">
- <RegExp input="$$1" output="\1" dest="4">
- <!-- get plot and some pre html tags -->
- <expression clear="yes" trim="1"><td
rowspan="2" valign="top">(.+?)</p></expression>
- </RegExp>
- <expression noclean="1">[^a-z]*(.+)</expression>
- </RegExp>
+ <GetMoviePlot clearbuffers="no" dest="10">
+ <!-- Simple Trim left plot -->
+ <RegExp input="$$4" output="\1" dest="10">
+ <RegExp input="$$1" output="\1" dest="4">
+ <!-- get plot and some pre html tags -->
+ <expression clear="yes" trim="1"><td rowspan="2"
valign="top">(.+?)</p></expression>
+ </RegExp>
+ <expression noclean="1">[^a-z]*(.+)</expression>
+ </RegExp>
+
</GetMoviePlot>
<GetMovieCritic clearbuffers="no" dest="11">
diff --git a/metadata.mymovies.it/resources/language/Italian/strings.xml
b/metadata.mymovies.it/resources/language/Italian/strings.xml
index fa8da37..474c428 100644
--- a/metadata.mymovies.it/resources/language/Italian/strings.xml
+++ b/metadata.mymovies.it/resources/language/Italian/strings.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<strings>
<string id="30000">Cast</string>
- <string id="30001">Completo con foto (lento)</string>
+ <string id="30001">Completo con foto</string>
<string id="30002">Regista/i</string>
<string id="30003">Attori</string>
<string id="30004">Filmmakers</string>
diff --git a/metadata.mymovies.it/resources/settings.xml
b/metadata.mymovies.it/resources/settings.xml
index ad9e29e..ba50e63 100644
--- a/metadata.mymovies.it/resources/settings.xml
+++ b/metadata.mymovies.it/resources/settings.xml
@@ -8,7 +8,7 @@
<setting label="30005" type="bool" id="fakeactor" default="false"
enable="eq(-4,true)"/>
<setting label="30100" type="lsep" />
- <setting label="30101" type="bool" id="rating_ten" default="false"/>
+ <setting label="30101" type="bool" id="rating_ten" default="true"/>
<setting label="30102" type="bool" id="other_rating" default="true"/>
<setting label="30103" type="labelenum" values="mpaa|studio|outline"
id="tag_other_rating" default="studio" enable="eq(-1,true)"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.mymovies.it/addon.xml | 5 +-
metadata.mymovies.it/changelog.txt | 11 ++
metadata.mymovies.it/mymovies.xml | 141 +++++++++-----------
.../resources/language/Italian/strings.xml | 2 +-
metadata.mymovies.it/resources/settings.xml | 2 +-
5 files changed, 78 insertions(+), 83 deletions(-)
mode change 100644 => 100755 metadata.mymovies.it/mymovies.xml
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
