cleaning up old playist validation code

Author: s-n-g

pyradio/config.py

@@ -115,7 +115,6 @@ def __init__(self, stationFile='', user_config_dir=None):
         self.foreign_copy_asked = False
         self.added_stations = 0
         self._is_register = False
-        self.check_playlist = None
 
         ''' True if playlist not in config dir '''
         self.foreign_file = False
@@ -1262,8 +1261,6 @@ class PyRadioConfig(PyRadioStations):
     )
 
     def _init_vars(self):
-        self.check_playlist = False
-
         ''' if debug is on, this will tell the logger to
                 0:  not log input from the player
                 1:  input accepted input from the player
@@ -2318,12 +2315,7 @@ def _read_localized_shortcuts(self, name=None):
             # logger.error('\n\nsetting lkbkey 1\n{}\n\n'.format(reversed_dict))
             set_lkbkey(reversed_dict)
 
-    def read_config(self, distro_config=False, check_playlist=False):
-        if check_playlist:
-            if self._i_created_the_lock_file:
-                self.remove_session_lock_file()
-            self.locked = True
-        self.check_playlist = check_playlist
+    def read_config(self, distro_config=False):
         self._read_config(distro_config=True)
         self.config_opts = deepcopy(self.opts)
         # for n in self.config_opts.items():
@@ -2609,16 +2601,6 @@ def _read_config(self, distro_config=False):
         self.opts['dirty_config'][1] = False
         self.saved_params = deepcopy(self.params)
 
-        if self.check_playlist:
-            self._headless = None
-            self._distro = 'Check Playlist Mode'
-            self.opts['enable_notifications'][1] = '-1'
-            self.opts['remote_control_server_auto_start'][1] = False
-            self.opts['enable_clock'][1] = False
-            self.opts['auto_update_theme'][1] = False
-            self.opts['enable_clock'][1] = True
-            self.opts['time_format'][1] = 0
-
         if self.headless:
             self.opts['remote_control_server_ip'][1], self.opts['remote_control_server_port'][1] = to_ip_port(self._headless)
             self.opts['remote_control_server_auto_start'][1] = True
@@ -2965,12 +2947,6 @@ def save_config(self, from_command_line=False):
                  0: Config saved successfully
                  1: Config not saved (not modified)
                  TODO: 2: Config not saved (session locked) '''
-        if self.check_playlist:
-            if not from_command_line and \
-                    logger.isEnabledFor(logging.INFO):
-                logger.info('Not saving Config (checking playlist mode activated)')
-            return 1
-
         if self.locked:
             if not from_command_line and \
                     logger.isEnabledFor(logging.INFO):
@@ -3635,15 +3611,7 @@ def configure_logger(self, recording_dir=None, debug=None, titles=None):
         if debug or titles:
             if debug and not self.log_debug:
                 # Handler
-                if self._cnf.check_playlist:
-                    if self._cnf.check_output_folder is  None:
-                        ret = self._create_check_output_folder()
-                        if not ret:
-                            return False
-                    log_file = path.join(self._cnf.check_output_folder, 'pyradio.log')
-                    self._cnf.check_output_file = log_file
-                else:
-                    log_file = path.join(path.expanduser('~'), 'pyradio.log')
+                log_file = path.join(path.expanduser('~'), 'pyradio.log')
                 self.debug_handler = logging.FileHandler(log_file)
                 self.debug_handler.setLevel(logging.DEBUG)
 

pyradio/log.py

@@ -290,9 +290,6 @@ def __init__(self,
 
         self._stop_using_buffering_msg = False
 
-        if config.check_playlist:
-            self._check_start_time = datetime.datetime.now()
-            logger.error(f'{self._check_start_time = }')
         self._current_msg_id = STATES.RESET
         self._current_player_id = current_player_id
         self._active_player_id = active_player_id
@@ -627,9 +624,9 @@ def write(self,
                     if msg:
                         msg = fix_chars(msg)
                     if msg_id in (STATES.PLAY, STATES.TITLE):
-                        self.set_win_title(d_msg if d_msg else msg, is_checking_playlist=self._cnf.check_playlist)
+                        self.set_win_title(d_msg if d_msg else msg)
                     elif msg_id not in (STATES.ANY, STATES.VOLUME, STATES.BUFF_MSG):
-                        self.set_win_title(is_checking_playlist=self._cnf.check_playlist)
+                        self.set_win_title()
                     self._write_title_to_log(msg if msg else 'No')
                     self._show_notification(msg)
                     self._set_web_title(msg)
@@ -1086,7 +1083,7 @@ def _restore_startup_window_title(self):
             stdout.flush()
 
     @staticmethod
-    def set_win_title(msg=None, is_checking_playlist=None):
+    def set_win_title(msg=None):
         default = M_STRINGS['win-title']
         # just_return = (
         #     'Config saved',
@@ -1153,9 +1150,7 @@ def set_win_title(msg=None, is_checking_playlist=None):
                 # if logger.isEnabledFor(logging.DEBUG):
                 #     logger.debug('set_win_title(): d_msg = "' + d_msg + '"')
 
-        if is_checking_playlist:
-            d_msg += M_STRINGS['checking-playlist']
-        elif token_id == 0 and Log.locked:
+        if token_id == 0 and Log.locked:
             d_msg += M_STRINGS['session-locked']
 
         if platform.lower().startswith('win'):

pyradio/main.py

@@ -1153,7 +1153,7 @@ def shell():
                 win_title = M_STRINGS['session-locked']
             else:
                 win_title = None
-            Log.set_win_title(win_title, args.check_playlist)
+            Log.set_win_title(win_title)
         except:
             pass