Prioritize image info

couchpotato/core/media/movie/providers/info/couchpotatoapi.py

@@ -29,7 +29,7 @@ class CouchPotatoApi(MovieProvider):
     api_version = 1
 
     def __init__(self):
-        addEvent('movie.info', self.getInfo, priority = 1)
+        addEvent('movie.info', self.getInfo, priority = 2)
         addEvent('movie.info.release_date', self.getReleaseDate)
 
         addEvent('info.search', self.search, priority = 1)

couchpotato/core/media/movie/providers/info/fanarttv.py

@@ -14,7 +14,7 @@ autoload = 'FanartTV'
 class FanartTV(MovieProvider):
 
     urls = {
-        'api': 'http://api.fanart.tv/webservice/movie/%s/%s/JSON/all/1/2'
+        'api': 'http://api.fanart.tv/webservice/movie/b28b14e9be662e027cfbc7c3dd600405/%s/JSON/all/1/2'
     }
 
     MAX_EXTRAFANART = 20
@@ -31,7 +31,7 @@ class FanartTV(MovieProvider):
         images = {}
 
         try:
-            url = self.urls['api'] % (self.conf('api_key'), identifier)
+            url = self.urls['api'] % identifier
             fanart_data = self.getJsonData(url)
 
             if fanart_data:
@@ -132,24 +132,3 @@ class FanartTV(MovieProvider):
             log.error('No API key provided.')
             return True
         return False
-
-
-config = [{
-    'name': 'fanarttv',
-    'groups': [
-        {
-            'tab': 'providers',
-            'name': 'fanarttv',
-            'label': 'fanart.tv',
-            'hidden': True,
-            'description': 'Used for all calls to fanart.tv.',
-            'options': [
-                {
-                    'name': 'api_key',
-                    'default': 'd788b4822b9e1f44068026e05557e5d9',
-                    'label': 'API Key',
-                },
-            ],
-        },
-    ],
-}]

couchpotato/core/media/movie/providers/info/themoviedb.py

@@ -16,7 +16,7 @@ class TheMovieDb(MovieProvider):
     MAX_EXTRATHUMBS = 4
 
     def __init__(self):
-        addEvent('movie.info', self.getInfo, priority = 2)
+        addEvent('movie.info', self.getInfo, priority = 3)
         addEvent('movie.info_by_tmdb', self.getInfo)
 
         # Configure TMDB settings
@@ -88,13 +88,6 @@ class TheMovieDb(MovieProvider):
             except:
                 log.error('Failed getting info for %s: %s', (identifier, traceback.format_exc()))
 
-        # Get extra artwork via Fanart.TV and merge into images dict
-        try:
-            extra_art = fireEvent('movie.extra_art', identifier)[0]
-            result['images'] = dict(result['images'].items() + extra_art.items())
-        except IndexError:
-            pass
-
         return result
 
     def parseMovie(self, movie, extended = True):