- Adding theme not supported message

s-n-g · s-n-g · commit f37ac2300349 · 2020-10-13T14:57:25.000+03:00
- Fixing theme fallback selection mechanism
- Updating docs
diff --git a/Changelog b/Changelog
@@ -1,4 +1,8 @@
-2020-09-29 s-n-g
+2020-10-13 s-n-g
+    This is a long-overdue update!
+    This is a called a beta release in the sense that some
+    of the intended features have not been implemented yet.
+
     * Version 0.8.7.3 (0.8.8-beta2)
     * Adding PASTE MODE in editing windows
     * Finalizing alternative modes (registers, register mode,
@@ -7,13 +11,13 @@
     * Toggling transparency enabled in theme selection window
     * Pyradio respects global encoding
     * Info window gets updated as data are read
-    * Display message when fallback theme is used
+    * Display message when fallback theme is used (#99)
     * Fixing info window highlight and encoding issues
     * Making Station editor window size aware
     * Fixing -a command line parameter functionality
     * Build script accepts --user (for user only installation) on linux
-    * Build script will clean up previous installation files (not on Windows)
-    * Fixing volume saving on Windows
+    * Build script will clean up previous installation files
+    * Fixing volume saving on Windows (mplayer)
 
     Implemented in 0.8.8-beta1
     * Connection timeout counter
@@ -22,8 +26,8 @@
     * Fixing playback restart when encoding changed
 
     Not implemented yet
-    * /p - Select playlist/register to paste station
-    * /n - Create new playlist
+    * \p - Select playlist/register to paste station
+    * \n - Create new playlist
 
 2020-03-16 s-n-g
     * Version 0.8.7.2
diff --git a/devel/build_install_pyradio.bat b/devel/build_install_pyradio.bat
@@ -160,7 +160,7 @@ python2 -m site --user-site 2>nul >>dirs
 python3 -m site --user-site 2>nul >>dirs
 python devel\windirs.py
 echo DEL dirs >>pyremove.bat
-echo echo Pyradio successfully uninstalled! >>pyremove.bat
+echo echo PyRadio successfully uninstalled! >>pyremove.bat
 
 echo echo. >>pyremove.bat
 echo echo ********************************************************* >>pyremove.bat
diff --git a/pyradio.1 b/pyradio.1
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH PYRADIO 1 "September 2020"
+.TH PYRADIO 1 "October 2020"
 
 .SH NAME
 .PP
diff --git a/pyradio/config.py b/pyradio/config.py
@@ -915,7 +915,10 @@ def find_history_by_station_title(self, a_title):
 
 class PyRadioConfig(PyRadioStations):
 
+    fallback_theme = ''
+
     theme_not_supported = False
+    theme_has_error = False
     theme_not_supported_notification_shown = False
 
     opts = collections.OrderedDict()
diff --git a/pyradio/radio.py b/pyradio/radio.py
@@ -379,6 +379,7 @@ def setup(self, stdscr):
         else:
             self._theme_name = ret_theme_name
             self._cnf.theme_not_supported = True
+            self._cnf.theme_has_error = True if ret == -1 else False
 
         self.log = Log()
         # For the time being, supported players are mpv, mplayer and vlc.
@@ -1315,7 +1316,18 @@ def closeHistoryEmptyNotification(self):
     def _show_theme_not_supported(self):
         if self._cnf.theme_not_supported_notification_shown:
             return
-        txt = 'Error loading selected theme!\n____Using fallback theme.'
+        if self._cnf.theme_has_error:
+            txt = '|Error loading selected theme!|\n____Using |fallback| theme.'
+        else:
+            tmp = ['', '', '']
+            tmp[0] = '|Theme not supported!|'
+            tmp[1] = 'This terminal supports up to |{}| colors...'.format(curses.COLORS)
+            tmp[2] = 'Using |fallback| theme.'
+            while len(tmp[0]) < len(tmp[1]) -2:
+                tmp[0] = '_' + tmp[0] + '_'
+            while len(tmp[2]) < len(tmp[1]):
+                tmp[2] = '_' + tmp[2] + '_'
+            txt = '\n'.join(tmp)
         self._show_help(txt, mode_to_set=self.ws.operation_mode, caption='',
                 prompt='', is_message=True)
         # start 1750 ms counter
@@ -2723,8 +2735,8 @@ def to_time(secs):
             return str(hour) + ':' + str(min)
 
         check_days = 10
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug('detectUpdateThread: starting...')
+        if logger.isEnabledFor(logging.INFO):
+            logger.info('detectUpdateThread: Starting...')
         ##################
         #delay(5, stop)
         from pyradio import version as my_version, app_state as my_app_state
@@ -2734,8 +2746,8 @@ def to_time(secs):
             this_version=my_version+'-'+my_app_state
         connection_fail_count = 0
         ran=random.randint(25, 45)
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug('detectUpdateThread: Will check in {} seconds'.format(ran))
+        if logger.isEnabledFor(logging.INFO):
+            logger.info('detectUpdateThread: Will check in {} seconds'.format(ran))
         delay(ran, stop)
         if stop():
             if logger.isEnabledFor(logging.DEBUG):
@@ -2757,15 +2769,15 @@ def to_time(secs):
             #delta=check_days
             if delta < check_days:
                 clean_date_files(files)
-                if logger.isEnabledFor(logging.DEBUG):
+                if logger.isEnabledFor(logging.INFO):
                     if check_days - delta == 1:
-                        logger.debug('detectUpdateThread: Will check again tomorrow...')
+                        logger.info('detectUpdateThread: Will check again tomorrow...')
                     else:
-                        logger.debug('detectUpdateThread: Will check again in {} days...'.format(check_days - delta))
+                        logger.info('detectUpdateThread: Will check again in {} days...'.format(check_days - delta))
                 return
 
-        if logger.isEnabledFor(logging.DEBUG):
-            logger.debug('detectUpdateThread: checking for updates')
+        if logger.isEnabledFor(logging.INFO):
+            logger.info('detectUpdateThread: Checking for updates')
         url = 'https://api.github.com/repos/coderholic/pyradio/tags'
         while True:
             if stop():
@@ -2795,13 +2807,13 @@ def to_time(secs):
                 # PROGRAM DEBUG: set last github tag's version
                 # to check display functionality
                 #last_tag = '0.8.8-RC1'
-                if logger.isEnabledFor(logging.DEBUG):
-                    logger.debug('detectUpdateThread: Upstream version found: {}'.format(last_tag))
+                if logger.isEnabledFor(logging.INFO):
+                    logger.info('detectUpdateThread: Upstream version found: {}'.format(last_tag))
                 if this_version == last_tag:
                     clean_date_files(files, -1)
                     create_tadays_date_file(a_path)
-                    if logger.isEnabledFor(logging.DEBUG):
-                        logger.debug('detectUpdateThread: No update found. Will check again in {} days. Exiting...'.format(check_days))
+                    if logger.isEnabledFor(logging.INFO):
+                        logger.info('detectUpdateThread: No update found. Will check again in {} days. Exiting...'.format(check_days))
                     break
                 else:
                     # PROGRAM DEBUG: set program's version
@@ -2831,7 +2843,7 @@ def to_time(secs):
                             logger.info('detectUpdateThread: Update available: {}'.format(last_tag))
                         a_lock.acquire()
                         if logger.isEnabledFor(logging.DEBUG):
-                            logger.debug('notification sent!!!')
+                            logger.debug('detectUpdateThread: Update notification sent!!!')
                         self._update_version = last_tag
                         a_lock.release()
                         while True:
@@ -2861,12 +2873,12 @@ def to_time(secs):
                         break
 
             else:
-                if logger.isEnabledFor(logging.DEBUG):
-                    logger.debug('detectUpdateThread: Error: Cannot get upstream version!!!')
+                if logger.isEnabledFor(logging.ERROR):
+                    logger.error('detectUpdateThread: Error: Cannot get upstream version!!!')
                 connection_fail_count += 1
                 if connection_fail_count > 4:
-                    if logger.isEnabledFor(logging.DEBUG):
-                        logger.debug('detectUpdateThread: Error: Too many connection failures. Exiting...')
+                    if logger.isEnabledFor(logging.ERROR):
+                        logger.error('detectUpdateThread: Error: Too many connection failures. Exiting...')
                     break
                 delay(60, stop)
 
@@ -3521,6 +3533,7 @@ def keypress(self, char):
                                 self._theme_name = self._cnf.theme
                             else:
                                 self._theme_name = ret_theme_name
+                                self._cnf.theme_has_error = True if ret == -1 else False
                                 self._cnf.theme_not_supported = True
                             curses.doupdate()
                         # make sure config is not saved
@@ -3835,6 +3848,7 @@ def keypress(self, char):
                 char not in self._chars_to_bypass and \
                 char not in self._chars_to_bypass_for_search and \
                 char not in (ord('T'),)):
+            logger.error('DE \n\nExiting theme selector?\n\n')
             theme_id, save_theme = self._theme_selector.keypress(char)
 
             #if self._cnf.theme_not_supported:
@@ -3867,9 +3881,10 @@ def keypress(self, char):
                         theme_path=self._theme_selector._themes[theme_id][1])
                 if isinstance(ret, tuple):
                     ret = ret[0]
-                if ret == -1:
+                if ret < 0:
                     self._theme_name = ret_theme_name
                     self._cnf.theme_not_supported = True
+                    self._cnf.theme_has_error = True if ret == -1 else False
                     self._cnf.theme_not_supported_notification_shown = False
                     self._show_theme_not_supported()
                 #self.refreshBody()
diff --git a/pyradio/stations.csv b/pyradio/stations.csv
@@ -10,6 +10,7 @@ Downtempo (Secret Agent - SomaFM),http://somafm.com/secretagent.pls
 Dub Step (Dub Step Beyond - SomaFM),http://somafm.com/dubstep.pls
 Electronic/Dance (Electronic Culture),http://www.shouted.fm/tunein/electro-dsl.m3u
 Folk (Folk Forward - SomaFM),http://somafm.com/folkfwd.pls
+Hip Hop (Hot 97 NYC),http://playerservices.streamtheworld.com/pls/WQHTAAC.pls
 Hip Hop (Power 1051 NYC),http://c11.prod.playlists.ihrhls.com/1481/playlist.m3u8
 House (Beat Blender - SomaFM),http://somafm.com/startstream=beatblender.pls
 Indie Pop (Indie Pop Rocks! - SomaFM),http://somafm.com/indiepop130.pls
@@ -22,7 +23,10 @@ Progressive (Tags Trance Trip - SomaFM),http://somafm.com/tagstrance.pls
 Public Radio (WNYC - Public Radio from New York to the World),http://wnyc-iheart.streamguys.com/wnycfm-iheart.aac
 Reggae Dancehall (Ragga Kings),http://www.raggakings.net/listen.m3u
 Rock (Digitalis - SomaFM),http://somafm.com/digitalis.pls
+Vox Noctem: Rock-Goth, http://r2d2.voxnoctem.de:8000/voxnoctem.mp3
 Beyond Metal (Progressive - Symphonic),http://streamingV2.shoutcast.com/BeyondMetal
+DanceUK,https://www.internet-radio.com/servers/tools/playlistgenerator/?u=http://uk2.internet-radio.com:8024/listen.pls&t=.pls
+JazzGroove,https://www.internet-radio.com/servers/tools/playlistgenerator/?u=http://199.180.72.2:8015/listen.pls?sid=1&t=.pls
 Radio Paradise - Main Mix,http://stream.radioparadise.com/aac-128
 Radio Paradise - Mellow Mix,http://stream.radioparadise.com/mellow-128
 Radio Paradise - Rock Mix,http://stream.radioparadise.com/rock-128
diff --git a/pyradio/themes.py b/pyradio/themes.py
@@ -56,7 +56,8 @@ def _do_init_pairs(self):
         curses.init_pair(8, self._active_colors[THEME_ITEMS[7][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[7][0]][BACKGROUND()])
         # cursor when playing
         curses.init_pair(9, self._active_colors[THEME_ITEMS[6][0]][FOREGROUND()], self._active_colors[THEME_ITEMS[6][0]][BACKGROUND()])
-        logger.error('DE _do_init_pairs:\n{}'.format(self._active_colors))
+        if logger.isEnabledFor(logging.DEBUG):
+            logger.debug('_do_init_pairs: {}'.format(self._active_colors))
 
     def restoreActiveTheme(self):
         self._active_colors = deepcopy(self._read_colors)
@@ -68,9 +69,13 @@ def readAndApplyTheme(self, a_theme, **kwargs):
         """ Read a theme and apply it
 
             Returns:
-              -1: theme not supported (default theme loaded)
+              -2: theme not supported (default theme loaded)
+              -1: theme has error (default theme loaded)
                0: all ok
         """
+        self._cnf.theme_has_error = False
+        self._cnf.theme_not_supported = False
+        self._cnf.theme_not_supported_notification_shown = False
         result = 0
         use_transparency = None
         theme_path = ''
@@ -80,10 +85,12 @@ def readAndApplyTheme(self, a_theme, **kwargs):
             elif name == 'theme_path':
                 theme_path = value
         ret = self.open_theme(a_theme, theme_path)
-        if ret < 0 or self._applied_theme_max_colors > curses.COLORS:
-            # TODO: return error
+        if ret < 0:
             self._load_default_theme(self.applied_theme_name)
             result = -1, self.applied_theme_name
+        elif self._applied_theme_max_colors > curses.COLORS:
+            self._load_default_theme(self.applied_theme_name)
+            result = -2, self.applied_theme_name
         else:
             self.applied_theme_name = a_theme
 
@@ -100,16 +107,16 @@ def readAndApplyTheme(self, a_theme, **kwargs):
         return result, self.applied_theme_name
 
     def _load_default_theme(self, a_theme):
-        logger.error('DE a_theme = {}'.format(a_theme))
-        self.applied_theme_name = 'dark'
-        self._applied_theme_max_colors = 8
-        try_theme = a_theme.replace('_16_colors', '')
-        if try_theme == 'light':
-            self.applied_theme_name = try_theme
-        elif self._cnf.theme.replace('_16_colors', '') == 'light':
-                self.applied_theme_name = 'light'
+        if self._cnf.fallback_theme :
+            self.applied_theme_name = self._cnf.fallback_theme
+        else:
+            self.applied_theme_name = 'dark'
+            self._applied_theme_max_colors = 8
+            if a_theme.startswith('light'):
+                    self.applied_theme_name = 'light'
+            self._cnf.fallback_theme = self.applied_theme_name
         if logger.isEnabledFor(logging.INFO):
-            logger.info('Applying default theme: {}'.format(self.applied_theme_name))
+            logger.info('Applying fallback theme: "{0}" instead of: "{1}"'.format(self.applied_theme_name, a_theme))
         self.open_theme(self.applied_theme_name)
 
     def open_theme(self, a_theme = '', a_path=''):
@@ -454,19 +461,27 @@ def __init__(self, parent, config, theme,
         self._themes = []
 
     def show(self):
-        self._themes = []
         self._themes = [ [ 'dark', 'dark' ] ]
-        if curses.COLORS >= 16:
-            self._themes.append([ 'dark_16_colors', '' ])
-            self._items += 1
+        #if curses.COLORS >= 16:
+        #    self._themes.append([ 'dark_16_colors', '' ])
+        #    self._items += 1
+        #self._themes.append([ 'light', '' ])
+        #if curses.COLORS >= 16:
+        #    self._themes.append([ 'light_16_colors', '' ])
+        #    self._items += 1
+        #if curses.COLORS == 256:
+        #    self._themes.append([ 'black_on_white', '' ])
+        #    self._themes.append([ 'white_on_black', '' ])
+        #    self._items += 2
+
+        self._themes.append([ 'dark_16_colors', '' ])
+        self._items += 1
         self._themes.append([ 'light', '' ])
-        if curses.COLORS >= 16:
-            self._themes.append([ 'light_16_colors', '' ])
-            self._items += 1
-        if curses.COLORS == 256:
-            self._themes.append([ 'black_on_white', '' ])
-            self._themes.append([ 'white_on_black', '' ])
-            self._items += 2
+        self._themes.append([ 'light_16_colors', '' ])
+        self._items += 1
+        self._themes.append([ 'black_on_white', '' ])
+        self._themes.append([ 'white_on_black', '' ])
+        self._items += 2
         # scan for package and user themes
         themes_to_add = self._scan_for_theme_files(self._cnf.stations_dir)
         #themes_to_add = self._scan_for_theme_files(self._cnf.stations_dir)
@@ -875,6 +890,9 @@ def keypress(self, char):
                         else:
                             self._applied_theme_name = ret_theme_name
                             self._cnf.theme_not_supported = True
+                            self._cnf.theme_has_error = True if ret == -1 else False
+                            # avoid showing extra notification when exiting theme selector
+                            self._cnf.theme_not_supported_notification_shown = True
                 self.selection = -1
                 return -1, False
         return -3, False
diff --git a/windows.html b/windows.html
diff --git a/windows.md b/windows.md
