fixing issues reported by pylint

Author: s-n-g

pyradio/browser.py

@@ -2374,7 +2374,7 @@ def keypress(self, char):
 
         elif char in (
             curses.KEY_EXIT, 27, kbkey['q']
-        ) or  check_localized(char, (kbkey['q],'])):
+        ) or  check_localized(char, (kbkey['q'], )):
             return -1
 
         elif (char in (kbkey['pause'], curses.KEY_ENTER, ord('\n'), ord('\r')) or \

pyradio/config.py

@@ -104,8 +104,8 @@ class PyRadioStations():
     previous_station_path = ''
 
     ''' this is always on users config dir '''
-    stations_dir = ''
-    registers_dir = ''
+    # stations_dir = ''
+    # registers_dir = ''
 
     ''' True if playlist not in config dir '''
     foreign_file = False
@@ -2089,7 +2089,7 @@ def _check_config_file(self, usr):
         if path.exists(user_config_file + '.restore'):
             try:
                 copyfile(user_config_file + '.restore', user_config_file)
-                remove(self.user_config_file + '.restore')
+                remove(user_config_file + '.restore')
             except:
                 pass
 

pyradio/config_window.py

@@ -38,13 +38,11 @@ def set_global_functions(global_functions):
 
 
 class PyRadioConfigWindow():
-
-    parent = None
     _win = None
 
     _title = 'PyRadio Configuration'
 
-    selection = __selection = 1
+    __selection = 1
 
     ''' Keep a copy of saved values for theme and transparency
         Work-around for 'T' auto save (trasnsparency), and
@@ -3612,7 +3610,7 @@ def item(self, an_item_id=None):
             return self._list[self._selection]
         return self._list[an_item_id]
 
-    def _rename_keyboard_json_file(file_path):
+    def _rename_keyboard_json_file(self, file_path):
         # Check if the file path ends with "keyboard.json"
         if not file_path.endswith("keyboard.json"):
             raise ValueError("The file path must end with 'keyboard.json'")

pyradio/install.py

@@ -138,11 +138,12 @@ def find_pyradio_win_exe():
         an_exe = os.path.join(a_path, 'Scripts' , 'pyradio.exe')
         if os.path.exists(an_exe):
             exe[0] = an_exe
-    an_exe = os.path.join(site.getuserbase(), py_with_ver, 'Scripts' , 'pyradio.exe')
-    # print('an_exe: {}'.format(an_exe))
-    if os.path.exists(an_exe):
-        exe[1] = an_exe
-    # print('exe: {}'.format(exe))
+    if py_with_ver:
+        an_exe = os.path.join(site.getuserbase(), py_with_ver, 'Scripts' , 'pyradio.exe')
+        # print('an_exe: {}'.format(an_exe))
+        if os.path.exists(an_exe):
+            exe[1] = an_exe
+        # print('exe: {}'.format(exe))
     return exe
 
 def fix_pyradio_win_exe():

pyradio/keyboard.py

@@ -974,10 +974,11 @@ def _clear_parent(self, col):
         self._parent.clear()
         self._parent.refresh()
 
-    def _create_win(self, parent):
+    def _create_win(self, parent=None):
         if self._win is not None:
             self._win.clear()
-        self._parent = parent
+        if parent is not None:
+            self._parent = parent
         # self._clear_parent(2)
         self.calculate_window_size()
         self._win = self._parent.subwin(self._height, self._width, self._start_line, 1)

pyradio/log.py

@@ -204,7 +204,7 @@ def _show_time(self, old_time=None):
         if old_time:
             if self.current_time == old_time:
                 # do not update the display
-                return
+                return old_time
 
         # Call _update_functions in a new thread without blocking
         with self.function_lock:
@@ -213,8 +213,9 @@ def _show_time(self, old_time=None):
                 if self._exit():
                     if logger.isEnabledFor(logging.DEBUG):
                         logger.debug('Timer threat asked to stop. Stopping...')
-                    return
+                    return old_time
                 threading.Thread(target=an_update_function, args=(self.current_time,)).start()
+                return self.current_time
 
     def get_current_time(self):
         """ Safely return the current time. Returns an empty string if the timer is not running. """

pyradio/player.py

@@ -310,6 +310,9 @@ class Player():
     GET_AUDIO_FORMAT = b'{ "command": ["get_property", "audio-out-params"], "request_id": 200 }\n'
     GET_AUDIO_CODEC = b'{ "command": ["get_property", "audio-codec"], "request_id": 300 }\n'
     GET_AUDIO_CODEC_NAME = b'{ "command": ["get_property", "audio-codec-name"], "request_id": 400 }\n'
+    GET_ERROR = b'{"command": ["get_property", "error"]}\n'
+    GET_ERROR = b'{"command": ["get_property", "http-header-fields"], "request_id": 500 }\n'
+    INPUT_COMMANDS = b'{"command": ["get_property", "user-data/mpv/ytdl/json-subprocess-result"], "request_id": 600 }\n'
 
     all_config_files = {}
 
@@ -696,9 +699,12 @@ def get_info_string(self, a_station, max_width, win_width):
         ret = '|' + '\n'.join(a_list).replace('Encoding: |', 'Encoding: ').replace('URL: |', 'URL: ').replace('\n', '\n|')
         tail = ''
         if 'icy-name' in self._icy_data:
-            if a_station[0] != self._icy_data['icy-name'] and \
-                    self._icy_data['icy-name'] and \
-                    self._icy_data['icy-name'] != '(null)':
+            if self._cnf._online_browser is None and \
+            (
+                a_station[0] != self._icy_data['icy-name'] and \
+                self._icy_data['icy-name'] and \
+                self._icy_data['icy-name'] != '(null)'
+            ):
                 tail = '\n\nPress |r| to rename station to |Reported Name|, or'
         return ret + '\n\n|Highlighted values| are user specified.\nOther values are station provided (live) data.', tail
 
@@ -1319,11 +1325,12 @@ def updateMPVStatus(self, *args):
                     if stop():
                         break
                     elif b'"file_error":"loading failed"' in a_data:
-                        got_404 = True
-                        logger.error('\n\ngot_404 = {}\n\n'.format(got_404))
-                        if logger.isEnabledFor(logging.INFO):
-                            logger.info('----==== playbak stopped, reason: {} ====----'.format(a_data))
-                        break
+                        self._request_mpv_error(sock)
+                        # got_404 = True
+                        # logger.error('\n\ngot_404 = {}\n\n'.format(got_404))
+                        # if logger.isEnabledFor(logging.INFO):
+                        #     logger.info('----==== playbak stopped, reason: {} ====----'.format(a_data))
+                        # break
                     elif a_data == b'':
                         if logger.isEnabledFor(logging.INFO):
                             logger.info('----==== MPV crashed ====----')
@@ -1646,6 +1653,16 @@ def do_crash_detection(detect_if_player_exited, stop):
             pass
         self._clear_empty_mkv()
 
+    def _request_mpv_error(self, sock):
+        try:
+            if platform.startswith('win'):
+                win32file.WriteFile(sock, self.GET_ERROR)
+            else:
+                # sock.sendall(self.GET_ERROR)
+                sock.sendall(self.INPUT_COMMANDS)
+        except BrokenPipeError:
+            pass
+
     def _request_mpv_info_data(self, sock):
         with self.status_update_lock:
             ret = len(self._icy_data) == 0
@@ -1656,27 +1673,41 @@ def _request_mpv_info_data(self, sock):
         # if ret == 0 or force:
         if ret:
             # logger.error('\n\nIn _request_mpv_info_data')
+            no_get_title_exception = True
             if platform.startswith('win'):
                 if self._request_mpv_info_data_counter == 4:
-                    win32file.WriteFile(sock, self.GET_TITLE)
-                if 'audio_format' not in self._icy_data:
-                    win32file.WriteFile(sock, self.GET_AUDIO_FORMAT)
-                if 'codec' not in self._icy_data:
-                    win32file.WriteFile(sock, self.GET_AUDIO_CODEC)
-                if 'codec-name' not in self._icy_data:
-                    win32file.WriteFile(sock, self.GET_AUDIO_CODEC_NAME)
+                    try:
+                        win32file.WriteFile(sock, self.GET_TITLE)
+                    except BrokenPipeError:
+                        no_get_title_exception = False
+                try:
+                    if 'audio_format' not in self._icy_data:
+                        win32file.WriteFile(sock, self.GET_AUDIO_FORMAT)
+                    if 'codec' not in self._icy_data:
+                        win32file.WriteFile(sock, self.GET_AUDIO_CODEC)
+                    if 'codec-name' not in self._icy_data:
+                        win32file.WriteFile(sock, self.GET_AUDIO_CODEC_NAME)
+                except BrokenPipeError:
+                    pass
             else:
                 if self._request_mpv_info_data_counter == 4:
-                    sock.sendall(self.GET_TITLE)
-                if 'audio_format' not in self._icy_data:
-                    sock.sendall(self.GET_AUDIO_FORMAT)
-                if 'codec' not in self._icy_data:
-                    sock.sendall(self.GET_AUDIO_CODEC)
-                if 'codec-name' not in self._icy_data:
-                    sock.sendall(self.GET_AUDIO_CODEC_NAME)
+                    try:
+                        sock.sendall(self.GET_TITLE)
+                    except BrokenPipeError:
+                        no_get_title_exception = False
+                try:
+                    if 'audio_format' not in self._icy_data:
+                        sock.sendall(self.GET_AUDIO_FORMAT)
+                    if 'codec' not in self._icy_data:
+                        sock.sendall(self.GET_AUDIO_CODEC)
+                    if 'codec-name' not in self._icy_data:
+                        sock.sendall(self.GET_AUDIO_CODEC_NAME)
+                except BrokenPipeError:
+                    pass
+            if no_get_title_exception:
                 self._request_mpv_info_data_counter += 1
-            if self._request_mpv_info_data_counter >= 4:
-                self._request_mpv_info_data_counter = 0
+                if self._request_mpv_info_data_counter >= 4:
+                    self._request_mpv_info_data_counter = 0
 
     def _get_mpv_metadata(self, *args):
         ''' Get MPV metadata
@@ -2701,7 +2732,7 @@ def _stop(self):
         self.stop_mpv_status_update_thread = True
         self._send_mpv_command('quit')
         if not platform.startswith('win'):
-            os.system('rm ' + self.mpvsocket + ' 2>/dev/null');
+            os.system('rm ' + self.mpvsocket + ' 2>/dev/null')
         self._icy_data = {}
         self.monitor = self.monitor_process = self.monitor_opts = None
         if self._chapters:

pyradio/radio.py

@@ -446,6 +446,12 @@ class PyRadio():
 
     _keyboard_config_win = None
 
+    handled_signals = {
+        'SIGHUP': signal.SIGHUP,
+        'SIGTERM': signal.SIGTERM,
+        'SIGKIL': signal.SIGKILL,
+    }
+
     def ll(self, msg):
         logger.error('DE ==========')
         logger.error('DE ===> {}'.format(msg))
@@ -1165,6 +1171,7 @@ def setup(self, stdscr):
         self.run()
 
     def change_player(self, a_player):
+        new_player = None
         if a_player == self.player.PLAYER_NAME:
             pass
         else:
@@ -4524,16 +4531,12 @@ def _show_station_info(self):
         #logger.error('msg\n{}'.format(msg))
         if tail and not self._cnf.browsing_station_service:
             self._station_rename_from_info = True
-            self._messaging_win.set_a_message(
-                'M_STATION_INFO',
-                ('Station Info', msg)
-                )
         else:
             self._station_rename_from_info = False
-            self._messaging_win.set_a_message(
-                'M_STATION_INFO',
-                ('Station Info', msg)
-                )
+        self._messaging_win.set_a_message(
+            'M_STATION_INFO',
+            ('Station Info', msg)
+            )
         self._open_simple_message_by_key_and_mode(
                 self.ws.STATION_INFO_MODE,
                 'M_STATION_INFO'
@@ -7435,8 +7438,9 @@ def keypress(self, char):
 
                 elif ret == self.ws.LOCALIZED_CONFIG_MODE:
                     ''' keyboard localized window '''
-                    self.ws.operation_mode = self.ws.LOCALIZED_CONFIG_MODE
-                    self._localized_init_config()
+                    self._print_not_implemented_yet()
+                    # self.ws.operation_mode = self.ws.LOCALIZED_CONFIG_MODE
+                    # self._localized_init_config()
                     return
 
                 else:
@@ -9772,7 +9776,7 @@ def _stop_player(self, got_404=False):
             else:
                 self.detect_if_player_exited = True
                 logger.error('20 self.detect_if_player_exited = {}'.format(self.detect_if_player_exited))
-                self.playSelection(got_404=got_404)
+                self.playSelection()
             self.refreshBody()
         self.player.recording_filename = ''
         self.player.muted = self.player.paused = False
@@ -10740,16 +10744,11 @@ def _register_signals_handlers(self):
             #         logger.debug('SetConsoleCtrlHandler: Signal SIGINT failed to register (with Exception)!!!')
 
         else:
-            handled_signals = {
-                'SIGHUP': signal.SIGHUP,
-                'SIGTERM': signal.SIGTERM,
-                'SIGKIL': signal.SIGKILL,
-            }
             self.def_signal_handlers = {}
             try:
-                for a_sig in handled_signals:
+                for a_sig in self.handled_signals:
                     self.def_signal_handlers[a_sig] = signal.signal(
-                        handled_signals[a_sig],
+                        self.handled_signals[a_sig],
                         self._linux_signal_handler
                     )
                     if logger.isEnabledFor(logging.DEBUG):
@@ -10803,10 +10802,10 @@ def _linux_signal_handler(self, a_signal, a_frame):
         self.player.close()
         self._cnf.save_config()
         self._cnf.remove_session_lock_file()
-        for a_sig in handled_signals:
+        for a_sig in self.handled_signals:
             try:
                 signal.signal(
-                    handled_signals[a_sig],
+                    self.handled_signals[a_sig],
                     self.def_signal_handlers[a_sig]
                 )
             except:

pyradio/schedule.py

@@ -501,13 +501,13 @@ def item(self):
 
     @item.setter
     def item(self, val):
-        if isinstance(item, str):
+        if isinstance(val, str):
             try:
-                self._item = json.loads(item)
+                self._item = json.loads(val)
             except:
                 raise ValueError('JSON string not supported')
-        elif isinstance(item, dict):
-            self._item = item
+        elif isinstance(val, dict):
+            self._item = val
 
         for n in self.default_item:
             if n not in self._item:
@@ -858,6 +858,9 @@ def set_time(self, a_time_string):
             except ValueError:
                 valid = False
 
+        hour = 0
+        minute = 0
+        seconds  = 0
         if valid:
             if is_12_format == self.PM_FORMAT:
                 ''' pm '''
@@ -927,6 +930,9 @@ def string_to_pyradio_time(cls, a_string):
             except ValueError:
                 valid = False
 
+        hour = 0
+        minute = 0
+        seconds = 0
         if valid:
             if is_12_format == PyRadioTime.PM_FORMAT:
                 ''' pm '''
@@ -969,9 +975,9 @@ def pyradio_time_to_string(cls, a_time):
 
     @classmethod
     def to_24_format(cls, a_time):
-        if a_time[-1] == self.NO_AM_PM_FORMAT:
+        if a_time[-1] == PyRadioTime.NO_AM_PM_FORMAT:
             return a_time
-        elif a_time[-1] == self.PM_FORMAT:
+        elif a_time[-1] == PyRadioTime.PM_FORMAT:
             ''' PM '''
             out = list(a_time)
             out[-1] = 0
@@ -1019,7 +1025,7 @@ def pyradio_time_to_datetime(self, t_date=None, t_time=None):
         if t_date is None:
             a_date = datetime.now()
         else:
-            a_date = t_data
+            a_date = t_date
         b_date= a_date.replace(
             hour = a_time[0],
             minute = a_time[1],

pyradio/schedule_win.py

@@ -546,7 +546,7 @@ def show(self, parent=None):
             self._get_parent(parent)
             if self._showed:
                 self._move_widgets()
-        if self._widgets == None:
+        if self._widgets is None:
             self._add_widgets()
         with self.lock:
             try: