The branch, dharma-pre has been updated
       via  75d202cd4bafd898ed2c4d2f1cf988f57b01bef1 (commit)
      from  2356592e4bce53f7dcad1f55729c73cbdc32ddf2 (commit)

- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=75d202cd4bafd898ed2c4d2f1cf988f57b01bef1

commit 75d202cd4bafd898ed2c4d2f1cf988f57b01bef1
Author: olympia <[email protected]>
Date:   Mon Oct 11 21:33:07 2010 +0200

    [metadata.themoviedb.org] Added option to get rating from IMDb

diff --git a/metadata.themoviedb.org/addon.xml 
b/metadata.themoviedb.org/addon.xml
index 734d496..1f0dfc1 100644
--- a/metadata.themoviedb.org/addon.xml
+++ b/metadata.themoviedb.org/addon.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="metadata.themoviedb.org"
        name="The MovieDB"
-       version="1.1.7"
+       version="1.2.0"
        provider-name="Team XBMC">
   <requires>
     <import addon="xbmc.metadata" version="1.0"/>
     <import addon="metadata.common.themoviedb.org" version="1.0.7"/>
     <import addon="metadata.common.hdtrailers.net" version="1.0.4"/>
+    <import addon="metadata.common.imdb.com" version="2.0.5"/>
   </requires>
   <extension point="xbmc.metadata.scraper.movies"
              language="en"
diff --git a/metadata.themoviedb.org/changelog.txt 
b/metadata.themoviedb.org/changelog.txt
index d103fb6..9c889b1 100644
--- a/metadata.themoviedb.org/changelog.txt
+++ b/metadata.themoviedb.org/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.2.0[/B]
+- Added option to scrape rating from IMDb
+
 [B]1.1.6[/B]
 - Fix rating images to show up on default skins
 
diff --git a/metadata.themoviedb.org/resources/language/English/strings.xml 
b/metadata.themoviedb.org/resources/language/English/strings.xml
index 41dda11..0030780 100644
--- a/metadata.themoviedb.org/resources/language/English/strings.xml
+++ b/metadata.themoviedb.org/resources/language/English/strings.xml
@@ -3,4 +3,5 @@
     <string id="30000">Enable Fanart</string>
     <string id="30001">Enable Trailers from HD-Trailers.net</string>
     <string id="30002">Preferred language</string>
+    <string id="30003">Get rating from IMDb</string>
 </strings>
diff --git a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml 
b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
index c77c6ff..f1e947f 100644
--- a/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
+++ b/metadata.themoviedb.org/resources/language/Hungarian/strings.xml
@@ -3,4 +3,5 @@
     <string id="30000">Fanartképek engedélyezése</string>
     <string id="30001">Filmelőzetesek a HD-Trailers.net-ről</string>
     <string id="30002">Preferált nyelv</string>
+    <string id="30003">Értékelés az IMDb-ről</string>
 </strings>
diff --git a/metadata.themoviedb.org/resources/settings.xml 
b/metadata.themoviedb.org/resources/settings.xml
index b9ed5ad..eb35274 100644
--- a/metadata.themoviedb.org/resources/settings.xml
+++ b/metadata.themoviedb.org/resources/settings.xml
@@ -3,4 +3,5 @@
     <setting label="30000" type="bool" id="fanart" default="true"/>
     <setting label="30001" type="labelenum" values="No|480p|720p|1080p" 
id="TrailerQ" default="480p"/>
     <setting label="30002" type="labelenum" 
values="da|fi|nl|de|it|es|fr|pl|hu|el|tr|ru|he|ja|pt|zh|cs|sl|hr|ko|en|sv|no" 
id="language" default="en"/>
-       </settings>
+    <setting label="30003" type="bool" id="imdbrating" default="false"/>
+</settings>
diff --git a/metadata.themoviedb.org/tmdb.xml b/metadata.themoviedb.org/tmdb.xml
index dbd9de3..63411b9 100644
--- a/metadata.themoviedb.org/tmdb.xml
+++ b/metadata.themoviedb.org/tmdb.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2010-09-11">
+<scraper framework="1.1" date="2010-10-11">
        <CreateSearchUrl dest="3">
                <RegExp input="$$1" 
output="&lt;url&gt;http://api.themoviedb.org/2.1/Movie.search/$INFO[language]/xml/57983e31fb435df4df77afb854740ea9/\1&lt;/url&gt;";
 dest="3">
-                       <RegExp input="$$2" output="%20(\1)" dest="4">
+                       <RegExp input="$$2" output="+\1" dest="4">
                                <expression clear="yes">(.+)</expression>
                        </RegExp>
                        <expression noclean="1"/>
@@ -67,12 +67,15 @@
                        <RegExp input="$$1" 
output="&lt;runtime&gt;\1&lt;/runtime&gt;" dest="5+">
                                <expression 
noclean="1">&lt;runtime&gt;([^&lt;]*)&lt;/runtime&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">
+                       <RegExp conditional="!imdbrating" input="$$1" 
output="&lt;rating&gt;\1&lt;/rating&gt;" dest="5+">
                                <expression 
noclean="1">&lt;rating&gt;([^&lt;]*)&lt;/rating&gt;</expression>
                        </RegExp>
-                       <RegExp input="$$1" 
output="&lt;votes&gt;\1&lt;/votes&gt;" dest="5+">
+                       <RegExp conditional="!imdbrating" input="$$1" 
output="&lt;votes&gt;\1&lt;/votes&gt;" dest="5+">
                                <expression 
noclean="1">&lt;votes&gt;([^&lt;]*)&lt;/votes&gt;</expression>
                        </RegExp>
+                       <RegExp conditional="imdbrating" input="$$1" 
output="&lt;chain function=&quot;GetIMDBRatingById&quot;&gt;\1&lt;/chain&gt;" 
dest="5+">
+                               <expression 
noclean="1">&lt;imdb_id&gt;([^&lt;]*)&lt;/imdb_id&gt;</expression>
+                       </RegExp>
                        <RegExp input="$$1" 
output="&lt;tagline&gt;\1&lt;/tagline&gt;" dest="5+">
                                <expression 
noclean="1">&lt;tagline&gt;([^&lt;]*)&lt;/tagline&gt;</expression>
                        </RegExp>

-----------------------------------------------------------------------

Summary of changes:
 metadata.themoviedb.org/addon.xml                  |    3 ++-
 metadata.themoviedb.org/changelog.txt              |    3 +++
 .../resources/language/English/strings.xml         |    1 +
 .../resources/language/Hungarian/strings.xml       |    1 +
 metadata.themoviedb.org/resources/settings.xml     |    3 ++-
 metadata.themoviedb.org/tmdb.xml                   |   11 +++++++----
 6 files changed, 16 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Scrapers

------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1,  ECMAScript5, and DOM L2 & L3.
Spend less time writing and  rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons

Reply via email to