diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-07-24 18:53:04 +0200 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-07-24 18:53:04 +0200 |
| commit | b1c18a218d52934d0ac7a75d1d61d3d0584434dc (patch) | |
| tree | 7e6632d769e51cfe66c776c3105febe56b4a42f0 | |
| parent | 0e6a30596b69346d734786decaefa95bad5620d1 (diff) | |
[addons] sync with repo
| -rw-r--r-- | addons/metadata.common.fanart.tv/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.fanart.tv/fanarttv.xml | 65 |
2 files changed, 63 insertions, 4 deletions
diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index 2b79a85241..8f05b79ea0 100644 --- a/addons/metadata.common.fanart.tv/addon.xml +++ b/addons/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/addons/metadata.common.fanart.tv/fanarttv.xml b/addons/metadata.common.fanart.tv/fanarttv.xml index a590303270..3f3d2871de 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/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> |