diff options
| author | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-11-14 21:54:32 +0100 |
|---|---|---|
| committer | Martijn Kaijser <mcm.kaijser@gmail.com> | 2012-11-14 21:54:32 +0100 |
| commit | 64d3b8e87d681c91553fa296a65f77bb3786a67e (patch) | |
| tree | f3ff630691506a64c1887ed8066e33dd351dcc2c /addons/metadata.common.fanart.tv | |
| parent | 37e8e4ecf7fbc78dbb2c7cd338cdd0f7e8a620c9 (diff) | |
[scrapers] sync master with current scraper repo
Diffstat (limited to 'addons/metadata.common.fanart.tv')
| -rw-r--r-- | addons/metadata.common.fanart.tv/addon.xml | 2 | ||||
| -rw-r--r-- | addons/metadata.common.fanart.tv/fanarttv.xml | 36 |
2 files changed, 28 insertions, 10 deletions
diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml index 0d605468e9..aef91fcc3e 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="1.1.0" + version="2.0.0" provider-name="Team XBMC"> <requires> <import addon="xbmc.metadata" version="1.0"/> diff --git a/addons/metadata.common.fanart.tv/fanarttv.xml b/addons/metadata.common.fanart.tv/fanarttv.xml index f5b6faf364..d837a1bf80 100644 --- a/addons/metadata.common.fanart.tv/fanarttv.xml +++ b/addons/metadata.common.fanart.tv/fanarttv.xml @@ -1,6 +1,6 @@ <scraperfunctions> <GetFanartTvArtistThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistThumbs" cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistThumbsByMBID> @@ -9,15 +9,21 @@ <RegExp input="" output="" dest="13"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1"><artistthumb id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"artistthumb":\[(.*?)\],"</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> </ParseFanartTvArtistThumbs> <GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.xml">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvArtistFanarts" cache="fanarttv-artistimages-\1.json">http://fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvArtistFanartsByMBID> @@ -29,8 +35,14 @@ <RegExp input="" output="" dest="14"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> - <expression repeat="yes" noclean="1"><artistbackground id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"artistbackground":\[(.*?)\],"</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="14"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <RegExp input="$$14" output="\1" dest="13"> <expression noclean="1">(.+)</expression> @@ -40,7 +52,7 @@ </ParseFanartTvArtistFanarts> <GetFanartTvAlbumThumbsByMBID dest="5" clearbuffers="no"> - <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.xml">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/xml/</url></details>" dest="5"> + <RegExp input="$$1" output="<details><url function="ParseFanartTvAlbumThumbs" cache="fanarttv-albumimages-\1.json">http://fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/</url></details>" dest="5"> <expression noclean="1" /> </RegExp> </GetFanartTvAlbumThumbsByMBID> @@ -49,8 +61,14 @@ <RegExp input="" output="" dest="13"> <expression /> </RegExp> - <RegExp input="$$1" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> - <expression repeat="yes" noclean="1"><albumcover id="[^"]*" url="([^"]*)</expression> + <RegExp input="" output="" dest="16"> + <expression /> + </RegExp> + <RegExp input="$$1" output="\1" dest="16"> + <expression noclean="1">"albumcover":\[(.*?)\]\}</expression> + </RegExp> + <RegExp input="$$16" output="<thumb preview="\1/preview">\1</thumb>" dest="13"> + <expression repeat="yes" noclean="1">"id":"\d*","url":"([^"]*)</expression> </RegExp> <expression noclean="1" /> </RegExp> |