Upgrade detection on connection, and then flush caches

Author: jaedb

mopidy_spotmop/__init__.py

@@ -10,7 +10,7 @@
 from services.pusher import pusher
 from mopidy import config, ext
 
-__version__ = '2.5.6'
+__version__ = '2.5.7'
 __ext_name__ = 'spotmop'
 __verbosemode__ = False
 
@@ -51,16 +51,26 @@ def spotmop_client_factory(config, core):
     # PUSHER: TODO: need to fire this up from within the PusherHandler class... somehow
     pusherport = str(config['spotmop']['pusherport'])
     application = tornado.web.Application([
-        ('/pusher', pusher.PusherHandler),
+        ('/pusher', pusher.PusherHandler, {
+                'version': __version__
+            }),
     ])
     application.listen(pusherport)
     logger.info( 'Pusher server running on []:'+ str(pusherport) )
 
     return [
-		('/upgrade', upgrade.UpgradeRequestHandler, {'core': core, 'config': config, 'version': __version__ }),
-		('/pusher/([^/]+)', pusher.PusherRequestHandler, {'core': core, 'config': config, 'version': __version__ }),
+		('/upgrade', upgrade.UpgradeRequestHandler, {
+				'core': core,
+				'config': config,
+				'version': __version__ 
+			}),
+		('/pusher/([^/]+)', pusher.PusherRequestHandler, {
+				'core': core,
+				'config': config,
+				'version': __version__
+			}),
         (r'/(.*)', tornado.web.StaticFileHandler, {
-            "path": spotmoppath,
-            "default_filename": "index.html"
-        }),
+				"path": spotmoppath,
+				"default_filename": "index.html"
+			}),
     ]

mopidy_spotmop/services/pusher/pusher.py

@@ -12,16 +12,19 @@ class PusherHandler(tornado.websocket.WebSocketHandler):
 
   def check_origin(self, origin):
     return True
+
+  def initialize(self, version):
+    self.version = version
 
   def open(self):
-    created = datetime.strftime(datetime.now(), '%Y-%m-%d %H:%M:%S')
-    self.id = str(uuid.uuid4())
+    created = datetime.strftime(datetime.now(), '%Y-%m-%d %H:%M:%S')    
+    self.id = str(uuid.uuid4().hex)
     self.details = {"id": self.id, "ip": self.request.remote_ip, "name": "User", "created": created}
     clients[self.id] = { 'details': self.details, 'connection': self}
 
     # send a message to the client with it's assigned details
-    connectedMessage = '{"pusher": "true", "startup": "true", "details": '+ json_encode(self.details) +'}'
-    self.write_message( connectedMessage )
+    connectedMessage = '{"pusher": "true", "startup": "true", "details": '+ json_encode(self.details) +', "version": "'+self.version+'"}'
+    logger.info( connectedMessage )
     logger.debug( 'New Spotmop Pusher connection: '+ self.id )
 
   def on_message(self, message):
@@ -53,24 +56,29 @@ def initialize(self, core, config, version):
     def get(self, action):
 
         if action == 'me':
-            id = self.get_argument('id','')
-            name = self.get_argument('name','')
+            id = self.get_argument('id','id')
+            name = self.get_argument('name','name')
 
             # save the payload name to the client list
-            clients[id]['details']['name'] = name
-            
-            # return the updated client details
-            self.write( '{"status":"ok"}' )
+            if id in clients:
+                clients[id]['details']['name'] = name
+                self.write( '{"status":"ok"}' )
+            else:
+                self.write( '{"status":"error","message":"Client does not exist"}' )
 
         elif action == 'connections':
             clientDetailsList = []
             for client in clients.itervalues():
                 clientDetailsList.append(client['details'])
             self.write(json_encode(clientDetailsList))
 
-def spotmop_pusher_factory(config, core):
+def spotmop_pusher_factory(config, core, version):
     return [
-        ('/', PusherRequestHandler, {'core': core, 'config': config})
+        ('/', PusherRequestHandler, {
+                'core': core,
+                'config': config,
+                'version': version
+            })
     ]
 
 

mopidy_spotmop/services/upgrade/upgrade.py

@@ -20,15 +20,15 @@ def initialize(self, core, config, version):
 
 	# check if we're able to upgrade, and what our current version is
     def get(self):
-		self.write(json_encode({'root': self.isroot, 'currentVersion': self.version, 'latestVersion': '2.5.7'}))
+		self.write(json_encode({'root': self.isroot, 'currentVersion': self.version}))
 
     def post(self):
         if not self.isroot:
 			status = 'error'
 			message = 'Mopidy needs to run as root user to perform upgrades'
         else:
             try:
-				subprocess.check_call(["pip", "install", "--upgrade", "mopidy-spotmop"])
+				subprocess.check_call(["pip", "install", "--upgrade", "Mopidy-Spotmop"])
 				status = 'success'
 				message = 'Upgrade succesful'
             except subprocess.CalledProcessError:

src/app/common/tracklist/tltrack.template.html

@@ -5,7 +5,7 @@
 		<i class="fa fa-square-o" ng-show="!track.selected"></i>
 	</div>
 
-	<div class="col w30 title"><span ng-bind="track.track.name"></span><i class="fa fa-folder-open local-track" ng-if="!track.track.album.uri"></i></div>
+	<div class="col w30 title"><span ng-bind="track.track.name"></span><span class="flag grey" ng-if="!track.track.album.uri">Local</span></div>
 
 	<div class="col w30 artist">
 		<span ng-repeat="artist in track.track.artists">

src/app/services/dialog/template.html

@@ -1,6 +1,6 @@
 <div class="dialog">
 	<div class="background"></div>
-    <span class="button close-dialog destructive" ng-click="closeDialog()" ng-hide="closeDisabled">
+    <span class="button close-dialog destructive" singleclick="closeDialog()" ng-hide="closeDisabled">
         <img src="assets/icons/close-white.svg" class="opacity-hover" />
     </span>
 	<div class="content">

src/app/services/pusher/service.js

@@ -3,7 +3,7 @@
 angular.module('spotmop.services.pusher', [
 ])
 
-.factory("PusherService", function($rootScope, $http, $q, $localStorage, SettingsService){
+.factory("PusherService", function($rootScope, $http, $q, $localStorage, $cacheFactory, SettingsService, NotifyService){
 
 	// make sure we have a local storage container
 	if( typeof( $localStorage.pusher ) === 'undefined' )
@@ -48,6 +48,13 @@ angular.module('spotmop.services.pusher', [
                             SettingsService.setSetting('pusherid', data.details.id);
                             SettingsService.setSetting('pusherip', data.details.ip);
 
+                            // detect if the core has been updated
+                            if( SettingsService.getSetting('spotmopversion', 0) != data.version ){
+                                NotifyService.notify('New version detected, clearing caches...');      
+                                $cacheFactory.get('$http').removeAll();                        
+                                SettingsService.setSetting('spotmopversion', data.version);
+                            }
+							
                             // notify server of our actual username
                             var name = SettingsService.getSetting('pushername', null)
                             if( name )