[addons] sync with repo

diff --git a/addons/metadata.common.fanart.tv/addon.xml b/addons/metadata.common.fanart.tv/addon.xml
index fa70dc8..2b79a85 100644 (file)
--- 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 758a3b2..a590303 100644 (file)
--- 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="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistThumbs&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://api.fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistThumbs&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://webservice.fanart.tv/v3/music/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/&lt;/url&gt;&lt;/details&gt;" dest="5">
                        <expression noclean="1" />
                </RegExp>
        </GetFanartTvArtistThumbsByMBID>
@@ -14,17 +14,17 @@
                                <expression />
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="16">
-                               <expression noclean="1">&quot;artistthumb&quot;:\[(.*?)\}\]</expression>
+                               <expression noclean="1">&quot;artistthumb&quot;:\s\[(.*?)\}\s*\],</expression>
                        </RegExp>
                        <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
-                               <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
+                               <expression repeat="yes" noclean="1">&quot;id&quot;:\s&quot;\d*&quot;,\s*&quot;url&quot;:\s&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>
        </ParseFanartTvArtistThumbs>
 
        <GetFanartTvArtistFanartsByMBID dest="5" clearbuffers="no">
-               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistFanarts&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://api.fanart.tv/webservice/artist/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvArtistFanarts&quot; cache=&quot;fanarttv-artistimages-\1.json&quot;&gt;http://webservice.fanart.tv/v3/music/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/&lt;/url&gt;&lt;/details&gt;" dest="5">
                        <expression noclean="1" />
                </RegExp>
        </GetFanartTvArtistFanartsByMBID>
@@ -40,10 +40,10 @@
                                <expression />
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="16">
-                               <expression noclean="1">&quot;artistbackground&quot;:\[(.*?)\}\]</expression>
+                               <expression noclean="1">&quot;artistbackground&quot;:\s\[(.*?)\}\s*\],</expression>
                        </RegExp>
                        <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="14">
-                               <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
+                               <expression repeat="yes" noclean="1">&quot;id&quot;:\s&quot;\d*&quot;,\s*&quot;url&quot;:\s&quot;([^&quot;]*)</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="&lt;details&gt;&lt;url function=&quot;ParseFanartTvAlbumThumbs&quot; cache=&quot;fanarttv-albumimages-\1.json&quot;&gt;http://api.fanart.tv/webservice/album/ed4b784f97227358b31ca4dd966a04f1/\1/json/&lt;/url&gt;&lt;/details&gt;" dest="5">
+               <RegExp input="$$1" output="&lt;details&gt;&lt;url function=&quot;ParseFanartTvAlbumThumbs&quot; cache=&quot;fanarttv-albumimages-\1.json&quot;&gt;http://webservice.fanart.tv/v3/music/albums/\1?api_key=ed4b784f97227358b31ca4dd966a04f1/&lt;/url&gt;&lt;/details&gt;" dest="5">
                        <expression noclean="1" />
                </RegExp>
        </GetFanartTvAlbumThumbsByMBID>
@@ -66,10 +66,10 @@
                                <expression />
                        </RegExp>
                        <RegExp input="$$1" output="\1" dest="16">
-                               <expression noclean="1">&quot;albumcover&quot;:\[(.*?)\]\}</expression>
+                               <expression noclean="1">&quot;albumcover&quot;:\s\[(.*?)\}\s*\],</expression>
                        </RegExp>
                        <RegExp input="$$16" output="&lt;thumb preview=&quot;\1/preview&quot;&gt;\1&lt;/thumb&gt;" dest="13">
-                               <expression repeat="yes" noclean="1">&quot;id&quot;:&quot;\d*&quot;,&quot;url&quot;:&quot;([^&quot;]*)</expression>
+                               <expression repeat="yes" noclean="1">&quot;id&quot;:\s&quot;\d*&quot;,\s*&quot;url&quot;:\s&quot;([^&quot;]*)</expression>
                        </RegExp>
                        <expression noclean="1" />
                </RegExp>

diff --git a/addons/metadata.common.fanart.tv/icon.png b/addons/metadata.common.fanart.tv/icon.png
new file mode 100644 (file)
index 0000000..6384238
Binary files /dev/null and b/addons/metadata.common.fanart.tv/icon.png differ