Use existing Trakt auth settings and other cleanup

couchpotato/core/notifications/trakt/main.py

@@ -1,14 +1,12 @@
 from couchpotato.core.logger import CPLog
 from couchpotato.core.notifications.base import Notification
-import json
-import urllib2
 
 log = CPLog(__name__)
 
 class Trakt(Notification):
 
     urls = {
-        'base': 'http://api.trakt.tv/',
+        'base': 'http://api.trakt.tv/%s',
         'library': 'movie/library/%s',
         'unwatchlist': 'movie/unwatchlist/%s',
     }
@@ -17,17 +15,17 @@ class Trakt(Notification):
 
     def notify(self, message = '', data = {}, listener = None):
         if self.isDisabled(): return
-        if not data: return
+
         post_data = {
             'username': self.conf('automation_username'),
             'password' : self.conf('automation_password'),
-            'movies': [ {
+            'movies': [{
                 'imdb_id': data['library']['identifier'],
                 'title': data['library']['titles'][0]['title'],
                 'year': data['library']['year']
-                } ]
-            }
-        result = False
+            }] if data else []
+        }
+
         result = self.call((self.urls['library'] % self.conf('automation_api_key')), post_data)
         if self.conf('remove_watchlist_enabled'):
             result = result and self.call((self.urls['unwatchlist'] % self.conf('automation_api_key')), post_data)
@@ -35,14 +33,15 @@ class Trakt(Notification):
         return result
 
     def call(self, method_url, post_data):
-        log.info('opening url: ' + self.urls['base'] + method_url + ', post: ' + str(post_data))
+
         try:
-            response = urllib2.urlopen(self.urls['base'] + method_url, json.dumps(post_data))
+            response = self.getJsonData(self.urls['base'] % method_url, params = post_data, cache_timeout = 1)
             if response:
-                if json.load(response).get('status') == "success":
+                if response.get('status') == "success":
                     log.info('Successfully called Trakt')
                     return True
         except:
             pass
+
         log.error('Failed to call trakt, check your login.')
-        return False
+        return False