- actually open RadioBrowser when a dirty playlist has been

  successfully saved or when the user declines to save it
- fixing #240
- adding "Color Factor" parameter to themes
- updating system themes (adding "Color Factor")

Author: s-n-g

pyradio/config.py

@@ -891,6 +891,9 @@ def playlist_history_len(self):
     def get_playlist_history_item(self, item_id=-1):
         return self._ps.item(item_id)
 
+    def dup_to_playlist_history(self):
+        self._ps.duplicate()
+
     def add_to_playlist_history(self, station_path='',
             station_file_name='',
             station_title='',
@@ -1364,6 +1367,7 @@ class PyRadioConfig(PyRadioStations):
     )
 
     use_calculated_colors = False
+    enable_calculated_colors = True
     has_border_background  = False
 
     start_colors_at = 0
@@ -2986,6 +2990,10 @@ def remove_duplicates(self):
                 return True
         return False
 
+    def duplicate(self):
+        it = self._p[-1]
+        self._p.append(it)
+
     def add(self, station_path='',
             station_file_name='',
             station_title='',

pyradio/radio.py

@@ -402,6 +402,8 @@ class PyRadio(object):
 
     _open_dir_win = None
 
+    _function_to_repeat = None
+
     def ll(self, msg):
         logger.error('DE ==========')
         logger.error('DE ===> {}'.format(msg))
@@ -1481,8 +1483,10 @@ def _print_body_header(self):
             ''' show force http indication '''
             w_header = self._cnf.station_title
             if self._cnf.browsing_station_service:
-                if self._cnf._online_browser.page > 0:
-                    w_header += ' - p. {}'.format(self._cnf._online_browser.page+1)
+                ''' fix for #240 '''
+                if self._cnf._online_browser:
+                    if self._cnf._online_browser.page > 0:
+                        w_header += ' - p. {}'.format(self._cnf._online_browser.page+1)
             w_conn = http_conn[self.player.force_http][0]
             if self._cnf.dirty_playlist:
                 align += 1
@@ -4263,6 +4267,7 @@ def _toggle_transparency(
                 self._theme_selector.show()
 
     def _toggle_claculated_colors(self):
+        self._cnf.enable_calculated_colors = not self._cnf.enable_calculated_colors
         self._cnf.use_calculated_colors = not self._cnf.use_calculated_colors
         self._update_calculated_colors()
 
@@ -5850,8 +5855,23 @@ def _read_first_station(self, a_playlist):
     def _open_radio_browser(self):
         self._reset_status_bar_right()
         if not self._cnf.browsing_station_service:
-            self._cnf.browsing_station_service = True
-            self.playSelectionBrowser(a_url='api.radio-browser.info')
+            ret = 0
+            if self._cnf.dirty_playlist:
+                if self._cnf.auto_save_playlist:
+                    ''' save playlist and open playlist '''
+                    ret = self.saveCurrentPlaylist()
+                    if ret != 0:
+                        if self._cnf.browsing_station_service:
+                            self._cnf.removed_playlist_history_item()
+                else:
+                    ''' ask to save playlist '''
+                    ret = 1
+                    self._cnf.dup_to_playlist_history()
+                    self._function_to_repeat = self._open_radio_browser
+                    self._print_save_modified_playlist(self.ws.ASK_TO_SAVE_PLAYLIST_WHEN_OPENING_PLAYLIST_MODE)
+            if ret == 0:
+                self._cnf.browsing_station_service = True
+                self.playSelectionBrowser(a_url='api.radio-browser.info')
 
     def search_radio_browser_headless(self, index):
         #if self._cnf.headless and self._cnf.online_browser:
@@ -8086,6 +8106,8 @@ def keypress(self, char):
                             self._open_playlist()
                         else:
                             self._goto_history_back_handler()
+                            if self._function_to_repeat:
+                                self._function_to_repeat()
                     else:
                         if self._cnf.browsing_station_service:
                             self._cnf.removed_playlist_history_item()
@@ -8094,6 +8116,8 @@ def keypress(self, char):
                         self._open_playlist()
                     else:
                         self._goto_history_back_handler()
+                        if self._function_to_repeat:
+                            self._function_to_repeat()
                 elif char in (curses.KEY_EXIT, ord('q'), 27):
                     self.bodyWin.nodelay(True)
                     char = self.bodyWin.getch()
@@ -8103,6 +8127,7 @@ def keypress(self, char):
                         if self._cnf.browsing_station_service:
                             self._cnf.removed_playlist_history_item()
                         self.refreshBody()
+            self._function_to_repeat = None
             return
 
         elif self.ws.operation_mode == self.ws.PLAYLIST_DIRTY_RELOAD_CONFIRM_MODE:

pyradio/themes.py

@@ -188,6 +188,22 @@ def _do_init_pairs(
                 transp = calculate_transparency_function()
 
             border_color = 16  if curses.COLORS > 16 else 1
+            if not self._cnf.use_calculated_colors and \
+                    self._colors['color_factor'] > 0:
+                if logger.isEnabledFor(logging.INFO):
+                    logger.debug('Theme has a color_factor, setting use_calculated_colors = True')
+                self._cnf.use_calculated_colors = True
+            # if not self._cnf.enable_calculated_colors and \
+            #         self._cnf.use_calculated_colors:
+            #     if logger.isEnabledFor(logging.INFO):
+            #         logger.debug('Theme has a color_factor, setting use_calculated_colors = True')
+            #     self._cnf.use_calculated_colors = False
+            if self._cnf.use_calculated_colors:
+                self._cnf.use_calculated_colors = self._cnf.enable_calculated_colors
+                if not self._cnf.enable_calculated_colors:
+                    if logger.isEnabledFor(logging.INFO):
+                        logger.debug(f'Setting use_calculated_colors = False due to enable_calculated_colors')
+
             if self._cnf.use_calculated_colors or \
                    self._cnf.has_border_background:
                 if transp:
@@ -360,12 +376,18 @@ def recalculate_theme(self, inhibit_if_color15_exists=True):
             logger.debug('Recalculating color15...')
             logger.debug('Stations background color: {}'.format(self._colors['css'][2]))
         self._cnf.use_calculated_colors = False if self._cnf.opts['calculated_color_factor'][1] == '0' else True
+        # logger.error('\n\nself._colors before recalculate\n{}\n\n'.format(self._colors))
+        if self._colors['color_factor'] == 0:
+            fact = self._cnf.opts['calculated_color_factor'][1]
+        else:
+            fact = self._colors['color_factor']
         self._colors['data'][15] = calculate_fifteenth_color(
             self._colors['data'],
-            self._cnf.opts['calculated_color_factor'][1],
+            fact,
             inhibit_if_color15_exists
-        )
+            )
         self._colors['css'][15] = rgb_to_hex(tuple(self._colors['data'][15]))
+        # logger.error('\n\nself._colors after recalculate\n{}\n\n'.format(self._colors))
         self._do_init_pairs()
         self._update_colors()
 
@@ -418,6 +440,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
 
         if a_theme == 'dark' or a_theme == 'default':
             self._colors['transparency'] = 2
+            self._colors['color_factor'] = 0
             self._colors['data'] = {1: (192, 192, 192), 2: (0, 0, 0), 3: (0, 128, 0), 4: (0, 0, 0), 5: (135, 0, 135), 6: (0, 0, 0), 7: (0, 128, 0), 8: (0, 0, 0), 9: (0, 128, 0), 10: (128, 128, 0), 11: (95, 135, 255), 12: (0, 255, 255), 14: (192, 192, 192), 13: (0, 0, 0), 15: (26, 26, 26)}
             if not no_curses:
                 if curses.COLORS > 16:
@@ -432,6 +455,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
         elif a_theme == 'dark_16_colors':
             ''' info '''
             self._colors['transparency'] = 2
+            self._colors['color_factor'] = 0
             self._colors['Name'] = 'dark_16_colors'
             self._colors['Path'] = ''
             self.applied_theme_name = 'dark_16_colors'
@@ -445,6 +469,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
             ''' info '''
             self._colors['Name'] = 'light'
             self._colors['transparency'] = 0
+            self._colors['color_factor'] = 0
             self._colors['Path'] = ''
             self.applied_theme_name = 'light'
             self._colors['data'] = {1: (0, 0, 0), 2: (255,255, 255), 3: (128, 0, 0), 8: (192, 192, 192), 9: (0, 0, 128), 4: (192, 192, 192), 5: (128, 0, 128), 6: (192, 192, 192), 7: (0, 0, 128), 12: (0, 0, 128), 11: (0, 0, 128), 10: (128, 0, 128), 13: (255, 255, 255), 14: (128, 0, 0), 15: (230, 230, 230)}
@@ -456,6 +481,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
             ''' info '''
             self._colors['Name'] = 'light_16_colors'
             self._colors['transparency'] = 0
+            self._colors['color_factor'] = 0
             self._colors['Path'] = ''
             self.applied_theme_name = 'light_16_colors'
             self._colors['data'] = {1: (128, 128, 128), 2: (255, 255, 255), 3: (255, 0, 0), 8: (255, 255, 255), 9: (0, 0, 255), 4: (255, 255, 255), 5: (255, 0, 255), 6: (255, 255, 255), 7: (0, 0, 255), 12: (0, 0, 255), 11: (0, 0, 255), 10: (255, 0, 255), 13: (255, 255,255), 14: (255, 0, 0), 15: (230, 230, 230)}
@@ -468,6 +494,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
             ''' info '''
             self._colors['Name'] = 'black_on_white'
             self._colors['transparency'] = 0
+            self._colors['color_factor'] = 0.2
             self._colors['Path'] = ''
             self.applied_theme_name = 'black_on_white'
             self._colors['data'] = {1: (128, 128, 128), 2: (255, 255, 255), 3: (0, 0, 0), 8: (255, 255, 255), 9: (138, 138, 138), 4: (255, 255, 255), 5: (128, 128, 128), 6: (0, 0, 0), 7: (128, 128, 128), 12: (0, 255, 255), 11: (138, 138, 138), 10: (138, 138, 138), 14: (0, 0, 0), 13: (255, 255, 255), 15: (229, 229, 229)}
@@ -479,6 +506,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
             ''' info '''
             self._colors['Name'] = 'white_on_black'
             self._colors['transparency'] = 2
+            self._colors['color_factor'] = 0.2
             self._colors['Path'] = ''
             self.applied_theme_name = 'white_on_black'
             self._colors['data'] = {1: (158, 158, 158), 2: (38, 38, 38), 3: (238, 238, 238), 8: (28, 28, 28), 9: (218, 218, 218), 4: (38, 38, 38), 5: (158, 158, 158), 6: (38, 38, 38), 7: (218, 218, 218), 12: (218, 218, 218), 11: (138, 138, 138), 10: (158, 158, 158), 13: (0, 0, 0), 14: (169, 169, 169), 15: (52, 52, 52)}
@@ -529,6 +557,7 @@ def open_theme(self, a_theme='', a_path='', print_errors=None, no_curses=False):
             self._colors['css'] = {}
             for k in self._colors['data'].keys():
                 self._colors['css'][k] = rgb_to_hex(self._colors['data'][k])
+            # logger.error('colors\n{}'.format(self._colors))
 
         self.applied_theme_name = self._colors['Name']
         return ret
@@ -650,9 +679,31 @@ def read_theme(self, theme_name, theme_path):
 
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('theme names = {}'.format(names))
-        self._temp_colors = { 'data': {}, 'css': {}, 'transparency': 2}
+        self._temp_colors = { 'data': {}, 'css': {}, 'transparency': 2, 'color_factor': 0}
         for name in names.keys():
-            if name != 'transparency':
+            if name == 'transparency':
+                self._temp_colors['transparency'] = 2
+                try:
+                    self._temp_colors['transparency'] = int(names[name][0])
+                except (ValueError, TypeError):
+                    self._temp_colors['transparency'] = 2
+                if not self._temp_colors['transparency'] in range(0,3):
+                    self._temp_colors['transparency'] = 2
+                # logger.error('\n\nset transparency: {}\n\n'.format(self._temp_colors['transparency']))
+            elif name == 'Color Factor':
+                try:
+                    num = float(names[name][0])
+                    if 0.00 <= num <= 0.20:
+                        self._temp_colors['color_factor'] = num
+                    else:
+                        if logger.isEnabledFor(logging.DEBUG):
+                            logger.debug(f'Theme Color Factor is off-limits: 0.0 <= {num} <= 0.20; reseting to 0.0')
+                        self._temp_colors['color_factor'] = 0.0
+                except ValueError:
+                    if logger.isEnabledFor(logging.DEBUG):
+                        logger.debug(f'Theme Color Factor is invalid: {names[name][0]}; reseting to 0.0')
+                    self._temp_colors['color_factor'] = 0.0
+            else:
                 try:
                     self._temp_colors['css'][self._param_to_color_id[name][0]] = names[name][0]
                 except KeyError:
@@ -663,15 +714,6 @@ def read_theme(self, theme_name, theme_path):
                 if len(self._param_to_color_id[name]) == 2:
                     self._temp_colors['css'][self._param_to_color_id[name][1]] = names[name][1]
                     self._temp_colors['data'][self._param_to_color_id[name][1]] = hex_to_rgb(names[name][1])
-            elif name == 'transparency':
-                self._temp_colors['transparency'] = 2
-                try:
-                    self._temp_colors['transparency'] = int(names[name][0])
-                except (ValueError, TypeError):
-                    self._temp_colors['transparency'] = 2
-                if not self._temp_colors['transparency'] in range(0,3):
-                    self._temp_colors['transparency'] = 2
-                # logger.error('\n\nset transparency: {}\n\n'.format(self._temp_colors['transparency']))
 
         if self._theme_is_incomplete():
             if logger.isEnabledFor(logging.ERROR):
@@ -682,6 +724,7 @@ def read_theme(self, theme_name, theme_path):
         if len(names['Messages Border']) == 2:
             self._temp_colors['css'][15] = names['Messages Border'][-1]
             self._temp_colors['data'][15] = hex_to_rgb(self._temp_colors['css'][15])
+            self._temp_colors['color_factor'] = 0
             self._cnf.has_border_background = True
             if logger.isEnabledFor(logging.INFO):
                 logger.info('read_theme(): color15 = {}'.format(self._temp_colors['css'][15]))
@@ -703,7 +746,15 @@ def read_theme(self, theme_name, theme_path):
     def _calculate_fifteenth_color(self):
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('Stations background color: {}'.format(self._temp_colors['css'][2]))
-        self._temp_colors['data'][15] = calculate_fifteenth_color(self._temp_colors['data'], self._cnf.opts['calculated_color_factor'][1])
+        # logger.error('tmp_colors\n{}'.format(self._temp_colors))
+        if self._temp_colors['color_factor'] == 0:
+            fact = self._cnf.opts['calculated_color_factor'][1]
+        else:
+            fact = self._temp_colors['color_factor']
+        self._temp_colors['data'][15] = calculate_fifteenth_color(
+                self._temp_colors['data'],
+                fact
+                )
         self._temp_colors['css'][15] = rgb_to_hex(tuple(self._temp_colors['data'][15]))
 
     def _theme_is_incomplete(self, some_colors=None):

pyradio/themes/AM_by_amski1.pyradio-theme

@@ -28,12 +28,19 @@ Extra Func          #102406
 # (background color will come from Stations)
 PyRadio URL         #E3E3E3
 
+# Luminance Color Factor
+# The factor to lighten or darken Stations background
+# color, to get a calculated color used as background
+# for secondary windows
+# Valid values: 0 - 0.2
+Color Factor        0.01
+
 # Message window border foreground and background.
 # The background color can be left unset.
 # Please refer to the following link for more info
-# https://github.com/coderholic/pyradio#secondary-windows-background
+# https://github.com/coderholic/pyradio/blob/master/docs/themes.md#secondary-windows-background
 #
-Messages Border     #CEFCC7  
+Messages Border     #CEFCC7
 
 # Theme Transparency
 # Values are:

pyradio/themes/blue-by-boxer.pyradio-theme

@@ -32,10 +32,17 @@ PyRadio URL         #FD5902
 # Message window border foreground and background.
 # The background color can be left unset.
 # Please refer to the following link for more info
-# https://github.com/coderholic/pyradio#secondary-windows-background
+# https://github.com/coderholic/pyradio/blob/master/docs/themes.md#secondary-windows-background
 #
 Messages Border     #FD5902
 
+# Luminance Color Factor
+# The factor to lighten or darken Stations background
+# color, to get a calculated color used as background
+# for secondary windows
+# Valid values: 0 - 0.2
+Color Factor        0.05
+
 # Theme Transparency
 # Values are:
 #   0: No transparency

pyradio/themes/catppuccin-frappe.pyradio-theme

@@ -28,10 +28,17 @@ Extra Func          #CA9EE6
 # (background color will come from Stations)
 PyRadio URL         #CA9EE6
 
+# Luminance Color Factor
+# The factor to lighten or darken Stations background
+# color, to get a calculated color used as background
+# for secondary windows
+# Valid values: 0 - 0.2
+Color Factor        0.16
+
 # Message window border foreground and background.
 # The background color can be left unset.
 # Please refer to the following link for more info
-# https://github.com/coderholic/pyradio#secondary-windows-background
+# https://github.com/coderholic/pyradio/blob/master/docs/themes.md#secondary-windows-background
 #
 Messages Border     #CA9EE6
 

pyradio/themes/catppuccin-latte.pyradio-theme

@@ -28,10 +28,17 @@ Extra Func          #8839EF
 # (background color will come from Stations)
 PyRadio URL         #8839EF
 
+# Luminance Color Factor
+# The factor to lighten or darken Stations background
+# color, to get a calculated color used as background
+# for secondary windows
+# Valid values: 0 - 0.2
+Color Factor        0.03
+
 # Message window border foreground and background.
 # The background color can be left unset.
 # Please refer to the following link for more info
-# https://github.com/coderholic/pyradio#secondary-windows-background
+# https://github.com/coderholic/pyradio/blob/master/docs/themes.md#secondary-windows-background
 #
 Messages Border     #8839EF
 

pyradio/themes/catppuccin-macchiato.pyradio-theme

@@ -28,10 +28,17 @@ Extra Func          #C6A0F6
 # (background color will come from Stations)
 PyRadio URL         #C6A0F6
 
+# Luminance Color Factor
+# The factor to lighten or darken Stations background
+# color, to get a calculated color used as background
+# for secondary windows
+# Valid values: 0 - 0.2
+Color Factor        0.04
+
 # Message window border foreground and background.
 # The background color can be left unset.
 # Please refer to the following link for more info
-# https://github.com/coderholic/pyradio#secondary-windows-background
+# https://github.com/coderholic/pyradio/blob/master/docs/themes.md#secondary-windows-background
 #
 Messages Border     #C6A0F6