version 0.8.9.33 (0.9-beta30)

adding message for module netifaces module not found

Author: s-n-g

Changelog

@@ -6,6 +6,8 @@
       (python2 not affected)
     * fixing Windows lnk installation
     * editing gruvbox themes
+    * adding "Border" parameter to themes as per #173
+      (not used by default in any of the existing themes)
     * updating docs, creating pyradio_server man page
 
 2022-12-09 s-n-g

README.html

@@ -200,6 +200,8 @@ <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-
       (python2 not affected)
     * fixing Windows lnk installation
     * editing gruvbox themes
+    * adding "Border" parameter to themes as per #173
+      (not used by default in any of the existing themes)
     * updating docs, creating pyradio_server man page
 
 2022-12-09 s-n-g

build.html

@@ -91,6 +91,7 @@ <h3 id="linux">Linux</h3>
 <li><em>python-requests</em></li>
 <li><em>python-dnspython</em></li>
 <li><em>python-psutil</em></li>
+<li><em>python-netifaces</em></li>
 <li><em>sed</em></li>
 <li>any one of <em>MPV</em>, <em>MPlayer</em> and/or <em>VLC</em>.</li>
 </ol>
@@ -115,7 +116,7 @@ <h4 id="rasberry-pi-installation">Rasberry Pi installation</h4>
 </ol>
 <h3 id="macos">macOS</h3>
 <p>First thing you do is install python dependencies (assuming python 3 is installed):</p>
-<pre>python3 -m pip install --upgrade pip wheel setuptools requests dnspython psutil</pre>
+<pre>python3 -m pip install --upgrade pip wheel setuptools requests dnspython psutil netifaces</pre>
 <p>Everything else you need to install and run <strong>pyradio</strong> is available on <a target="_blank" href="https://github.com/Homebrew/homebrew">Homebrew</a>. If you haven’t already downloaded its client, go ahead and do it.</p>
 <p>Open a <strong>terminal</strong> and type:</p>
 <pre>/usr/bin/ruby -e &quot;$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)&quot;</pre>

build.md

@@ -58,6 +58,7 @@ Use your distribution method to install
 4. *python-requests*
 5. *python-dnspython*
 6. *python-psutil*
+6. *python-netifaces*
 7. *sed*
 8. any one of *MPV*, *MPlayer* and/or *VLC*.
 
@@ -98,7 +99,7 @@ If installing on a Rasberry Pi, there are a couple of things you should be aware
 
 First thing you do is install python dependencies (assuming python 3 is installed):
 
-    python3 -m pip install --upgrade pip wheel setuptools requests dnspython psutil
+    python3 -m pip install --upgrade pip wheel setuptools requests dnspython psutil netifaces
 
 Everything else you need to install and run **pyradio** is available on [Homebrew](https://github.com/Homebrew/homebrew). If you haven't already downloaded its client, go ahead and do it.
 

pyradio/config.py

@@ -25,6 +25,7 @@
     import requests
 except:
     HAS_REQUESTS = False
+
 from .log import Log
 HAS_DNSPYTHON = True
 try:

pyradio/radio.py

@@ -281,6 +281,7 @@ def __init__(self, pyradio_config,
                  req_player='',
                  theme='',
                  force_update=''):
+        self._no_netifaces = False
         self._current_selection = 0
         self._force_print_all_lines = False
         self._system_asked_to_terminate = False
@@ -378,6 +379,7 @@ def __init__(self, pyradio_config,
                 self.ws.EDIT_STATION_URL_ERROR: self._print_editor_url_error,
                 self.ws.PY2_EDITOR_ERROR: self._print_py2_editor_error,
                 self.ws.REQUESTS_MODULE_NOT_INSTALLED_ERROR: self._print_requests_not_installed_error,
+                self.ws.NETIFACES_MODULE_NOT_INSTALLED_ERROR: self._print_netifaces_not_installed_error,
                 self.ws.DNSPYTHON_MODULE_NOT_INSTALLED_ERROR: self._print_dnspython_not_installed_error,
                 self.ws.CLEAR_REGISTER_MODE: self._print_clear_register,
                 self.ws.CLEAR_ALL_REGISTERS_MODE: self._print_clear_all_registers,
@@ -992,6 +994,9 @@ def refreshBody(self, start=0):
             self._show_theme_not_supported()
         elif self._cnf.user_param_id == -1:
             self._print_user_parameter_error()
+        elif self._no_netifaces:
+            self._no_netifaces = False
+            self._print_netifaces_not_installed_error()
         # elif not self._cnf.use_themes:
         #     self._show_no_themes()
 
@@ -1026,6 +1031,8 @@ def refreshNoDepencency(self):
         self.bodyWin.addstr('dnspython', curses.color_pair(4))
         self.bodyWin.addstr(14,1, '      3. ', curses.color_pair(5))
         self.bodyWin.addstr('psutil ', curses.color_pair(4))
+        self.bodyWin.addstr(15,1, '      3. ', curses.color_pair(5))
+        self.bodyWin.addstr('netifaces', curses.color_pair(4))
         self.outerBodyWin.refresh()
         self.bodyWin.refresh()
 
@@ -3213,6 +3220,23 @@ def _print_dnspython_not_installed_error(self):
                         prompt=' Press any key ',
                         is_message=True)
 
+    def _print_netifaces_not_installed_error(self):
+        txt = '''
+        Module "|netifaces|" not found!
+
+        In order to use the |Remote Control Server|, the
+        "|netifaces|" module must be installed.
+
+        Exit |PyRadio| now, install the module (named
+        |python-netifaces| or |python{}-netifaces|) and try
+        executing |PyRadio| again.
+        '''
+        self._show_help(txt.format(python_version[0]),
+                        self.ws.NETIFACES_MODULE_NOT_INSTALLED_ERROR,
+                        caption=' Module Error ',
+                        prompt=' Press any key ',
+                        is_message=True)
+
     def _print_requests_not_installed_error(self):
         txt = '''
         Module "|requests|" not found!
@@ -9256,6 +9280,10 @@ def _start_remote_control_server(self):
                 '/html_init': self._html_init_song_title,
             }
         )
+        if not self._remote_control_server.has_netifaces:
+            self._remote_control_server = None
+            self._no_netifaces = True
+            return
         self._remote_control_server_thread = threading.Thread(
             target=self._remote_control_server.start_remote_control_server,
             args=(

pyradio/server.py

@@ -1,4 +1,3 @@
-# https://stackoverflow.com/questions/10114224/how-to-properly-send-http-response-with-python-using-socket-library-only
 import socket
 import logging
 from os.path import basename
@@ -7,15 +6,18 @@
 from time import sleep
 from .simple_curses_widgets import SimpleCursesLineEdit
 
-
 PY2 = version_info[0] == 2
 logger = logging.getLogger(__name__)
 
 import locale
 locale.setlocale(locale.LC_ALL, "")
 
-if not platform.lower().startswith('win'):
-    import netifaces
+HAS_NETIFACES = True
+try:
+    if not platform.lower().startswith('win'):
+        import netifaces
+except:
+    HAS_NETIFACES = False
 
 class IPs(object):
     def __init__(self, fetch_public_ip=False):
@@ -463,6 +465,7 @@ class PyRadioServer(object):
     }
 
     def __init__(self, bind_ip, bind_port, commands):
+        self.has_netifaces = HAS_NETIFACES
         self._bind_ip = bind_ip
         if bind_ip.lower() == 'localhost':
             self._bind_ip = '127.0.0.1'

pyradio/window_stack.py

@@ -128,6 +128,7 @@ class Window_Stack_Constants(object):
     REMOTE_CONTROL_SERVER_START_ERROR_MODE = 318
     REMOTE_CONTROL_SERVER_DEAD_ERROR_MODE = 319
     REMOTE_CONTROL_SERVER_ERROR_MODE = 320
+    NETIFACES_MODULE_NOT_INSTALLED_ERROR = 209
     THEME_MODE = 400
     HISTORY_EMPTY_NOTIFICATION = 500
     STATIONS_INTEGRATED_MODE = 501
@@ -205,6 +206,7 @@ class Window_Stack_Constants(object):
         EDIT_STATION_URL_ERROR: 'EDIT_STATION_URL_ERROR',
         PY2_EDITOR_ERROR: 'PY2_EDITOR_ERROR',
         REQUESTS_MODULE_NOT_INSTALLED_ERROR: 'REQUESTS_MODULE_NOT_INSTALLED_ERROR',
+        NETIFACES_MODULE_NOT_INSTALLED_ERROR: 'NETIFACES_MODULE_NOT_INSTALLED_ERROR',
         UNKNOWN_BROWSER_SERVICE_ERROR: 'UNKNOWN_BROWSER_SERVICE_ERROR',
         SERVICE_CONNECTION_ERROR: 'SERVICE_CONNECTION_ERROR',
         PLAYER_CHANGED_INFO_MODE: 'PLAYER_CHANGED_INFO_MODE',
@@ -313,6 +315,7 @@ class Window_Stack_Constants(object):
         EDIT_STATION_URL_ERROR,
         PY2_EDITOR_ERROR,
         REQUESTS_MODULE_NOT_INSTALLED_ERROR,
+        NETIFACES_MODULE_NOT_INSTALLED_ERROR,
         DNSPYTHON_MODULE_NOT_INSTALLED_ERROR,
         UNKNOWN_BROWSER_SERVICE_ERROR,
         SERVICE_CONNECTION_ERROR,