diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-07-21 19:55:48 +0200 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2014-07-21 19:55:48 +0200 |
| commit | 0e6a30596b69346d734786decaefa95bad5620d1 (patch) | |
| tree | 6c4c292037abd9d692ec43c9c5197f5fba9dd0b9 | |
| parent | 7c1f6e8e4dff614f424539ff04ce4d31e7d1a867 (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 | 18 | ||||
| -rw-r--r-- | addons/metadata.common.fanart.tv/icon.png | bin | 0 -> 13639 bytes |
3 files changed, 10 insertions, 10 deletions
diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index fa70dc8673..2b79a85241 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.0.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..a590303270 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,10 +66,10 @@ <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> 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 |
