The branch, dharma has been updated
via da14be34c263c14fb2e3f005d888e5951811d8fa (commit)
from ccec886c0d9cfb57bd4385491421e4769c9c1b27 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=da14be34c263c14fb2e3f005d888e5951811d8fa
commit da14be34c263c14fb2e3f005d888e5951811d8fa
Author: taxigps <[email protected]>
Date: Wed Mar 13 10:44:24 2013 +0800
[metadata.douban.com] updated to version 1.0.4
diff --git a/metadata.douban.com/addon.xml b/metadata.douban.com/addon.xml
index be43963..8dd9eeb 100644
--- a/metadata.douban.com/addon.xml
+++ b/metadata.douban.com/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.douban.com"
name="douban"
- version="1.0.3"
+ version="1.0.4"
provider-name="Taxigps">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.douban.com/douban.xml b/metadata.douban.com/douban.xml
index 5acdbe2..688a909 100644
--- a/metadata.douban.com/douban.xml
+++ b/metadata.douban.com/douban.xml
@@ -14,8 +14,8 @@
</RegExp>
</NfoUrl>
<GetSearchResults dest="8">
- <RegExp input="$$3" output="<results>\1</results>"
dest="8">
- <RegExp input="$$1"
output="<entity><title>\1 - \3
(\4)</title><url>http://api.douban.com/v2/movie/subject/\2</url><id>\2</id></entity>";
dest="3+">
+ <RegExp input="$$3" output="<results
sorted="yes">\1</results>" dest="8">
+ <RegExp input="$$1"
output="<entity><title>\1 - \3
(\4)</title><url>http://api.douban.com/v2/movie/subject/\2</url><url>http://movie.douban.com/subject/\2</url><id>\2</id></entity>";
dest="3+">
<expression
repeat="yes">"title":"(.+?)","url":"http:\\/\\/movie.douban.com\\/subject\\/([0-9]+)\\/[^"]*","sub_title":"(.*?)","year":"([0-9]+)"</expression>
</RegExp>
<expression noclean="1"/>
@@ -23,7 +23,7 @@
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$2" output="<id>\1</id>"
dest="5">
+ <RegExp input="$$3" output="<id>\1</id>"
dest="5">
<expression/>
</RegExp>
<RegExp input="$$1"
output="<title>\1</title>" dest="5+">
@@ -35,9 +35,6 @@
<RegExp input="$$1"
output="<year>\1</year>" dest="5+">
<expression>"year":"(.+?)"</expression>
</RegExp>
- <RegExp input="$$1"
output="<runtime>\1</runtime>" dest="5+">
- <expression><db:attribute
name="movie_duration">([0-9]+)</expression>
- </RegExp>
<RegExp input="$$1"
output="<votes>\1</votes>" dest="5+">
<expression>"ratings_count":(\d+)</expression>
</RegExp>
@@ -68,19 +65,22 @@
<RegExp input="$$1" output="\1" dest="8">
<expression
clear="yes">"casts":\[(.+?)\]</expression>
</RegExp>
+ <RegExp conditional="trailer" input="$$2"
output="<trailer>http://movie.douban.com/trailer/video_url?tid=\1</trailer>";
dest="5+">
+
<expression>http://movie.douban.com/trailer/([0-9]+)</expression>
+ </RegExp>
<RegExp input="$$8"
output="<actor><thumb>http://\1/img/celebrity/large/\2.jpg</thumb><name>\3</name></actor>";
dest="5+">
<expression
repeat="yes">"large":"http:\\/\\/(.+?)\\/img\\/celebrity\\/large\\/(\d+).jpg".+?"name":"(.+?)"</expression>
</RegExp>
- <RegExp conditional="movieposterdb" input="$$1"
output="<chain
function="GetMoviePosterDBThumbs">tt\1</chain>" dest="5+">
- <expression><db:attribute
name="imdb">http://www.imdb.com/title/tt([0-9]+)</expression>
+ <RegExp conditional="movieposterdb" input="$$2"
output="<chain
function="GetMoviePosterDBThumbs">tt\1</chain>" dest="5+">
+
<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
</RegExp>
- <RegExp input="$$2" output="<url
cache="\1-poster.html"
function="GetPoster">http://movie.douban.com/subject/\1/photos?type=R</url>";
dest="5+">
+ <RegExp input="$$3" output="<url
cache="\1-poster.html"
function="GetPoster">http://movie.douban.com/subject/\1/photos?type=R</url>";
dest="5+">
<expression/>
</RegExp>
- <RegExp conditional="tmdbfanart" input="$$1"
output="<chain
function="GetTMDBFanartByIdChain">tt\1</chain>" dest="5+">
- <expression><db:attribute
name="imdb">http://www.imdb.com/title/tt([0-9]+)</expression>
+ <RegExp conditional="tmdbfanart" input="$$2"
output="<chain
function="GetTMDBFanartByIdChain">tt\1</chain>" dest="5+">
+
<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
</RegExp>
- <RegExp conditional="!tmdbfanart" input="$$2"
output="<url cache="\1-fanart.html"
function="GetFanart">http://movie.douban.com/subject/\1/photos?type=S</url>";
dest="5+">
+ <RegExp conditional="!tmdbfanart" input="$$3"
output="<url cache="\1-fanart.html"
function="GetFanart">http://movie.douban.com/subject/\1/photos?type=S</url>";
dest="5+">
<expression/>
</RegExp>
<expression noclean="1"/>
diff --git a/metadata.douban.com/resources/language/Chinese
(Simple)/strings.xml b/metadata.douban.com/resources/language/Chinese
(Simple)/strings.xml
index 9f0b141..53f3b04 100644
--- a/metadata.douban.com/resources/language/Chinese (Simple)/strings.xml
+++ b/metadata.douban.com/resources/language/Chinese (Simple)/strings.xml
@@ -2,4 +2,5 @@
<strings>
<string id="30000">å¯ç¨MoviePosterDBå°é¢æµ·æ¥</string>
<string id="30001">å¯ç¨themoviedb.orgå人ç»</string>
+ <string id="30002">å¯ç¨é¢åç</string>
</strings>
diff --git a/metadata.douban.com/resources/language/English/strings.xml
b/metadata.douban.com/resources/language/English/strings.xml
index 88dac4b..ceb40e8 100644
--- a/metadata.douban.com/resources/language/English/strings.xml
+++ b/metadata.douban.com/resources/language/English/strings.xml
@@ -2,4 +2,5 @@
<strings>
<string id="30000">Enable posters from MoviePosterDB</string>
<string id="30001">Enable fanart from themoviedb.org</string>
+ <string id="30002">Enable Trailer</string>
</strings>
diff --git a/metadata.douban.com/resources/settings.xml
b/metadata.douban.com/resources/settings.xml
index 11d3b61..ad47d15 100644
--- a/metadata.douban.com/resources/settings.xml
+++ b/metadata.douban.com/resources/settings.xml
@@ -2,4 +2,5 @@
<settings>
<setting label="30000" type="bool" id="movieposterdb" default="false"/>
<setting label="30001" type="bool" id="tmdbfanart" default="false"/>
+ <setting label="30002" type="bool" id="trailer" default="true"/>
</settings>
-----------------------------------------------------------------------
Summary of changes:
metadata.douban.com/addon.xml | 2 +-
metadata.douban.com/changelog.txt | 16 +++++++++++++
metadata.douban.com/douban.xml | 24 ++++++++++----------
.../language/Chinese (Simple)/strings.xml | 1 +
.../resources/language/English/strings.xml | 1 +
metadata.douban.com/resources/settings.xml | 1 +
6 files changed, 32 insertions(+), 13 deletions(-)
create mode 100644 metadata.douban.com/changelog.txt
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_mar
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
![http://\1/img/celebrity/large/\2.jpg</thumb><name>\3</name></actor>"](http://\1/img/celebrity/large/\2.jpg</thumb><name>\3</name></actor>"){kind=link}