Pause squeezed until the network is up.

Note: this should be done in the same way that sshd is done - using if-up.d and calling
init.d restart when the wlan or eth interfaces come up.  this is definitely a TODO

Also do some web page neatening

Author: David Norman

controller/src/squeezed

@@ -5,12 +5,15 @@ import cherrypy
 import json
 import socket
 import sys
+import syslog
+import time
 
 squeeze_player = ""
 
 def get_ip_address():
     s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    s.connect(('192.168.0.101', 0))  # connecting to a UDP address doesn't send packets
+    while s.connect_ex(('192.168.0.101', 0)) != 0:
+      time.sleep(1)
     return s.getsockname()[0]
 
 def squeeze_request(params):
@@ -45,13 +48,18 @@ if __name__ == '__main__':
         }
     }
 
+    syslog.syslog("squeezed: starting")
+
     # Get our IP address as seen by the squeeze server
     ip = get_ip_address()
 
+    syslog.syslog("squeezed: ip address " + ip)
+
     # Establish our player id
     r = squeeze_request(["players"])
     player_count = r["count"]
     if player_count == 0:
+        syslog.syslog("squeezed: no squeezebox players")
         sys.exit(0)
 
     r = squeeze_request(["players",0,player_count])
@@ -60,6 +68,7 @@ if __name__ == '__main__':
           squeeze_player = p["playerid"]
 
     if squeeze_player == "":
+        syslog.syslog("squeezed: no squeezebox player id")
         sys.exit(0)
 
     cherrypy.server.socket_host = "0.0.0.0"

web/src/css/piradio.css

@@ -1,4 +1,4 @@
 span.bigicon {
   padding: 2px;
-  font-size: 4em;
+  font-size: 3em;
 }

web/src/html/playlist.html

@@ -1,6 +1,8 @@
 <div ng-init="init()">
 
-<p>Player: {{data.player_name}} @ {{data.player_ip}}
+<p>Player: {{data.player_name}} @ {{data.player_ip}}</p>
+
+<p>
 
 <table class="table table-striped">
   <thead>
@@ -14,7 +16,7 @@
   </thead>
   <tbody>
     <tr ng-class="($index==data.playlist_cur_index)?'success':''" ng-repeat="r in data.playlist_loop">
-      <td></td>
+      <td><a href="javascript:;" ng-click="playlist_remove(r.id)"><span class="glyphicon glyphicon-remove-circle"></span></a></td>
       <td>{{r.tracknum}}</td>
       <td><a href="#/local/track/{{r.id}}">{{r.title}}</a></td>
       <td><a href="#/local/album/{{r.album_id}}">{{r.album}}</a></td>

web/src/js/playlist.js

@@ -1,4 +1,11 @@
-function PlaylistController($scope, slimClient) {
+function PlaylistController($scope, $location, slimClient) {
+
+  $scope.playlist_remove = function(id) {
+    slimClient.playlist_remove(id).
+      success(function(result) {
+        location.reload();
+      });
+  };
 
   $scope.init = function() {
     slimClient.player_status().

web/src/js/slim-client.js

@@ -51,6 +51,11 @@ function SlimClient($http, $location, serverStatus) {
       return slimRequest(data);
     };
 
+    this.playlist_remove = function(track_id) {
+      data = ["playlistcontrol", "cmd:delete", "track_id:"+track_id];
+      return slimRequest(data);
+    };
+
     this.ctrl_fb = function() {
       data = ["playlist", "index", "-1"];
       return slimRequest(data);
@@ -74,6 +79,7 @@ function SlimClient($http, $location, serverStatus) {
     this.player_status = function() {
       data = ["status", 0, 100, "tags:adelsty"];
       return slimRequest(data);
-    }
+    };
+
 };