diff options
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/metadata.common.fanart.tv/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.fanart.tv/fanarttv.xml | 77 | ||||
| -rw-r--r-- | addons/metadata.common.fanart.tv/icon.png | bin | 0 -> 13639 bytes |
3 files changed, 69 insertions, 10 deletions
diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index fa70dc8673..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="2.1.3" + 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 758a3b20f8..3f3d2871de 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/metadata.common.fanart.tv/fanarttv.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <scraperfunctions> <GetFanartTvArtistThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.json">http://api.fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.json">http://webservice.fanart.tv/v3/music/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistThumbsByMBID> @@ -14,17 +14,17 @@ <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="16"> - <expression noclean="1">"artistthumb":\[(.*?)\}\]</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":"\d*","url":"([^"]*)</expression> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseFanartTvArtistThumbs> <GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.json">http://api.fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.json">http://webservice.fanart.tv/v3/music/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistFanartsByMBID> @@ -40,10 +40,10 @@ <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="16"> - <expression noclean="1">"artistbackground":\[(.*?)\}\]</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":"\d*","url":"([^"]*)</expression> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> </RegExp> <RegExp input="$$14" output="\1" dest="13"> <expression noclean="1">(.+)</expression> @@ -53,7 +53,7 @@ </ParseFanartTvArtistFanarts> <GetFanartTvAlbumThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.json">http://api.fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.json">http://webservice.fanart.tv/v3/music/albums/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvAlbumThumbsByMBID> @@ -66,12 +66,71 @@ <expression /> </RegExp> <RegExp input="$$1" output="\1" dest="16"> - <expression noclean="1">"albumcover":\[(.*?)\]\}</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":"\d*","url":"([^"]*)</expression> + <expression repeat="yes" noclean="1">"id":\s"\d*",\s*"url":\s"([^"]*)</expression> </RegExp> <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> diff --git a/addons/metadata.common.fanart.tv/icon.png b/addons/metadata.common.fanart.tv/icon.png Binary files differnew file mode 100644 index 0000000000..638423856c --- /dev/null +++ b/addons/metadata.common.fanart.tv/icon.png |
