The branch, dharma has been updated
via 28378ef0028af365846d040be0025873d3642ae9 (commit)
from 55d62d1c5f77c366490327d448eda64b1a4f9b3b (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=28378ef0028af365846d040be0025873d3642ae9
commit 28378ef0028af365846d040be0025873d3642ae9
Author: olympia <[email protected]>
Date: Mon Apr 18 19:52:28 2011 +0200
[metadata.mymovies.it] updated to version 1.1.3
diff --git a/metadata.mymovies.it/addon.xml b/metadata.mymovies.it/addon.xml
index bbcafb5..27429b6 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.1.2"
+ version="1.1.3"
provider-name="muttley">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
@@ -16,12 +16,19 @@
<summary lang="hu">MyMovies.it Film scraper</summary>
<summary lang="kr">MyMovies.it ìí ì¤í¬ëí¼</summary>
<summary lang="pt">Scraper de filmes MyMovies.it</summary>
- <description lang="it">Riporta problemi o suggerimenti su:
https://code.google.com/p/mymovies-xbmc-scraper/issues/list o
http://forum.xbmc.org/showthread.php?t=58141</description>
- <description lang="en">Report problems or suggest on:
https://code.google.com/p/mymovies-xbmc-scraper/issues/list o
http://forum.xbmc.org/showthread.php?t=58141</description>
+ <description lang="it">Riporta problemi o suggerimenti su:
+https://code.google.com/p/mymovies-xbmc-scraper/issues/list
+http://forum.xbmc.org/showthread.php?t=58141
+
+Buona visione!</description>
+ <description lang="en">Report problems or suggest on:
+https://code.google.com/p/mymovies-xbmc-scraper/issues/list
+http://forum.xbmc.org/showthread.php?t=58141
+
+Enjoy!</description>
<description lang="hu">Film információk letöltése a www.mymovies.it
webhelyrÅl</description>
<description lang="kr">MyMovies.it ìì ìí ì ë³´
ë¤ì´ë¡ë</description>
<description lang="pt">Descarregar informação de filmes de
www.mymovies.it</description>
<platform>all</platform>
- <broken>will not download most of the details, nor artwork</broken>
</extension>
</addon>
diff --git a/metadata.mymovies.it/changelog.txt
b/metadata.mymovies.it/changelog.txt
index e12c9db..70d470a 100644
--- a/metadata.mymovies.it/changelog.txt
+++ b/metadata.mymovies.it/changelog.txt
@@ -1,13 +1,19 @@
[B]Note:[/B] if the scraper is very slow, disable setting tagged with "(slow)".
+[B]1.1.3[/B]
+- Fixed regex: title, trailer, runtime
+- Added original title
+- Search imdb id form google...not perfect but i hope better.
+- Import info from IMDB (vote, mpaa, studio, top250). Deactivable from
settings.
+
[B]1.1.2[/B]
- Fixed regex: rating and trailer
- Fixed url cache
[B]1.1.1[/B]
- Change default films search url:
http://www.google.it/search?q=film_name+site:mymovies.it
-- Fixed trailer problem. The first and only issue reported on
http://code.google.com/p/mymovies-xbmc-scraper/issues/ ;)
-- Fixed search problem. Reported here
http://forum.xbmc.org/showpost.php?p=733887&postcount=89
+- Fixed trailer problem. The first and only issue reported on code.google.com
;)
+- Fixed search problem. Reported on forum.xbmc.org
[B]1.1.0[/B]
- Fixed problem for long title
diff --git a/metadata.mymovies.it/mymovies.xml
b/metadata.mymovies.it/mymovies.xml
index c2dd82e..fee316a 100755
--- a/metadata.mymovies.it/mymovies.xml
+++ b/metadata.mymovies.it/mymovies.xml
@@ -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]+([0-9]{4})</expression>
+ <expression noclean="1,2"><meta
property="og:title" content="([^\(|\|]+)\(([0-9]+)\)</expression>
</RegExp>
<!-- Genre -->
@@ -74,17 +74,20 @@
</RegExp>
<!-- Get Average Rating -->
- <RegExp input="$$1" output="\1.\2" dest="6">
- <expression noclean="1" clear="yes"><span
class="rating">([0-9]),([0-9]{1,2})</span></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>
+ <RegExp conditional="!imdb" input="$$6" output="\1"
dest="5+">
+ <RegExp input="$$1" output="\1.\2" dest="6">
+ <expression noclean="1" clear="yes"><span
class="rating">([0-9]),([0-9]{1,2})</span></expression>
+ </RegExp>
+ <!-- Convert to 10eseimi -->
+ <RegExp conditional="rating_ten" input="$$6"
output="<rating max="5">\1</rating>" dest="6">
+ <expression noclean="1" />
+ </RegExp>
+ <!-- Not convert -->
+ <RegExp conditional="!rating_ten" input="$$6"
output="<rating>\1</rating>" dest="6">
+ <expression noclean="1" />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
<!-- Others Rating -->
<RegExp conditional="other_rating" input="$$8"
output="<$INFO[tag_other_rating]>\1</$INFO[tag_other_rating]>"
dest="5+">
@@ -125,35 +128,45 @@
<RegExp conditional="trailer" input="$$1"
output="<url function="GetMovieTrailer">\1</url>"
dest="5+">
<expression noclean="1"><td
class="rec_link_disattivo"><a title="Trailer
[^"]+"
href="([^"]+)">Trailer</a></td></expression>
</RegExp>
-
- <!-- Tmdb Backdrops through 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>
+
+ <!-- Original title -->
+ <RegExp input="$$3"
output="<originaltitle>\1</originaltitle>" dest="5+">
+ <!-- Italian film title (get before) -->
+ <RegExp input="$$5" output="\1" dest="4">
+ <expression
noclean="1"><title>([^<]+)</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>
+
+ <!-- Create tag "originaltitleforimdb" for
future imdb search -->
<!-- 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]+([0-9]{4})</expression>
+ <!-- Get Film Date (get before) -->
+ <RegExp input="$$5" output="$$4 (\1)" dest="4">
+ <expression
noclean="1"><year>([^<]+)</year></expression>
</RegExp>
- <!-- Substitute "space" with "%20"...a sort of
urlencoding -->
- <RegExp input="$$4" output="\1" dest="6">
+ <!-- Url encoding -->
+ <RegExp input="$$4"
output="<originaltitleforimdb>\1</originaltitleforimdb>" dest="5+">
<expression encode="1" />
</RegExp>
<expression noclean="1" />
</RegExp>
+ <!--MPAA, studio and ratings from IMDB -->
+ <RegExp conditional="imdb" input="$$5" output="<url
cache="imdbinfo.html"
function="GetIMDBInfoByTitle">http://www.google.com/search?q=site:imdb.com%20"\1"</url>";
dest="5+">
+ <expression
noclean="1"><originaltitleforimdb>([^<]+)</originaltitleforimdb></expression>
+ </RegExp>
+
+ <!-- Tmdb Backdrops from IMDB -->
+ <RegExp conditional="imdb" input="$$5" output="<url
cache="imdbinfo.html"
function="GetTMDBFanartByTitle">http://www.google.com/search?q=site:imdb.com%20"\1"</url>";
dest="5+">
+ <expression
noclean="1"><originaltitleforimdb>([^<]+)</originaltitleforimdb></expression>
+ </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 -->
@@ -195,7 +208,8 @@
<GetMovieTrailer dest="5">
<RegExp input="$$1"
output="<details><trailer>\1</trailer></details>"
dest="5">
- <expression noclean="1">url:
'([^'|?]+\.flv).*'</expression>
+ <expression
noclean="1">'(http://[^']+trailer.flv)'</expression>
+ <!-- <expression noclean="1">url:
'([^'|?]+\.flv).*'</expression> -->
</RegExp>
</GetMovieTrailer>
@@ -227,26 +241,40 @@
</RegExp>
</GetMovieCast>
- <GetTMDBFanartByIMDBSearchPage dest="7">
- <RegExp input="$$6" output="<details>\1</details>"
dest="7">
- <RegExp input="$$1" output="<id>\1</id>"
dest="4">
- <expression
clear="yes">/title/([t0-9]*)/faq</expression>
+ <GetTMDBFanartByTitle dest="6">
+ <RegExp input="$$1" output="<details><url
function="GetTMDBFanartByIdChain">http://www.imdb.com/title/\1/</url></details>";
dest="6">
+ <expression>/title/([t0-9]*)</expression>
+ </RegExp>
+ </GetTMDBFanartByTitle>
+
+ <GetIMDBInfoByTitle dest="6">
+ <RegExp input="$$1" output="<details><url
function="ParseImdbData">http://akas.imdb.com/title/\1/</url></details>";
dest="6">
+ <expression>/title/([t0-9]*)</expression>
+ </RegExp>
+ </GetIMDBInfoByTitle>
+
+ <ParseImdbData dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <!-- All regex are get from imdb scraper -->
+ <RegExp input="$$1"
output="<top250>\1</top250>" dest="6+">
+ <expression>Top 250 #([0-9]*)</</expression>
</RegExp>
- <RegExp input="$$1" output="\1" dest="3">
- <expression noclean="1">(><a
href="/title.*)</expression>
+ <RegExp input="$$1"
output="<mpaa>\1</mpaa>" dest="6+">
+
<expression>MPAA</a>\)</h4>\n?([^<]*)</expression>
</RegExp>
- <RegExp input="$$3" output="<id>\1</id>"
dest="4+">
- <expression noclean="1,2">><a
href="/title/([t0-9]*)/[^>]*>[^<]*</a>
*\([0-9]*</expression>
+ <RegExp input="$$1"
output="<country>\1</country>" dest="6+">
+ <expression repeat="yes"><a
href="/country/[^>]+>([^<]+)</expression>
</RegExp>
- <RegExp input="$$4" output="\1" dest="5">
- <expression noclean="1"
clear="yes">([t0-9]+)</expression>
+ <RegExp input="$$1"
output="<studio>\1</studio>" dest="6+">
+
<expression>"/company/[^>]+>([^<]+)</a></expression>
</RegExp>
- <RegExp input="$$5" output="<url
function="GetTMDBFanartByIdChain">http://www.imdb.com/title/\1/</url>";
dest="6">
- <expression noclean="1" />
+ <!-- I can't use pulbic function GetIMDBRatingById :(
-->
+ <RegExp input="$$1"
output="<rating>\1</rating><votes>\2</votes>" dest="6+">
+ <expression><span
class="rating-rating">([0-9.]+).*?>([0-9,]+)
votes</a></expression>
</RegExp>
- <expression noclean="1" />
+ <expression noclean="1"/>
</RegExp>
- </GetTMDBFanartByIMDBSearchPage>
+ </ParseImdbData>
<GetMovieFullCast dest="5">
<RegExp input="$$2" output="<details>\1</details>"
dest="5">
diff --git a/metadata.mymovies.it/resources/language/English/strings.xml
b/metadata.mymovies.it/resources/language/English/strings.xml
index 9489175..6b34c1e 100644
--- a/metadata.mymovies.it/resources/language/English/strings.xml
+++ b/metadata.mymovies.it/resources/language/English/strings.xml
@@ -7,7 +7,7 @@
<string id="30004">Filmmakers</string>
<string id="30005">Cast separators</string>
- <string id="30100">Vote</string>
+ <string id="30100">Vote (mymovies.it)</string>
<string id="30101">In 10esimi</string>
<string id="30102">Direct vote, critics and the public</string>
<string id="30103">View at:</string>
@@ -17,6 +17,7 @@
<string id="30202">In Hi-Res</string>
<string id="30203">Trailer (slow)</string>
<string id="30204">TMDB Backdrops (slow)</string>
+ <string id="30205">Vote, studio, mpaa, top250 from imdb (slow)</string>
<string id="30300">Appendi al Plot</string>
<string id="30301">Critique (slow)</string>
diff --git a/metadata.mymovies.it/resources/language/Italian/strings.xml
b/metadata.mymovies.it/resources/language/Italian/strings.xml
index 474c428..b981dea 100644
--- a/metadata.mymovies.it/resources/language/Italian/strings.xml
+++ b/metadata.mymovies.it/resources/language/Italian/strings.xml
@@ -7,7 +7,7 @@
<string id="30004">Filmmakers</string>
<string id="30005">Separatori del Cast</string>
- <string id="30100">Votazione</string>
+ <string id="30100">Votazione (mymovies.it)</string>
<string id="30101">In 10esimi</string>
<string id="30102">Includi Dizionari, Critica e Pubblico</string>
<string id="30103">Visualizza in:</string>
@@ -17,6 +17,7 @@
<string id="30202">In Hi-Res</string>
<string id="30203">Trailer (lento)</string>
<string id="30204">TMDB Backdrops (molto lento)</string>
+ <string id="30205">Voto, studio, mpaa, top250 da imdb (lento)</string>
<string id="30300">Appendi al Plot</string>
<string id="30301">Critica (lento)</string>
diff --git a/metadata.mymovies.it/resources/settings.xml
b/metadata.mymovies.it/resources/settings.xml
index ba50e63..3450a59 100644
--- a/metadata.mymovies.it/resources/settings.xml
+++ b/metadata.mymovies.it/resources/settings.xml
@@ -8,15 +8,16 @@
<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="true"/>
+ <setting label="30101" type="bool" id="rating_ten" default="true"
enable="!eq(8,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)"/>
+ <setting label="30103" type="labelenum" values="mpaa|studio|outline"
id="tag_other_rating" default="outline" enable="eq(-1,true)"/>
<setting label="30200" type="lsep" />
<setting label="30201" type="bool" id="thumbs" default="true"/>
<setting label="30202" type="bool" id="bigThumbs" default="true"
enable="eq(-1,true)" />
<setting label="30203" type="bool" id="trailer" default="true"/>
<setting label="30204" type="bool" id="backdrops" default="true"/>
+ <setting label="30205" type="bool" id="imdb" default="true"/>
<setting label="30300" type="lsep" />
<setting label="30301" type="bool" id="critic" default="false"/>
-----------------------------------------------------------------------
Summary of changes:
metadata.mymovies.it/addon.xml | 15 ++-
metadata.mymovies.it/changelog.txt | 10 ++-
metadata.mymovies.it/mymovies.xml | 108 ++++++++++++-------
.../resources/language/English/strings.xml | 3 +-
.../resources/language/Italian/strings.xml | 3 +-
metadata.mymovies.it/resources/settings.xml | 5 +-
6 files changed, 94 insertions(+), 50 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
