fixing a crash when server is down

Author: s-n-g

pyradio/radio.py

@@ -5599,24 +5599,25 @@ def _show_remote_control_server_not_active(self):
             self._remote_control_window.show(self.outerBodyWin)
 
     def _show_remote_control_server_active(self):
-        txt = '''
-               |PyRadio Remote Control Server| is active!
+        if self._remote_control_server is not None:
+            txt = '''
+                   |PyRadio Remote Control Server| is active!
 
-               ||Text Address: |http://{0}
-               ||_Web Address: |http://{0}/html
+                   ||Text Address: |http://{0}
+                   ||_Web Address: |http://{0}/html
 
-               ||Press "|s|" to stop the server, or'''.format(
-            self._remote_control_server.ip + \
-            '|:|' + str(
-                self._cnf.active_remote_control_server_port
+                   ||Press "|s|" to stop the server, or'''.format(
+                self._remote_control_server.ip + \
+                '|:|' + str(
+                    self._cnf.active_remote_control_server_port
+                )
+            )
+            self._show_help(
+                txt,
+                self.ws.REMOTE_CONTROL_SERVER_ACTIVE_MODE,
+                caption=' Remote Control Enabled ',
+                is_message=True
             )
-        )
-        self._show_help(
-            txt,
-            self.ws.REMOTE_CONTROL_SERVER_ACTIVE_MODE,
-            caption=' Remote Control Enabled ',
-            is_message=True
-        )
 
     def keypress(self, char):
         if self._system_asked_to_terminate:

pyradio/server.py

@@ -965,7 +965,7 @@ def send_song_title(self, msg=None):
 Content-Type: text/event-stream
 Cache-Control: no-cache
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg))
@@ -975,7 +975,7 @@ def send_song_title(self, msg=None):
 Content-Type: text/event-stream; charset=UTF-8
 Cache-Control: no-cache
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
@@ -995,7 +995,7 @@ def _send_raw(self, msg):
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/txt; charset=utf-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg))
@@ -1004,7 +1004,7 @@ def _send_raw(self, msg):
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/txt; charset=UTF-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
@@ -1031,7 +1031,7 @@ def _send_text(self,
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/txt; charset=UTF-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg))
@@ -1040,7 +1040,7 @@ def _send_text(self,
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/txt; charset=UTF-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')
@@ -1060,7 +1060,7 @@ def _send_html(self, msg=None, put_script=False):
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/html; charset=UTF-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg))
@@ -1069,7 +1069,7 @@ def _send_html(self, msg=None, put_script=False):
             txt = '''HTTP/1.1 200 OK
 Content-Type: text/html; charset=UTF-8
 Connection: keep-alive, Keep-Alive
-Keep-Alive: timeout=9000, max=1000
+Keep-Alive: timeout=1, max=1000
 Content-Length: {}
 
 '''.format(len(b_msg)).encode('utf-8')