- Fixing Remote Control Server strter window colors

Trying to make Remote Control Server more stable

Author: s-n-g

pyradio/edit.py

@@ -500,7 +500,7 @@ def _show_title(self):
             self._win.chgat(0, x, 4, curses.color_pair(12))
         else:
             self._win.chgat(0, x, 2, curses.color_pair(12))
-        self._win.refresh()
+        self._refresh()
 
     def _show_buttons(self):
         sid = 3
@@ -1301,7 +1301,7 @@ def show(self, parent=None):
         if parent:
             self._parent = parent
             self._get_window()
-            self._win.bkgdset(' ', curses.color_pair(12))
+            self._win.bkgdset(' ', curses.color_pair(3))
             self._win.erase()
             self._win.box()
             self._show_title()
@@ -1328,12 +1328,6 @@ def show(self, parent=None):
             self._editor.set_global_functions(self._global_functions)
             self._editor._paste_mode = False
             self._editor.chars_to_accept = [ str(x) for x in range(0, 10)]
-            self._editor.set_local_functions(
-                local_functions = {
-                    ord('j'): self._toggle_selection,
-                    ord('k'): self._toggle_selection
-                }
-            )
             self._editor.string = self._the_port
 
 
@@ -1349,33 +1343,33 @@ def show(self, parent=None):
 
 
         try:
-            self._win.addstr(7, 3, '─' * (self.maxX - 6), curses.color_pair(12))
+            self._win.addstr(7, 3, '─' * (self.maxX - 6), curses.color_pair(3))
         except:
-            self._win.addstr(7, 3, '─'.encode('utf-8') * (self.maxX - 6), curses.color_pair(12))
-        self._win.addstr(7, int((self.maxX - 6) / 2), ' Help ', curses.color_pair(4))
-        self._win.addstr(8, 8, 'j', curses.color_pair(4))
+            self._win.addstr(7, 3, '─'.encode('utf-8') * (self.maxX - 6), curses.color_pair(3))
+        self._win.addstr(7, int((self.maxX - 6) / 2), ' Help ', curses.color_pair(11))
+        self._win.addstr(8, 8, 'j', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('k', curses.color_pair(4))
+        self._win.addstr('k', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('Up', curses.color_pair(4))
+        self._win.addstr('Up', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('Down', curses.color_pair(4))
+        self._win.addstr('Down', curses.color_pair(11))
         self._win.addstr(8, 30, 'Change selection.', curses.color_pair(10))
 
-        self._win.addstr(9, 8, 'h', curses.color_pair(4))
+        self._win.addstr(9, 8, 'h', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('l', curses.color_pair(4))
+        self._win.addstr('l', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('Left', curses.color_pair(4))
+        self._win.addstr('Left', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('Right', curses.color_pair(4))
+        self._win.addstr('Right', curses.color_pair(11))
 
-        self._win.addstr(10, 8, 'Enter', curses.color_pair(4))
+        self._win.addstr(10, 8, 'Enter', curses.color_pair(11))
         self._win.addstr(', ', curses.color_pair(10))
-        self._win.addstr('Space', curses.color_pair(4))
+        self._win.addstr('Space', curses.color_pair(11))
         self._win.addstr(10, 30, 'Toggle IP.', curses.color_pair(10))
 
-        self._win.addstr(11, 8, 's', curses.color_pair(4))
+        self._win.addstr(11, 8, 's', curses.color_pair(11))
         self._win.addstr(11, 30, 'Start the Server.', curses.color_pair(10))
 
         self._win.addstr(12, 2, 'Any other key will hide the window (not in editor).', curses.color_pair(10))
@@ -1409,16 +1403,17 @@ def _toggle_selection(self):
         if self._selection == 0:
             self._selection = 1
             self._editor.focused = True
-            self._win.chgat(5, self._field_x, self._field_width, curses.color_pair(6))
+            self._win.chgat(4, self._field_x, self._field_width, curses.color_pair(10))
         else:
             if self._validate_port():
                 self._selection = 0
                 self._editor.focused = False
-                self._win.chgat(5, self._field_x, self._field_width, curses.color_pair(10))
+                self._win.chgat(4, self._field_x, self._field_width, curses.color_pair(6))
             else:
                 self._port_number_error_message()
         self._refresh()
 
+
     def _validate_port(self):
         if self._editor.string:
             x = int(self._editor.string)
@@ -1445,7 +1440,8 @@ def keypress(self, char):
                 self._the_ip = 'LAN'
             else:
                 self._the_ip = 'localhost'
-            self._win.addstr(5, self._field_x, self._the_ip.ljust(self._field_width), curses.color_pair(6))
+            self._win.addstr(4, self._field_x, self._the_ip.ljust(self._field_width), curses.color_pair(6))
+            self._refresh()
 
         elif char == ord('r'):
             self._the_ip = self._cnf.active_remote_control_server_ip

pyradio/log.py

@@ -303,9 +303,12 @@ def _set_web_title(self, msg):
             if server:
                 ''' remote control server running '''
                 title = None
+                # if msg.startswith('Playing: ') or \
+                #         msg.startswith('Connecting to: ') or \
+                #         msg.startswith('Initialization: ') or \
+                #         'abnormal' in msg:
+                #    title = msg
                 if msg.startswith('Playing: ') or \
-                        msg.startswith('Connecting to: ') or \
-                        msg.startswith('Initialization: ') or \
                         'abnormal' in msg:
                     title = msg
                 elif msg.startswith('Failed to'):

pyradio/radio.py

@@ -226,6 +226,7 @@ class PyRadio(object):
     stop_watch_theme_thread = stop_update_notification_thread = False
     _watch_theme_lock = threading.Lock()
     _update_notify_lock = threading.Lock()
+    _server_send_lock = threading.Lock()
 
     ''' editor class '''
     _station_editor = None
@@ -6020,9 +6021,11 @@ def keypress(self, char):
                 self._start_remote_control_server()
                 if self._remote_control_server_thread:
                     self._show_remote_control_server_active()
+                self.refreshBody()
             elif ret == -1:
+                self._remote_control_window = None
                 self.ws.close_window()
-            self.refreshBody()
+                self.refreshBody()
 
         elif char == ord('H') and self.ws.operation_mode in \
                 (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
@@ -9263,6 +9266,7 @@ def _start_remote_control_server(self):
                 self._print_remote_control_server_error,
                 self._print_remote_control_server_dead_error,
                 lambda: self.log.song_title,
+                self._server_send_lock
             )
         )
         '''

pyradio/server.py

@@ -133,24 +133,28 @@ class PyRadioServer(object):
         <div id="the_blocking_box">
         </div>
         -->
-        <div class="row text-center" onclick="js_refresh_page();" style="background: green; color: white; padding-bottom: 15px;">
-            <h2>PyRadio Remote Control</h2>
-        </div>
-        <div id="title_container" class="row" style="margin: 3px; margin-top: 15px;>
-            <div class="col-xs-12">
-                <div id="song_title" class="alert alert-info text-center">
-                <b>No data!</b>
+        <a href="/html">
+            <div class="row text-center" onclick="js_refresh_page();" style="background: green; color: white; padding-bottom: 15px;">
+                <h2>PyRadio Remote Control</h2>
+            </div>
+        </a>
+        <a href="#" onclick="js_send_simple_command('/html/title', 0);">
+            <div id="title_container" class="row" style="margin: 3px; margin-top: 15px;>
+                <div class="col-xs-12">
+                    <div id="song_title" class="alert alert-info text-center">
+                    <b>No data!</b>
+                    </div>
                 </div>
             </div>
-        </div>
+        </a>
         <div id="all_buttons" class="row">
             <div class="col-xs-4 col-lg-4">
                 <div class="text-center">
-                    <button onclick="js_send_simple_command('/html/next', 1500);" type="button" class="btn btn-warning">Play<br>Next</button>
-                    <button onclick="js_send_simple_command('/html/previous', 1500);" type="button" class="btn btn-warning">Play<br>Previous</button>
-                    <button onclick="js_send_simple_command('/html/histnext', 1500);" type="button" class="btn btn-success">Play Hist.<br> Next</button>
-                    <button onclick="js_send_simple_command('/html/histprev', 1500);" type="button" class="btn btn-success">Play Hist.<br>Previous</button>
-                    <button onclick="js_send_simple_command('/html/toggle', 1500);" type="button" class="btn btn-danger">Toggle<br>Playback</button>
+                    <button onclick="js_send_simple_command_with_stop('/html/next', 1500);" type="button" class="btn btn-warning">Play<br>Next</button>
+                    <button onclick="js_send_simple_command_with_stop('/html/previous', 1500);" type="button" class="btn btn-warning">Play<br>Previous</button>
+                    <button onclick="js_send_simple_command_with_stop('/html/histnext', 1500);" type="button" class="btn btn-success">Play Hist.<br> Next</button>
+                    <button onclick="js_send_simple_command_with_stop('/html/histprev', 1500);" type="button" class="btn btn-success">Play Hist.<br>Previous</button>
+                    <button onclick="js_send_simple_command_with_stop('/html/toggle', 1500);" type="button" class="btn btn-danger">Toggle<br>Playback</button>
                 </div>
             </div>
             <div class="col-xs-4 col-lg-4">
@@ -225,7 +229,14 @@ class PyRadioServer(object):
 
     ////////////////////////////////////////////////////////////////////
 
+    function js_send_simple_command_with_stop(the_command, the_timeout){
+            js_set_title("#song_title", "<b>Player is stopped!</b>", the_command);
+            js_disable_buttons_on_stopped(true);
+            js_send_simple_command(the_command, the_timeout);
+        }
+
     function js_send_simple_command(the_command, the_timeout){
+
         $.get(the_command, function(result){
             // console.log(the_command, result, typeof result);
             //
@@ -365,7 +376,7 @@ class PyRadioServer(object):
         url_to_reload = window.location.href;
         js_fix_muted();
         js_fix_stopped();
-        setTimeout(js_init_title, 2000);
+        setTimeout(js_init_title, 500);
     }
 
     function js_init_title(){
@@ -463,6 +474,7 @@ def start_remote_control_server(
             error_func,
             dead_func,
             song_title,
+            lock
     ):
         self._path = ''
         self.config = config
@@ -475,6 +487,7 @@ def start_remote_control_server(
         '''
         self.sel = sel
         self.muted = muted
+        self.lock = lock
         try:
             server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@@ -979,12 +992,13 @@ def send_song_title(self, msg=None):
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
-        try:
-            self.client_socket.sendall(txt + b_msg)
-        except socket.error as e:
-            self.error = e
-        except AttributeError:
-            pass
+        with self.lock:
+            try:
+                self.client_socket.sendall(txt + b_msg)
+            except socket.error as e:
+                self.error = e
+            except AttributeError:
+                pass
 
     def _send_raw(self, msg):
         if msg.startswith('retry: '):
@@ -1008,10 +1022,11 @@ def _send_raw(self, msg):
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
-        try:
-            self.client_socket.sendall(txt + b_msg)
-        except socket.error as e:
-            self.error = e
+        with self.lock:
+            try:
+                self.client_socket.sendall(txt + b_msg)
+            except socket.error as e:
+                self.error = e
 
     def _send_text(self,
                    msg, alert_type='alert-info',
@@ -1044,10 +1059,11 @@ def _send_text(self,
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
-        try:
-            self.client_socket.sendall(txt + b_msg)
-        except socket.error as e:
-            self.error = e
+        with self.lock:
+            try:
+                self.client_socket.sendall(txt + b_msg)
+            except socket.error as e:
+                self.error = e
 
     def _send_html(self, msg=None, put_script=False):
         f_msg = self._html + '\n'
@@ -1073,10 +1089,11 @@ def _send_html(self, msg=None, put_script=False):
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
-        try:
-            self.client_socket.sendall(txt + b_msg)
-        except socket.error as e:
-            self.error = e
+        with self.lock:
+            try:
+                self.client_socket.sendall(txt + b_msg)
+            except socket.error as e:
+                self.error = e
 
     def _get_numbers(self, comma):
         if logger.isEnabledFor(logging.DEBUG):
@@ -1151,13 +1168,15 @@ def close_server(self):
             s.close()
             return False, e
 
-        try:
-            s.connect((self._bind_ip, self._bind_port))
-            request = "GET /quit HTTP/1.0\n\n".encode('utf-8')
-            s.sendall(request)
-        except socket.error as e:
-            s.close()
-            return False, e
+
+        with self.lock:
+            try:
+                s.connect((self._bind_ip, self._bind_port))
+                request = "GET /quit HTTP/1.0\n\n".encode('utf-8')
+                s.sendall(request)
+            except socket.error as e:
+                s.close()
+                return False, e
 
         # Receive data
         try:
@@ -1319,9 +1338,9 @@ def _format_html_table(
             else:
                 t_url = url[2].format(playlist_index+1, i+1)
             if sel == i:
-                out.append('                               <td id="' + str(i+1) + '"><a style="color: white;" href="#" onclick="js_send_simple_command(\'' + t_url + '\', ' + timeout[index] + ');">' + n + '</a></td>')
+                out.append('                               <td id="' + str(i+1) + '"><a style="color: white;" href="#" onclick="js_send_simple_command_with_stop(\'' + t_url + '\', ' + timeout[index] + ');">' + n + '</a></td>')
             else:
-                out.append('                               <td id="' + str(i+1) + '"><a href="#" onclick="js_send_simple_command(\'' + t_url + '\', ' + timeout[index] + ');">' + n + '</a></td>')
+                out.append('                               <td id="' + str(i+1) + '"><a href="#" onclick="js_send_simple_command_with_stop(\'' + t_url + '\', ' + timeout[index] + ');">' + n + '</a></td>')
             out.append('                            </tr>')
         out.append('                        </tbody>')
         out.append('                    </table>')