- Calculated colorfactor is now in the config

- Toggling calculated colors by pressing ~ (tilde)

Author: s-n-g

README.html

@@ -1314,7 +1314,7 @@ <h2 id="pyradio-themes">PyRadio Themes <span style="padding-left: 10px;"><sup st
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     #a3b367
 

README.md

@@ -794,7 +794,7 @@ PyRadio URL         #a3b367
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     #a3b367
 

pyradio/config.py

@@ -515,11 +515,9 @@ def read_playlist_file(
 
         ret = 0
         if self._register_to_open:
-            logger.error('register_to_open = {}'.format(self._register_to_open))
             stationFile, ret = self._get_register_filename_from_register()
             self._is_register = True
         else:
-            logger.error('stationFile = {}'.format(stationFile))
             stationFile, ret = self._get_playlist_abspath_from_data(stationFile=stationFile)
             self._is_register = False
         read_file = True
@@ -1141,6 +1139,7 @@ class PyRadioConfig(PyRadioStations):
     opts['theme_title'] = ['Theme Options', '']
     opts['theme'] = ['Theme: ', 'dark']
     opts['use_transparency'] = ['Use transparency: ', False]
+    opts['calculated_color_factor'] = ['Calculated color: ', '0']
     opts['playlist_manngement_title'] = ['Playlist Management Options', '']
     opts['confirm_station_deletion'] = ['Confirm station deletion: ', True]
     opts['confirm_playlist_reload'] = ['Confirm playlist reload: ', True]
@@ -1377,6 +1376,19 @@ def use_transparency(self, val):
         self.opts['use_transparency'][1] = val
         self.opts['dirty_config'][1] = True
 
+    @property
+    def calculated_color_factor(self):
+        return float(self.opts['calculated_color_factor'][1])
+
+    @calculated_color_factor.setter
+    def calculated_color_factor(self, value):
+        try:
+            test = float(str(value))
+            self.opts['calculated_color_factor'][1] = str(value)
+        except (ValueError, TypeError, NameError):
+            self.opts['calculated_color_factor'][1] = '0'
+        self.opts['dirty_config'][1] = True
+
     @property
     def default_encoding(self):
         return self.opts['default_encoding'][1]
@@ -1788,6 +1800,16 @@ def read_config(self):
                     self.opts['use_transparency'][1] = True
                 else:
                     self.opts['use_transparency'][1] = False
+            elif sp[0] == 'calculated_color_factor':
+                try:
+                    t = round(float(sp[1]), 2)
+                    s_t = str(t)[:4]
+                    if s_t == '0.0':
+                        s_t = '0'
+                    self.opts['calculated_color_factor'][1] = s_t
+                except (ValueError, TypeError):
+                    self.opts['calculated_color_factor'][1] = '0'
+                self.use_calculated_colors = False if self.opts['calculated_color_factor'][1] == '0' else True
             elif sp[0] == 'force_http':
                 if sp[1].lower() == 'true':
                     self.opts['force_http'][1] = True
@@ -2068,27 +2090,31 @@ def save_config(self, from_command_line=False):
 # Default value: False
 use_transparency = {9}
 
+# Calculated color factor
+# Valid values: 0-0.2
+# Default value: 0
+calculated_color_factor = {10}
 
 # Playlist management
 #
 # Specify whether you will be asked to confirm
 # every station deletion action
 # Valid values: True, true, False, false
 # Default value: True
-confirm_station_deletion = {10}
+confirm_station_deletion = {11}
 
 # Specify whether you will be asked to confirm
 # playlist reloading, when the playlist has not
 # been modified within PyRadio
 # Valid values: True, true, False, false
 # Default value: True
-confirm_playlist_reload = {11}
+confirm_playlist_reload = {12}
 
 # Specify whether you will be asked to save a
 # modified playlist whenever it needs saving
 # Valid values: True, true, False, false
 # Default value: False
-auto_save_playlist = {12}
+auto_save_playlist = {13}
 
 '''
         copyfile(self.config_file, self.config_file + '.restore')
@@ -2107,6 +2133,7 @@ def save_config(self, from_command_line=False):
                     self.opts['force_http'][1],
                     self.opts['theme'][1] if not self.opts['auto_update_theme'][1] else '*' + self.opts['theme'][1],
                     self.opts['use_transparency'][1],
+                    self.opts['calculated_color_factor'][1],
                     self.opts['confirm_station_deletion'][1],
                     self.opts['confirm_playlist_reload'][1],
                     self.opts['auto_save_playlist'][1]))
@@ -2825,7 +2852,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color4}
 
@@ -2868,7 +2895,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color2}
 
@@ -3014,7 +3041,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color8}
 
@@ -3057,7 +3084,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color8}
 
@@ -3100,7 +3127,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color8}
 
@@ -3143,7 +3170,7 @@ def download(self, a_theme=None, a_path=None, print_errors=None):
 # 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#calculated_colors
+# https://github.com/coderholic/pyradio#calculated-colors
 #
 Messages Border     {color8}
 

pyradio/config_window.py

@@ -79,6 +79,7 @@ class PyRadioConfigWindow(object):
     '|', 'Default value = dark'])
     _help_text.append(['If False, theme colors will be used.', '|',
     "If True and a compositor is running, the stations' window background will be transparent.", '|', "If True and a compositor is not running, the terminal's background color will be used.", '|', 'Default value: False'])
+    _help_text.append(['Pyradio can calculate and use an alternative color for secondary windows.', '|', 'This option will determine if this color will be used (value > 0) or not (value = 0), provided that the theme used does not already provide it.', '|', 'The value of this option is actually the factor to darken or lighten the main (stations) background color.', '|', 'You can get more info on this at https://github.com/coderholic/pyradio#calculated-colors' , '|', 'Valid Values: 0-0.2', 'Default value: 0'])
     _help_text.append(None)
     _help_text.append(['Specify whether you will be asked to confirm every station deletion action.',
     '|', 'Default value: True'])
@@ -324,6 +325,7 @@ def _load_default_values(self):
         ''' Transparency '''
         #self._old_use_transparency = self._config_options['use_transparency'][1]
         self._config_options['use_transparency'][1] = False
+        self._config_options['calculated_color_factor'][1] = '0'
         self._config_options['force_http'][1] = False
         self._toggle_transparency_function(changed_from_config_window=True, force_value=False)
         self._config_options['playlist_manngement_title'][1] = ''
@@ -362,13 +364,55 @@ def keypress(self, char):
         if self.too_small:
             return 1, []
         val = list(self._config_options.items())[self.selection]
+        logger.error('val = {}'.format(val))
         if char in self._global_functions.keys():
             self._global_functions[char]()
         elif val[0] == 'radiobrowser':
             if char in (curses.KEY_RIGHT, ord('l'),
                         ord(' '), curses.KEY_ENTER, ord('\n')):
                 return 2, []
 
+        elif val[0] == 'calculated_color_factor':
+            if char in (curses.KEY_RIGHT, ord('l')):
+                t = float(val[1][1])
+                if t < .2:
+                    t = round(t + .01, 2)
+                    logger.error('t = {}'.format(t))
+                    s_t = str(t)[:4]
+                    if s_t == '0.0':
+                        s_t = '0'
+                    logger.error('s_t = ' + s_t)
+                    self._config_options[val[0]][1] = s_t
+                    self._win.addstr(
+                        self.selection+1,
+                        3 + len(val[1][0]),
+                        s_t + '     ', curses.color_pair(6))
+                    self._print_title()
+                    self._win.refresh()
+                    # att = PyRadioThemeReadWrite(self._cnf)
+                    # att._calculate_fifteenth_color()
+                return -1, []
+
+            elif char in (curses.KEY_LEFT, ord('h')):
+                t = float(val[1][1])
+                if t > 0:
+                    t = round(t - .01, 2)
+                    logger.error('t = {}'.format(t))
+                    s_t = str(t)[:4]
+                    if s_t == '0.0':
+                        s_t = '0'
+                    logger.error('s_t = ' + s_t)
+                    self._config_options[val[0]][1] = s_t
+                    self._win.addstr(
+                        self.selection+1,
+                        3 + len(val[1][0]),
+                        s_t + '     ', curses.color_pair(6))
+                    self._print_title()
+                    self._win.refresh()
+                    # att = PyRadioThemeReadWrite(self._cnf)
+                    # att._calculate_fifteenth_color()
+                return -1, []
+
         elif val[0] == 'connection_timeout':
             if char in (curses.KEY_RIGHT, ord('l')):
                 t = int(val[1][1])
@@ -467,6 +511,10 @@ def keypress(self, char):
                 self.mouse_support_option_changed = False
             else:
                 self.mouse_support_option_changed = True
+            if self._saved_config_options['calculated_color_factor'][1] == self._config_options['calculated_color_factor'][1]:
+                self.need_to_update_theme = False
+            else:
+                self.need_to_update_theme = True
             self._saved_config_options = deepcopy(self._config_options)
             if self._cnf.opts != self._saved_config_options:
                 ''' check if player has changed '''

pyradio/radio.py

@@ -2280,7 +2280,7 @@ def _show_main_help(self, from_keyboard=False):
                  m| / |v            ||M|ute player / Save |v|olume (not in vlc).
                  !Misc
                  o| / |s| / |R        ||O|pen / |S|ave / |R|eload playlist.
-                 t| / |T            |Load |t|heme / |T|oggle transparency.
+                 t| / |T| / |~        |Change |t|heme / |T|ransparency / Calc. Background.
                  c                |Open Configuration window.'''
         self._show_help(txt,
                         mode_to_set=self.ws.MAIN_HELP_MODE,
@@ -5752,6 +5752,8 @@ def keypress(self, char):
                         self.player.playback_timeout = int(self._cnf.connection_timeout)
                         if self._config_win.mouse_support_option_changed:
                             self._print_mouse_restart_info()
+                        if self._config_win.need_to_update_theme:
+                            self._theme.recalculate_theme()
                     elif ret == 1:
                         ''' config not modified '''
                         self._show_notification_with_delay(
@@ -8410,7 +8412,6 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
                 self._is_register = True
             else:
                 stationFile, ret = self._cnf._get_playlist_abspath_from_data(stationFile=h_item[0])
-                logger.error('stationFile = {}'.format(stationFile))
                 self._is_register = False
             if ret > 0:
                 ''' Continue going through history items '''