The branch, dharma has been updated
via 30636ea5e56914d48bde8ee5aaacdbff887b4867 (commit)
from 6aa200e35aad50d1d311d5f8c0151c1c34343a03 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=30636ea5e56914d48bde8ee5aaacdbff887b4867
commit 30636ea5e56914d48bde8ee5aaacdbff887b4867
Author: taxigps <[email protected]>
Date: Tue May 21 14:16:59 2013 +0800
[metadata.douban.com] updated to version 1.0.6
diff --git a/metadata.douban.com/addon.xml b/metadata.douban.com/addon.xml
index 5469231..c2bc2c3 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.5"
+ version="1.0.6"
provider-name="Taxigps">
<requires>
<import addon="xbmc.metadata" version="1.0"/>
diff --git a/metadata.douban.com/changelog.txt
b/metadata.douban.com/changelog.txt
index 92bb00b..c0f9ce3 100644
--- a/metadata.douban.com/changelog.txt
+++ b/metadata.douban.com/changelog.txt
@@ -1,3 +1,6 @@
+[B]1.0.6[/B]
+- fixed: can't get full information by imdb id (nfo)
+
[B]1.0.5[/B]
- fixed: support decimal in rating
diff --git a/metadata.douban.com/douban.xml b/metadata.douban.com/douban.xml
index 82089a1..8e949cc 100644
--- a/metadata.douban.com/douban.xml
+++ b/metadata.douban.com/douban.xml
@@ -1,21 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scraper framework="1.1" date="2012-04-02">
- <CreateSearchUrl dest="3">
- <RegExp input="$$1"
output="<url>http://movie.douban.com/j/subject_suggest?q=\1</url>";
dest="3">
- <expression noclean="1"/>
- </RegExp>
- </CreateSearchUrl>
+<scraper framework="1.1" date="2013-05-21">
<NfoUrl dest="3">
- <RegExp input="$$1"
output="<details><url>http://api.douban.com/v2/movie/imdb/tt\1</url><id>tt\1</id></details>";
dest="3">
+ <RegExp input="$$1" output="<details><url
function="GetUrlByIMDBId">http://movie.douban.com/j/subject_suggest?q=tt\1</url><details>";
dest="3">
<expression>imdb....?/title/tt([0-9]*)</expression>
</RegExp>
- <RegExp input="$$1"
output="<details><url>http://api.douban.com/v2/movie/imdb/tt\1</url><id>tt\1</id></details>";
dest="3">
+ <RegExp input="$$1" output="<details><url
function="GetUrlByIMDBId">http://movie.douban.com/j/subject_suggest?q=tt\1</url><details>";
dest="3+">
<expression>imdb....?/Title\?([0-9]*)</expression>
</RegExp>
</NfoUrl>
+ <GetUrlByIMDBId dest="3">
+ <RegExp input="$$1"
output="<details><url>http://api.douban.com/v2/movie/subject/\1</url><id>\1</id><details>";
dest="3">
+
<expression>"url":"http:\\/\\/movie.douban.com\\/subject\\/([0-9]+)\\/[^"]*"</expression>
+ </RegExp>
+ </GetUrlByIMDBId>
+ <CreateSearchUrl dest="3">
+ <RegExp input="$$1"
output="<url>http://movie.douban.com/j/subject_suggest?q=\1</url>";
dest="3">
+ <expression noclean="1"/>
+ </RegExp>
+ </CreateSearchUrl>
<GetSearchResults dest="8">
<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+">
+ <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+">
<expression
repeat="yes">"title":"(.+?)","url":"http:\\/\\/movie.douban.com\\/subject\\/([0-9]+)\\/[^"]*","sub_title":"(.*?)","year":"([0-9]+)"</expression>
</RegExp>
<expression noclean="1"/>
@@ -23,7 +28,7 @@
</GetSearchResults>
<GetDetails dest="3">
<RegExp input="$$5" output="<details>\1</details>"
dest="3">
- <RegExp input="$$3" output="<id>\1</id>"
dest="5">
+ <RegExp input="$$2" output="<id>\1</id>"
dest="5">
<expression/>
</RegExp>
<RegExp input="$$1"
output="<title>\1</title>" dest="5+">
@@ -65,27 +70,38 @@
<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="$$2"
output="<chain
function="GetMoviePosterDBThumbs">tt\1</chain>" dest="5+">
-
<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
- </RegExp>
- <RegExp input="$$3" output="<url
cache="\1-poster.html"
function="GetPoster">http://movie.douban.com/subject/\1/photos?type=R</url>";
dest="5+">
+ <RegExp input="$$2" 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="$$2"
output="<chain
function="GetTMDBFanartByIdChain">tt\1</chain>" dest="5+">
-
<expression>http://www.imdb.com/title/tt([0-9]+)</expression>
+ <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+">
+ <expression/>
</RegExp>
- <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+">
+ <RegExp input="$$2" output="<url
function="GetDetailsByIMDBId">http://movie.douban.com/subject/\1</url>";
dest="5+">
<expression/>
</RegExp>
<expression noclean="1"/>
</RegExp>
</GetDetails>
+ <GetDetailsByIMDBId dest="5">
+ <RegExp input="$$6" output="<details>\1</details>"
dest="5">
+ <RegExp conditional="trailer" input="$$1"
output="<trailer>http://movie.douban.com/trailer/video_url?tid=\1</trailer>";
dest="6">
+
<expression>http://movie.douban.com/trailer/([0-9]+)</expression>
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="8">
+
<expression>http://www.imdb.com/title/(tt[0-9]+)</expression>
+ </RegExp>
+ <RegExp conditional="movieposterdb" input="$$8"
output="<chain
function="GetMoviePosterDBThumbs">\1</chain>" dest="6+">
+ <expression/>
+ </RegExp>
+ <RegExp conditional="tmdbfanart" input="$$8"
output="<chain
function="GetTMDBFanartByIdChain">\1</chain>" dest="6+">
+ <expression/>
+ </RegExp>
+ <expression noclean="1"/>
+ </RegExp>
+ </GetDetailsByIMDBId>
<GetPoster dest="5">
<RegExp input="$$6" output="<details>\1</details>"
dest="5">
<RegExp input="$$1" output="<thumb
preview="\1thumb\2">\1raw\2</thumb>" dest="6">
-----------------------------------------------------------------------
Summary of changes:
metadata.douban.com/addon.xml | 2 +-
metadata.douban.com/changelog.txt | 3 ++
metadata.douban.com/douban.xml | 56 +++++++++++++++++++++++-------------
3 files changed, 40 insertions(+), 21 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
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}