The branch, frodo has been updated
via d1bd74a30055bea2de5437bf59ca6159c05cba9f (commit)
from 88c02c3b7092d5ae8ef3d963dbd7d6f8ca2de091 (commit)
- Log -----------------------------------------------------------------
http://xbmc.git.sourceforge.net/git/gitweb.cgi?p=xbmc/scripts;a=commit;h=d1bd74a30055bea2de5437bf59ca6159c05cba9f
commit d1bd74a30055bea2de5437bf59ca6159c05cba9f
Author: Martijn Kaijser <[email protected]>
Date: Sat Jul 19 11:41:34 2014 +0200
[script.artwork.downloader] 12.0.29
diff --git a/script.artwork.downloader/addon.xml
b/script.artwork.downloader/addon.xml
index b5aeb5b..98cffce 100644
--- a/script.artwork.downloader/addon.xml
+++ b/script.artwork.downloader/addon.xml
@@ -2,7 +2,7 @@
<addon
id="script.artwork.downloader"
name="Artwork Downloader"
- version="12.0.28"
+ version="12.0.29"
provider-name="Martijn"
>
<requires>
diff --git a/script.artwork.downloader/changelog.txt
b/script.artwork.downloader/changelog.txt
index d65a794..38640e9 100644
--- a/script.artwork.downloader/changelog.txt
+++ b/script.artwork.downloader/changelog.txt
@@ -1,3 +1,6 @@
+v12.0.29
+- Update to fanart.tv API v3
+
v12.0.28
- Don't set simplejson module to optional
diff --git a/script.artwork.downloader/lib/provider/fanarttv.py
b/script.artwork.downloader/lib/provider/fanarttv.py
index cf4cb63..0bdb69e 100644
--- a/script.artwork.downloader/lib/provider/fanarttv.py
+++ b/script.artwork.downloader/lib/provider/fanarttv.py
@@ -32,25 +32,29 @@ from operator import itemgetter
__localize__ = ( sys.modules[ '__main__' ].__localize__ )
API_KEY = '586118be1ac673f74963cc284d46bd8e'
-API_URL_TV = 'http://api.fanart.tv/webservice/series/%s/%s/json/all/1/2'
-API_URL_MOVIE = 'http://api.fanart.tv/webservice/movie/%s/%s/json/all/1/2/'
+API_URL_TV = 'http://webservice.fanart.tv/v3/tv/%s?api_key=%s'
+API_URL_MOVIE = 'http://webservice.fanart.tv/v3/movies/%s?api_key=%s'
-IMAGE_TYPES = ['clearlogo',
- 'hdtvlogo',
- 'clearart',
- 'hdclearart',
- 'tvthumb',
- 'seasonthumb',
- 'characterart',
- 'tvbanner',
- 'seasonbanner',
- 'movielogo',
- 'hdmovielogo',
- 'movieart',
- 'moviedisc',
- 'hdmovieclearart',
- 'moviethumb',
- 'moviebanner']
+IMAGE_TYPES_MOVIES = ['clearlogo',
+ 'clearart',
+ 'hdclearart',
+ 'movielogo',
+ 'hdmovielogo',
+ 'movieart',
+ 'moviedisc',
+ 'hdmovieclearart',
+ 'moviethumb',
+ 'moviebanner']
+
+IMAGE_TYPES_SERIES = ['clearlogo',
+ 'hdtvlogo',
+ 'clearart',
+ 'hdclearart',
+ 'tvthumb',
+ 'seasonthumb',
+ 'characterart',
+ 'tvbanner',
+ 'seasonbanner']
class FTV_TVProvider():
@@ -58,16 +62,16 @@ class FTV_TVProvider():
self.name = 'fanart.tv - TV API'
def get_image_list(self, media_id):
- data = get_data(API_URL_TV%(API_KEY,media_id), 'json')
+ data = get_data(API_URL_TV%(media_id, API_KEY), 'json')
image_list = []
if data == 'Empty' or not data:
return image_list
else:
# split 'name' and 'data'
- for title, value in data.iteritems():
- for art in IMAGE_TYPES:
- if value.has_key(art):
- for item in value[art]:
+ for value in data.iteritems():
+ for art in IMAGE_TYPES_SERIES:
+ if art == value[0]:
+ for item in value[1]:
# Check on what type and use the general tag
arttypes = {'clearlogo': 'clearlogo',
'hdtvlogo': 'clearlogo',
@@ -117,16 +121,15 @@ class FTV_MovieProvider():
self.name = 'fanart.tv - Movie API'
def get_image_list(self, media_id):
- data = get_data(API_URL_MOVIE%(API_KEY, media_id), 'json')
+ data = get_data(API_URL_MOVIE%(media_id, API_KEY), 'json')
image_list = []
if data == 'Empty' or not data:
return image_list
else:
- # split 'name' and 'data'
- for title, value in data.iteritems():
- for art in IMAGE_TYPES:
- if value.has_key(art):
- for item in value[art]:
+ for value in data.iteritems():
+ for art in IMAGE_TYPES_MOVIES:
+ if art == value[0]:
+ for item in value[1]:
# Check on what type and use the general tag
arttypes = {'movielogo': 'clearlogo',
'moviedisc': 'discart',
-----------------------------------------------------------------------
Summary of changes:
script.artwork.downloader/addon.xml | 2 +-
script.artwork.downloader/changelog.txt | 3 +
script.artwork.downloader/lib/provider/fanarttv.py | 61 ++++++++++---------
3 files changed, 36 insertions(+), 30 deletions(-)
hooks/post-receive
--
Scripts
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
