The branch, frodo has been updated
via 6e52602aed9bf555c26d16d7f8a9f5fd2d713df0 (commit)
from 7d81c1b7a4b7d2e07729d5f027eb00148c0f5172 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scrapers;a=commit;h=6e52602aed9bf555c26d16d7f8a9f5fd2d713df0
commit 6e52602aed9bf555c26d16d7f8a9f5fd2d713df0
Author: olympia <[email protected]>
Date: Thu Jul 24 12:11:07 2014 +0200
[metadata.common.fanart.tv] updated to version 3.1.0
diff --git a/metadata.common.fanart.tv/addon.xml
b/metadata.common.fanart.tv/addon.xml
index 2b79a85..8f05b79 100644
--- a/metadata.common.fanart.tv/addon.xml
+++ b/metadata.common.fanart.tv/addon.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="metadata.common.fanart.tv"
name="fanart.tv"
- version="3.0.0"
+ version="3.1.0"
provider-name="Team XBMC">
<requires>
<import addon="xbmc.metadata" version="2.1.0"/>
diff --git a/metadata.common.fanart.tv/fanarttv.xml
b/metadata.common.fanart.tv/fanarttv.xml
index a590303..3f3d287 100644
--- a/metadata.common.fanart.tv/fanarttv.xml
+++ b/metadata.common.fanart.tv/fanarttv.xml
@@ -14,7 +14,7 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="16">
- <expression
noclean="1">"artistthumb":\s\[(.*?)\}\s*\],</expression>
+ <expression
noclean="1">"artistthumb":\s\[(.*?)\}\s*\]</expression>
</RegExp>
<RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
<expression repeat="yes"
noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression>
@@ -40,7 +40,7 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="16">
- <expression
noclean="1">"artistbackground":\s\[(.*?)\}\s*\],</expression>
+ <expression
noclean="1">"artistbackground":\s\[(.*?)\}\s*\]</expression>
</RegExp>
<RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="14">
<expression repeat="yes"
noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression>
@@ -66,7 +66,7 @@
<expression />
</RegExp>
<RegExp input="$$1" output="\1" dest="16">
- <expression
noclean="1">"albumcover":\s\[(.*?)\}\s*\],</expression>
+ <expression
noclean="1">"albumcover":\s\[(.*?)\}\s*\]</expression>
</RegExp>
<RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
<expression repeat="yes"
noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression>
@@ -74,4 +74,63 @@
<expression noclean="1" />
</RegExp>
</ParseFanartTvAlbumThumbs>
+
+ <GetFanartTvFanartByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseFanartTvFanart"
cache="fanarttv-\1.json">http://webservice.fanart.tv/v3/movies/\1?api_key=ed4b784f97227358b31ca4dd966a04f1</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetFanartTvFanartByIdChain>
+ <ParseFanartTvFanart dest="5">
+ <RegExp input="$$13"
output="<details><fanart>\1</fanart></details>"
dest="5">
+ <RegExp input="" output="" dest="13">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="14">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression
noclean="1">"moviebackground":\s\[(.*?)\}\s*\]</expression>
+ </RegExp>
+ <RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="14">
+ <expression repeat="yes"
noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression>
+ </RegExp>
+ <RegExp input="$$14" output="\1" dest="13">
+ <expression noclean="1">(.+)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFanartTvFanart>
+
+ <GetFanartTvThumbsByIdChain dest="4">
+ <RegExp input="$$5" output="<details>\1</details>"
dest="4">
+ <RegExp input="$$1" output="<url
function="ParseFanartTvThumbs"
cache="fanarttv-\1.json">http://webservice.fanart.tv/v3/movies/\1?api_key=ed4b784f97227358b31ca4dd966a04f1</url>";
dest="5">
+ <expression />
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </GetFanartTvThumbsByIdChain>
+ <ParseFanartTvThumbs dest="5">
+ <RegExp input="$$13" output="<details>\1</details>"
dest="5">
+ <RegExp input="" output="" dest="13">
+ <expression />
+ </RegExp>
+ <RegExp input="" output="" dest="16">
+ <expression />
+ </RegExp>
+ <RegExp input="$$1" output="\1" dest="16">
+ <expression
noclean="1">"movieposter":\s\[(.*?)\}\s*\]</expression>
+ </RegExp>
+ <RegExp input="$$16" output="<thumb
preview="\1/preview">\1</thumb>" dest="13">
+ <expression repeat="yes"
noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression>
+ </RegExp>
+ <expression noclean="1" />
+ </RegExp>
+ </ParseFanartTvThumbs>
+
</scraperfunctions>
-----------------------------------------------------------------------
Summary of changes:
metadata.common.fanart.tv/addon.xml | 2 +-
metadata.common.fanart.tv/fanarttv.xml | 65 ++++++++++++++++++++++++++++++-
2 files changed, 63 insertions(+), 4 deletions(-)
hooks/post-receive
--
Scrapers
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
