Merge branch 'refs/heads/develop'

couchpotato/core/plugins/base.py

@@ -127,7 +127,7 @@ class Plugin(object):
         return False
 
     # http request
-    def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True, return_raw = False):
+    def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True):
         url = urllib2.quote(ss(url), safe = "%/:=&?~#+!$,;'@()*[]")
 
         if not headers: headers = {}
@@ -172,7 +172,7 @@ class Plugin(object):
             log.info('Opening url: %s %s, data: %s', (method, url, [x for x in data.iterkeys()] if isinstance(data, dict) else 'with data'))
             response = r.request(method, url, verify = False, **kwargs)
 
-            data = response.content if return_raw else response.text
+            data = response.content
 
             self.http_failed_request[host] = 0
         except (IOError, MaxRetryError, Timeout):

couchpotato/core/plugins/file/main.py

@@ -93,7 +93,7 @@ class FileManager(Plugin):
             return dest
 
         try:
-            filedata = self.urlopen(url, return_raw = True, **urlopen_kwargs)
+            filedata = self.urlopen(url, **urlopen_kwargs)
         except:
             log.error('Failed downloading file %s: %s', (url, traceback.format_exc()))
             return False

couchpotato/core/providers/automation/imdb/main.py

@@ -25,7 +25,7 @@ class IMDBBase(Automation, RSS):
     interval = 1800
 
     def getInfo(self, imdb_id):
-        return fireEvent('movie.info', identifier = imdb_id, merge = True)
+        return fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True)
 
 
 class IMDBWatchlist(IMDBBase):

couchpotato/core/providers/base.py

@@ -164,7 +164,7 @@ class YarrProvider(Provider):
         try:
             if not self.login():
                 log.error('Failed downloading from %s', self.getName())
-            return self.urlopen(url, return_raw = True)
+            return self.urlopen(url)
         except:
             log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc()))
 
@@ -173,7 +173,7 @@ class YarrProvider(Provider):
 
     def download(self, url = '', nzb_id = ''):
         try:
-            return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False, return_raw = True)
+            return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False)
         except:
             log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc()))
 

couchpotato/core/providers/info/themoviedb/main.py

@@ -1,5 +1,6 @@
 from couchpotato.core.event import addEvent
 from couchpotato.core.helpers.encoding import simplifyString, toUnicode
+from couchpotato.core.helpers.variable import tryInt
 from couchpotato.core.logger import CPLog
 from couchpotato.core.providers.info.base import MovieProvider
 import tmdb3
@@ -66,7 +67,7 @@ class TheMovieDb(MovieProvider):
         if not identifier:
             return {}
 
-        cache_key = 'tmdb.cache.%s' % identifier
+        cache_key = 'tmdb.cache.%s%s' % (identifier, '.ex' if extended else '')
         result = self.getCache(cache_key)
 
         if not result:
@@ -88,7 +89,7 @@ class TheMovieDb(MovieProvider):
 
     def parseMovie(self, movie, extended = True):
 
-        cache_key = 'tmdb.cache.%s' % movie.id
+        cache_key = 'tmdb.cache.%s%s' % (movie.id, '.ex' if extended else '')
         movie_data = self.getCache(cache_key)
 
         if not movie_data:
@@ -137,7 +138,7 @@ class TheMovieDb(MovieProvider):
                 'imdb': movie.imdb,
                 'runtime': movie.runtime,
                 'released': str(movie.releasedate),
-                'year': year,
+                'year': tryInt(year, None),
                 'plot': movie.overview,
                 'genres': genres,
                 'collection': getattr(movie.collection, 'name', None),