Remote Control Server: adding a warning to the info response, if PyRadio is not in Main Mode

Author: s-n-g

pyradio/radio.py

@@ -807,6 +807,19 @@ def _text_info(self):
         else:
             out.append('  Status: Idle')
         out.append('  Selection (id={0}): "{1}"'.format(self.selection+1, self.stations[self.selection][0]))
+        if self.ws.operation_mode != self.ws.NORMAL_MODE:
+            if self._cnf.headless:
+                out.append(
+                        '\nPyRadio is NOT in Main Mode!'
+                        "\nPlease attach the program's session to a terminal and take appropriate action"
+                        "\n to close the opened window, effectively putting PyRadio in Main Mode"
+                        )
+            else:
+                out.append(
+                        '\nPyRadio is NOT in Main Mode!'
+                        "\nPlease get to the program's terminal and take appropriate action to close the"
+                        "\nopened window, effectively putting PyRadio in Main Mode"
+                        )
         return '\n'.join(out)
 
 
@@ -846,6 +859,19 @@ def _html_info(self):
             out.append('<tr><td>Status:</td><td>Idle</span></td></tr>')
             out.append('<tr><td>Selection:</td><td>{}</span></td></tr>'.format(self.stations[self.selection][0]))
         out.append('</tbody></table>')
+        if self.ws.operation_mode != self.ws.NORMAL_MODE:
+            if self._cnf.headless:
+                out.append(r'''<p><br><b>PyRadio</b> is <span style="font-weight: bold; color: Red;">NOT</span>
+ in <span style="font-weight: bold; color: Green;">Main Mode</span>!</p>
+<p>Please attach the program's session to a terminal and take appropriate action to close the opened window,
+effectively putting <b>PyRadio</b> in <span style="font-weight:bold; color: Green;">Main Mode</span>
+ </p>''')
+            else:
+                out.append(r'''<p><br><b>PyRadio</b> is <span style="font-weight: bold; color: Red;">NOT</span>
+ in <span style="font-weight: bold; color: Green;">Main Mode</span>!</p>
+<p>Please get to the program's terminal and take appropriate action to close the opened window,
+effectively putting <b>PyRadio</b> in <span style="font-weight:bold; color: Green;">Main Mode</span>
+ </p>''')
         out.append('</div>')
         return '\n'.join(out)
 
@@ -5269,7 +5295,7 @@ def _move_cursor_one_down(self):
     def _html_check_op_mode(self):
         if self.ws.window_mode == self.ws.NORMAL_MODE:
             return None
-        return '<div class="alert alert-danger">Operation not permitted (not in <b>Normal Mode</b>)</div>'
+        return '<div class="alert alert-danger">Operation not permitted (not in <b>Main Mode</b>)</div>'
 
     def _html_play_next_station(self):
         self._reset_status_bar_right()

pyradio/server.py

@@ -933,8 +933,8 @@ class PyRadioServer(object):
         '/list': 'Listing stations from playlist',
         '/idle': 'Player is idle; operation not applicable...',
         '/error': 'Error in parameter',
-        '/perm': 'Operation not permitted (not in Normal Mode)',
-        '/perm_html': '<div class="alert alert-danger">Operation not permitted (not in <b>Normal Mode</b>)</div>',
+        '/perm': 'Operation not permitted (not in Main Mode)',
+        '/perm_html': '<div class="alert alert-danger">Operation not permitted (not in <b>Main Mode</b>)</div>',
         '/log': 'Stations logging toggled',
         '/like': 'Station tagged (liked)',
     }
@@ -1250,11 +1250,8 @@ def _handle_client_connection(self, address, request):
                 # logger.error('received = "{}"'.format(received))
                 self._send_raw(received)
             else:
-                if self.can_send_command():
-                    received = self._commands['/text_info']()
-                    self._send_text(received)
-                else:
-                    self._send_text(self._text['/perm'])
+                received = self._commands['/text_info']()
+                self._send_text(received)
 
         elif self._path in ('/next', '/n'):
             if self._is_html: