Merge branch 'develop' of github.com:jaedb/Iris into develop

VERSION.md

@@ -1 +1 @@
-3.5.5
+3.6.1

mopidy_iris/__init__.py

@@ -13,7 +13,7 @@ from core import IrisCore
 from raven import Client
 
 logger = logging.getLogger(__name__)
-__version__ = '3.5.5'
+__version__ = '3.6.1'
 
 ##
 # Core extension class

mopidy_iris/core.py

@@ -93,7 +93,6 @@ class IrisCore(object):
         try:
             self.connections[connection_id]['connection'].write_message( json_encode(data) )
         except:
-            self.raven_client.captureException()
             logger.error('Failed to send message to '+ connection_id)
 
 
@@ -174,7 +173,6 @@ class IrisCore(object):
                     }
                 )
             except:
-                self.raven_client.captureException()
                 logger.error('Failed to close connection to '+ connection_id)           
 
     def set_username(self, *args, **kwargs):
@@ -201,7 +199,6 @@ class IrisCore(object):
 
         else:
             error = 'Connection "'+data['connection_id']+'" not found'
-            self.raven_client.captureMessage(error)
             logger.error(error)
 
             error = {
@@ -228,7 +225,6 @@ class IrisCore(object):
 
         else:
             error = 'Connection "'+data['connection_id']+'" not found'
-            self.raven_client.captureMessage(error)
             logger.error(error)
 
             error = {
@@ -287,7 +283,6 @@ class IrisCore(object):
             upgrade_available = ( upgrade_available == 1 )
 
         except urllib2.HTTPError as e:
-            self.raven_client.captureException(e)
             latest_version = '0.0.0'
             upgrade_available = False
         
@@ -318,7 +313,6 @@ class IrisCore(object):
                 return response
 
         except subprocess.CalledProcessError as e:
-            self.raven_client.captureException(e)
             error = {
                 'message': "Could not start upgrade"
             }
@@ -454,7 +448,6 @@ class IrisCore(object):
             token = token['access_token']
         except:
             error = 'IrisFrontend: access_token missing or invalid'
-            self.raven_client.captureMessage(error)
             logger.error(error)
             return False
             
@@ -478,7 +471,6 @@ class IrisCore(object):
             return uris
 
         except:
-            self.raven_client.captureException()
             logger.error('IrisFrontend: Failed to fetch Spotify recommendations')
             return False
 
@@ -632,7 +624,6 @@ class IrisCore(object):
                 return response
 
         except urllib2.HTTPError as e:
-            self.raven_client.captureException()
             error = json.loads(e.read())
             error = {'message': 'Could not refresh token: '+error['error_description']}
 
@@ -657,7 +648,6 @@ class IrisCore(object):
         try:
             data = kwargs.get('data', {})
         except:
-            self.raven_client.captureException()
             callback(False, {
                 'message': 'Malformed data',
                 'source': 'proxy_request'
@@ -666,7 +656,6 @@ class IrisCore(object):
 
         # Our request includes data, so make sure we POST the data
         if 'url' not in data:
-            self.raven_client.captureException()
             callback(False, {
                 'message': 'Malformed data (missing URL)',
                 'source': 'proxy_request',

mopidy_iris/handlers.py

@@ -114,7 +114,7 @@ class WebsocketHandler(tornado.websocket.WebSocketHandler):
             data['request_id'] = request_id
 
             # Log error with Sentry
-            mem.iris.raven_client.captureMessage(error.message)
+            #mem.iris.raven_client.captureMessage(data.message)
 
         # We've been handed an AsyncHTTPClient callback. This is the case
         # when our request calls subsequent external requests (eg Spotify, Genius)
@@ -198,7 +198,7 @@ class HttpHandler(tornado.web.RequestHandler):
             data['status'] = 0
 
             # Log error with Sentry
-            mem.iris.raven_client.captureMessage(data.message)
+            #mem.iris.raven_client.captureMessage(data.message)
 
 
         # We've been handed an AsyncHTTPClient callback. This is the case

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mopidy-iris",
-	"version": "3.5.5",
+	"version": "3.6.1",
 	"description": "Mopidy HTTP interface",
 	"repository": "https://github.com/jaedb/iris",
 	"author": "James Barnsley <james@barnsley.nz>",

src/js/services/spotify/actions.js

@@ -1462,7 +1462,7 @@ export function getPlaylist(uri){
                     response,
                     {
                         can_edit: (getState().spotify.me && response.owner.id == getState().spotify.me.id),
-                        tracks: response.tracks.items,
+                        tracks: helpers.formatTracks(response.tracks.items),
                         tracks_more: response.tracks.next,
                         tracks_total: response.tracks.total,
                         description: description