station encoding can now get a "Default" value, to leave the station's

encoding empty. This will make it use the default (config) encoding.

Author: s-n-g

pyradio/common.py

@@ -643,6 +643,8 @@ class CsvReadWrite():
     ''' A base class to read and write a PyRadio playlist '''
     _items = None
 
+    encoding_to_remove = None
+
     def __init__(self, a_file=None):
         self._file = a_file
 
@@ -722,6 +724,10 @@ def read(self, a_file=None):
                         else:
                             buffering = '0@128'
 
+                        if self.encoding_to_remove is not None:
+                            if enc == self.encoding_to_remove:
+                                enc = ''
+
                         # Append the parsed values to the reading stations list
                         station_info = [
                             name, url, enc, {'image': icon} if icon else '',
@@ -760,6 +766,9 @@ def _format_playlist_row(self, a_row):
         # Extract the 'image' from the icon dictionary if present
         if len(this_row) > Station.icon and 'image' in this_row[Station.icon]:
             this_row[Station.icon] = this_row[Station.icon]['image']
+        if self.encoding_to_remove is not None:
+            if this_row[Station.encoding] == self.encoding_to_remove:
+                this_row[Station.encoding] = ''
 
         if len(this_row) > Station.buffering:
             if this_row[Station.buffering] == '0@128':

pyradio/config.py

@@ -718,6 +718,7 @@ def read_playlist_file(
             self._read_playlist_version = self._playlist_version = Station.url
             self._reading_stations = []
             csv_in = CsvReadWrite(a_file=stationFile)
+            csv_in.encoding_to_remove = self.default_encoding
             ret = csv_in.read()
             if not ret:
                 self._reading_stations = []
@@ -855,6 +856,7 @@ def save_playlist_file(self, stationFile=''):
             return 0
 
         out_csv = CsvReadWrite(st_file)
+        out_csv.encoding_to_remove = self.default_encoding
         ret = out_csv.write(items=self.stations)
         if ret == 0:
             self.dirty_playlist = False

pyradio/config_window.py

@@ -2514,14 +2514,18 @@ class PyRadioSelectEncodings():
     _invalid = []
 
     def __init__(self, maxY, maxX, encoding, config_encoding,
-                 global_functions=None):
+                 global_functions=None, show_default=False):
         self._parent_maxY = maxY
         self._parent_maxX = maxX
         self.encoding = encoding
+        logger.error('I got encoding = "{}"'.format(encoding))
         self._orig_encoding = encoding
         self._config_encoding = config_encoding
         self._orig_encoding = encoding
         self._encodings = get_encodings()
+        self._show_default = show_default
+        if show_default:
+            self._encodings += [['Default', '', 'Use the encoding set in the config']]
         self._num_of_rows = int(len(self._encodings) / self._num_of_columns)
         self.init_window()
 
@@ -2695,11 +2699,17 @@ def _resize(self, init=False):
         self.refresh_selection()
 
     def setEncoding(self, this_encoding, init=False):
+        logger.error(f'{this_encoding = }')
         ret = self._is_encoding(this_encoding)
         if ret == -1:
-            if logger.isEnabledFor(logging.ERROR):
-                logger.error('encoding "{}" not found, reverting to "utf-8"'.format(this_encoding))
-            self.encoding = 'utf-8'
+            if self._show_default:
+                if logger.isEnabledFor(logging.ERROR):
+                    logger.error('encoding "{}" not found, reverting to "Default"'.format(this_encoding))
+                self.encoding = 'Default'
+            else:
+                if logger.isEnabledFor(logging.ERROR):
+                    logger.error('encoding "{}" not found, reverting to "utf-8"'.format(this_encoding))
+                self.encoding = 'utf-8'
             self.selection = self._is_encoding(self.encoding)
         else:
             self.selection = ret
@@ -2714,7 +2724,8 @@ def in_alias(a_list, a_string):
                     return True
             return False
         for i, an_encoding in enumerate(self._encodings):
-            if a_string == an_encoding[0] or in_alias(an_encoding[1], a_string):
+            if a_string == an_encoding[0] or \
+                    in_alias(an_encoding[1], a_string):
                 return i
         return -1
 

pyradio/edit.py

@@ -750,14 +750,15 @@ def _show_extra_fields(self):
                     col[self._focus-sid] = 9
                 except IndexError:
                     pass
+            disp_encoding = 'Default' if self._encoding == self._config_encoding else self._encoding
             logger.error(f'{self.item = }')
             logger.error(f'{self._volume = }')
             self._win.addstr(7, 2, 'Volume:', curses.color_pair(4))
             self._win.addstr(' ' + f'{self._volume:>3}' + ' ', curses.color_pair(col[0]))
             self._win.addstr('    ' + 'Buffering:', curses.color_pair(4))
             self._win.addstr(' ' + f'{self._buff:>2}' + ' ', curses.color_pair(col[1]))
             self._win.addstr('    ' + 'Encoding:', curses.color_pair(4))
-            self._win.addstr(' ' + self._encoding + ' ', curses.color_pair(col[2]))
+            self._win.addstr(' ' + disp_encoding + ' ', curses.color_pair(col[2]))
             # delete to end of line
             y, x = self._win.getyx()
             self._win.addstr((self.maxX - x -1) * ' ', curses.color_pair(5))
@@ -799,6 +800,8 @@ def _display_field_tip(self):
                 self._win.addstr(12, x, 'Tip: ', curses.color_pair(4))
                 self._win.addstr('Press ', curses.color_pair(5))
                 self._win.addstr('Enter ', curses.color_pair(4))
+                self._win.addstr('or ', curses.color_pair(5))
+                self._win.addstr('Space ', curses.color_pair(4))
                 self._win.addstr('to activate', curses.color_pair(5))
         elif self._focus == 7:
             ''' Tip: Press \\p before pasting here '''
@@ -888,10 +891,14 @@ def _return_station(self):
                 sp = buff.split('@')
                 sp[0] = self._buff
                 buff = '@'.join(sp)
+                if self._encoding in ('Default', self._config_encoding):
+                    encoding = ''
+                else:
+                    encoding = self._encoding
                 self.new_station = [
                     self._line_editor[0].string.strip(),
                     self._line_editor[1].string.strip(),
-                    self._encoding,
+                    encoding,
                     {'image': self._line_editor[2].string.strip()},
                     self._profile,
                     buff,

pyradio/radio.py

@@ -679,7 +679,7 @@ def __init__(self, pyradio_config,
             self.ws.DELETE_PLAYLIST_MODE: self._ask_to_delete_playlist,
             self.ws.KEYBOARD_CONFIG_MODE: self._redisplay_keyboard_config,
             self.ws.LOCALIZED_CONFIG_MODE: self._redisplay_localized_config,
-            self.ws.EDIT_PROFILE_MODE: self._redisplay_profile_config,
+            self.ws.EDIT_PROFILE_MODE: self._redisplay_profile_editor,
         }
 
         self._help_keys = {
@@ -2625,7 +2625,8 @@ def playSelection(self, restart=False):
             self._last_played_station_id = self.selection
             with self._check_lock:
                 self._station_to_check_id = self.selection
-                logger.error('********* checking {} : {} ********\n'.format(self._station_to_check_id, self.stations[self._station_to_check_id]))
+                if logger.isEnabledFor(logging.INFO):
+                    logger.info('\n*********\nstarting id = {}\n:{}\n********\n'.format(self._station_to_check_id, self.stations[self._station_to_check_id]))
             # logger.error('setting playing to {}'.format(self.selection))
             self.playing = self.selection
             if not stream_url:
@@ -5653,7 +5654,7 @@ def _localized_init_config(self, parent=None):
                     )
         self._keyboard_localized_win.show(parent=self.outerBodyWin)
 
-    def _redisplay_profile_config(self):
+    def _redisplay_profile_editor(self):
         if self._station_profile_editor is None:
             profiles = ['Default'] + self._cnf.profile_manager.all_profiles()
             profile = self._station_editor.profile
@@ -8128,19 +8129,27 @@ def keypress(self, char):
                 ''' display line editor help '''
                 self._show_line_editor_help()
             elif ret == 3:
+                logger.error('\n\nHERE\n\n')
                 ''' show encoding '''
-                if self._station_editor._encoding == '':
-                    self._station_editor._encoding = self._cnf.default_encoding
+                if self._station_editor._encoding == '' or \
+                    self._station_editor._encoding == self._cnf.default_encoding:
+                    self._station_editor._encoding = 'Default'
                 self.ws.operation_mode = self.ws.EDIT_STATION_ENCODING_MODE
-                self._encoding_select_win = PyRadioSelectEncodings(self.outerBodyMaxY,
-                        self.outerBodyMaxX, self._station_editor._encoding, self._cnf.default_encoding)
+                self._encoding_select_win = PyRadioSelectEncodings(
+                    self.outerBodyMaxY,
+                        self.outerBodyMaxX,
+                    self._station_editor._encoding,
+                    self._cnf.default_encoding,
+                    show_default=True
+                )
+                logger.error('{}'.format(self._station_editor._encoding))
                 self._encoding_select_win.set_reduced_global_functions(self._global_functions)
                 self._encoding_select_win.init_window()
                 self._encoding_select_win.refresh_win()
                 self._encoding_select_win.setEncoding(self._station_editor._encoding)
             elif ret == 5:
                 self.ws.operation_mode = self.ws.EDIT_PROFILE_MODE
-                self._redisplay_profile_config()
+                self._redisplay_profile_editor()
             return
 
         elif self.ws.operation_mode in (self.ws.RENAME_PLAYLIST_MODE, self.ws.CREATE_PLAYLIST_MODE):