adding passive notification when reverting to default theme

Author: s-n-g

Changelog

@@ -1,4 +1,5 @@
-2019-06-23 s-n-g
+2019-06-26 s-n-g
+    * Version 0.7.7
     * mpv now uses a dedicated socket file. This way multiple instances of
       PyRadio can be executed.
     * Introducing session locking.
@@ -9,6 +10,7 @@
     * Theme selection window reworked - themes are separated by location,
       theme selection is remembered when resizing, and loading default or
       saved theme (in config window).
+    * PyRadio will report reverting to default theme.
     * PyRadio will check and report when a new release is available.
     * Added good bye message.
     * Theme editor implementation started (disabled for this release).

README.html

@@ -97,6 +97,7 @@ <h2 id="controls">Controls</h2>
 PgUp/PgDown       Change station selection                  Change station playlist            Change station theme
 g                 Jump to first station                     Jump to first playlist             Jump to first theme
 &lt;n&gt;G              Jump to n-th / last station               Jump to n-th / last playlist       Jump to n-th / last theme
+M                 Jump to the middle of the playlist        Jump to the middle of the list     -
 p                 Jump to playing station                   Jump to playing playlist           -
 Enter/Right/l     Play selected station                     Open selected playlist             Apply selected theme
 r                 Select and play a random station          Re-read playlists from disk        -
@@ -106,6 +107,7 @@ <h2 id="controls">Controls</h2>
 m                 Mute / unmute player                      [Valid]                            [Valid]
 v                 Save volume (not applicable for vlc)      [Valid]                            [Valid]
 o s R             Open / Save / Reload playlist             -                                  -
+e                 Change station&#39;s encoding
 DEL,x             Delete selected station                   -                                  -
 t T               Load theme / Toggle transparency          [Valid]                            [Valid]
 c                 Open Configuration window.                -                                  -
@@ -250,7 +252,7 @@ <h2 id="session-locking">Session Locking</h2>
 <p><strong>PyRadio</strong> uses session locking, which actually means that only the first instance executed within a given session will be able to write to the configuration file.</p>
 <p>Subsequent instances will be “<em>locked</em>”. This means that the user can still play stations, load and edit playlists, load and test themes, but any changes will <strong>not</strong> be recorded in the configuration file.</p>
 <h3 id="seeeion-unlocking">Seeeion unlocking</h3>
-<p>If for any reason <strong>PyRadio</strong> always starts in <em>locked mode</em>, one can <strong>unclock</strong> the session, using the “<em>–unlock</em>” command line paremater.</p>
+<p>If for any reason <strong>PyRadio</strong> always starts in “<em>locked mode</em>”, one can <strong>unclock</strong> the session, using the “<em>–unlock</em>” command line paremater.</p>
 <h2 id="update-notification">Update notification</h2>
 <p><strong>PyRadio</strong> will periodically (once every 10 days) check whether a new version has been released.</p>
 <p>If so, a notification message will be displayed, informing the user about it.</p>

README.md

@@ -82,6 +82,7 @@ Up/Down/j/k/
 PgUp/PgDown       Change station selection                  Change station playlist            Change station theme
 g                 Jump to first station                     Jump to first playlist             Jump to first theme
 <n>G              Jump to n-th / last station               Jump to n-th / last playlist       Jump to n-th / last theme
+M                 Jump to the middle of the playlist        Jump to the middle of the list     -
 p                 Jump to playing station                   Jump to playing playlist           -
 Enter/Right/l     Play selected station                     Open selected playlist             Apply selected theme
 r                 Select and play a random station          Re-read playlists from disk        -
@@ -91,6 +92,7 @@ Space             -                                         -
 m                 Mute / unmute player                      [Valid]                            [Valid]
 v                 Save volume (not applicable for vlc)      [Valid]                            [Valid]
 o s R             Open / Save / Reload playlist             -                                  -
+e                 Change station's encoding
 DEL,x             Delete selected station                   -                                  -
 t T               Load theme / Toggle transparency          [Valid]                            [Valid]
 c                 Open Configuration window.                -                                  -
@@ -364,7 +366,7 @@ Subsequent instances will be "*locked*". This means that the user can still play
 
 ### Seeeion unlocking
 
-If for any reason **PyRadio** always starts in *locked mode*, one can **unclock** the session, using the "*--unlock*" command line paremater.
+If for any reason **PyRadio** always starts in "*locked mode*", one can **unclock** the session, using the "*--unlock*" command line paremater.
 
 ## Update notification
 

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 7, 6, 2)
+version_info = (0, 7, 7)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pyradio/config.py

@@ -482,6 +482,9 @@ def current_playlist_index(self):
 
 class PyRadioConfig(PyRadioStations):
 
+    theme_not_supported = False
+    theme_not_supported_notification_shown = False
+
     opts = collections.OrderedDict()
     opts[ 'general_title' ] = [ 'General Options', '' ]
     opts[ 'player' ] = [ 'Player: ', '' ]

pyradio/radio.py

@@ -84,6 +84,8 @@ class PyRadio(object):
     _theme = PyRadioTheme()
     _theme_name = 'dark'
     _theme_selector = None
+    _theme_not_supported_thread = None
+    _theme_not_supported_notification_duration = 1.75
     theme_forced_selection = []
 
     _config_win = None
@@ -163,8 +165,12 @@ def setup(self, stdscr):
         curses.use_default_colors()
         self._theme._transparent = self._cnf.use_transparency
         self._theme.config_dir = self._cnf.stations_dir
-        self._theme.readAndApplyTheme(self._theme_name)
-        self._theme_name = self._theme.applied_theme_name
+        ret, ret_theme_name = self._theme.readAndApplyTheme(self._theme_name)
+        if ret == 0:
+            self._theme_name = self._theme.applied_theme_name
+        else:
+            self._theme_name = ret_theme_name
+            self._cnf.theme_not_supported = True
 
         self.log = Log()
         # For the time being, supported players are mpv, mplayer and vlc.
@@ -701,7 +707,7 @@ def _show_theme_selector(self, changed_from_config=False):
         self.jumpnr = ''
         self._random_requested = False
         self._theme_selector = None
-        logger.error('DE\n\nself._theme = {0}\nself._theme_name = {1}\nself._cnf.theme = {2}\n\n'.format(self._theme, self._theme_name, self._cnf.theme))
+        #logger.error('DE\n\nself._theme = {0}\nself._theme_name = {1}\nself._cnf.theme = {2}\n\n'.format(self._theme, self._theme_name, self._cnf.theme))
         self._theme_selector = PyRadioThemeSelector(self.bodyWin, self._cnf, self._theme,
                 self._theme_name, self._theme._applied_theme_max_colors, self._cnf.theme,
                 4, 3, 4, 5, 6, 9, self._theme.getTransparency())
@@ -950,6 +956,29 @@ def closeRecoveryNotification(self, *arg, **karg):
         #arg[1].release()
         self.refreshBody()
 
+    def _show_theme_not_supported(self):
+        if self._cnf.theme_not_supported_notification_shown:
+            return
+        txt = 'Error loading selected theme!\n____Using default theme.'
+        self._show_help(txt, mode_to_set=self.operation_mode, caption='',
+                prompt='', is_message=True)
+        # start 1750 ms counter
+        if self._theme_not_supported_thread:
+            if self._theme_not_supported_thread.is_alive:
+                self._theme_not_supported_thread.cancel()
+            self._theme_not_supported_thread = None
+        self._theme_not_supported_thread = threading.Timer(self._theme_not_supported_notification_duration, self.closeThemeNotSupportedNotification)
+        self._theme_not_supported_thread.start()
+        curses.doupdate()
+
+    def closeThemeNotSupportedNotification(self, *arg, **karg):
+        #arg[1].acquire()
+        self._cnf.theme_not_supported = False
+        self._cnf.theme_not_supported_notification_shown = True
+        self._theme_not_supported_notification_duration = 0.75
+        #arg[1].release()
+        self.refreshBody()
+
     def _show_theme_help(self):
             txt = """Up|/|j|/|PgUp
                      Down|/|k|/|PgDown    |Change theme selection.
@@ -1526,6 +1555,9 @@ def _redisplay_transient_window(self):
                 self._theme_selector.set_theme(self.theme_forced_selection)
             self._print_ask_to_create_theme()
 
+        if self._cnf.theme_not_supported:
+            self._show_theme_not_supported()
+
     def play_random(self):
         # Pick a random radio station
         if self.number_of_items > 0:
@@ -1896,8 +1928,12 @@ def keypress(self, char):
                         # restore theme, if necessary
                         if self._cnf.opts['theme'][1] != self._config_win._config_options['theme'][1]:
                             #self._config_win._apply_a_theme(self._cnf.opts['theme'][1])
-                            self._theme.readAndApplyTheme(self._cnf.opts['theme'][1])
-                            self._theme_name = self._cnf.theme
+                            ret, ret_theme_name = self._theme.readAndApplyTheme(self._cnf.opts['theme'][1])
+                            if ret == 0:
+                                self._theme_name = self._cnf.theme
+                            else:
+                                self._theme_name = ret_theme_name
+                                self._cnf.theme_not_supported = True
                             curses.doupdate()
                         # make sure config is not saved
                         self._config_win._saved_config_options['dirty_config'][1] = False
@@ -2039,6 +2075,8 @@ def keypress(self, char):
                     ord('?'), ord('#'), curses.KEY_RESIZE):
                 theme_id, save_theme = self._theme_selector.keypress(char)
 
+                #if self._cnf.theme_not_supported:
+                #    self._show_theme_not_supported()
                 if theme_id == -1:
                     """ cancel or hide """
                     self._theme_name = self._theme_selector._applied_theme_name
@@ -2070,8 +2108,16 @@ def keypress(self, char):
                         self._config_win._saved_config_options['theme'][1] = self._theme_name
                     if logger.isEnabledFor(logging.INFO):
                         logger.info('Activating theme: {}'.format(self._theme_name))
-                    self._theme.readAndApplyTheme(self._theme_name,
+                    ret, ret_theme_name = self._theme.readAndApplyTheme(self._theme_name,
                             theme_path=self._theme_selector._themes[theme_id][1])
+                    if isinstance(ret, tuple):
+                        ret = ret[0]
+                    if ret == -1:
+                        self._theme_name = ret_theme_name
+                        self._cnf.theme_not_supported = True
+                        self._cnf.theme_not_supported_notification_shown = False
+                        self._show_theme_not_supported()
+                    #self.refreshBody()
                     curses.doupdate()
                     # update config window
                     if self._config_win: