- RadioBrowser Search Window: Display Ctrl keys from keyboard.py (instead of harcdoded)

- Config Window: Add "Shortcuts" section (not working yet)
- Started working on pylint's attribute-defined-outside-init warning

Author: s-n-g

pyradio/browser.py

@@ -23,7 +23,7 @@
 from .countries import countries
 from .simple_curses_widgets import SimpleCursesLineEdit, SimpleCursesHorizontalPushButtons, SimpleCursesWidgetColumns, SimpleCursesCheckBox, SimpleCursesCounter, SimpleCursesBoolean, DisabledWidget, SimpleCursesString, SimpleCursesWidget
 from .ping import ping
-from .keyboard import kbkey, ctrl_code_to_simple_code, kb2chr
+from .keyboard import kbkey, ctrl_code_to_simple_code, kb2chr, ctrl_code_to_string
 locale.setlocale(locale.LC_ALL, '')    # set your locale
 
 logger = logging.getLogger(__name__)
@@ -3089,15 +3089,19 @@ def _print_history_legend(self):
         elif self._selected_history_id == self._default_history_id:
             self._win.addstr(self.maxY - 3, 2, 'Default item', curses.color_pair(4))
 
-        msg = 'History navigation: ^N/^P, HOME,0/END,g,$, PgUp/PgDown'
+        msg = 'History navigation: ' + ctrl_code_to_string(kbkey['rb_h_next']) + '/' + \
+                ctrl_code_to_string(kbkey['rb_h_prev']) +', Home,0/End,g,$, PgUp/PgDown'
         thisX = self.maxX - 2 - len(msg)
         self._win.addstr(self.maxY - 3, thisX, msg.split(':')[0] + ':', curses.color_pair(5))
         msg = msg.split(':')[1]
         thisX = self.maxX - 3 - len(msg)
         self._win.addstr(msg, curses.color_pair(4))
         self._other_chgat(self.maxY - 3, thisX, msg)
         #self._carret_chgat(self.maxY-3, thisX, msg)
-        msg = 'Add/Del: ^Y/^X, Make default: ^B, Save history: ^E'
+        msg = 'Add/Del: ' + ctrl_code_to_string(kbkey['rb_h_add']) + \
+                '/' +  ctrl_code_to_string(kbkey['rb_h_del']) + \
+                ', Make default: ' + ctrl_code_to_string(kbkey['rb_h_def']) +  \
+                ', Save history: ' + ctrl_code_to_string(kbkey['rb_h_save'])
         thisX = self.maxX - 2 - len(msg)
         self._win.addstr(self.maxY - 2, thisX, msg)
         self._carret_chgat(self.maxY-2, thisX, msg)

pyradio/common.py

@@ -173,6 +173,9 @@ class StationsChanges():
     }
 
     keys = None
+    _stations = None
+    _stations_file = None
+    _playlist_version = 0
 
     def __init__(self, config):
         self._cnf = config
@@ -218,7 +221,7 @@ def write_synced_version(self, asked=False):
     def _open_stations_file(self):
         self._stations = []
         self._stations_file = join(self._cnf.stations_dir, 'stations.csv')
-        self._read_playlist_version = self._playlist_version = self.PLAYLIST_HAS_NAME_URL
+        self._playlist_version = self.PLAYLIST_HAS_NAME_URL
         if exists(self._stations_file):
             with open(self._stations_file, 'r', encoding='utf-8') as cfgfile:
                 try:
@@ -232,11 +235,11 @@ def _open_stations_file(self):
                             try:
                                 name, url, enc = [s.strip() for s in row]
                                 self._stations.append([name, url, enc, ''])
-                                self._read_playlist_version = self._playlist_version = self.PLAYLIST_HAS_NAME_URL_ENCODING
+                                self._playlist_version = self.PLAYLIST_HAS_NAME_URL_ENCODING
                             except:
                                 name, url, enc, onl = [s.strip() for s in row]
                                 self._stations.append([name, url, enc, onl])
-                                self._read_playlist_version = self._playlist_version = self.PLAYLIST_HAS_NAME_URL_ENCODING_ICON
+                                self._playlist_version = self.PLAYLIST_HAS_NAME_URL_ENCODING_ICON
                 except:
                     self._stations = []
                     self._playlist_version = self.PLAYLIST_HAS_NAME_URL

pyradio/config.py

@@ -1337,6 +1337,9 @@ class PyRadioConfig(PyRadioStations):
     opts['remote_control_server_auto_start'] = ['Auto-start Server: ', False]
     opts['online_header'] = ['Online services', '']
     opts['radiobrowser'] = ['RadioBrowser', '-']
+    opts['shortcuts'] = ['Keyboard Shortcuts', '']
+    opts['shortcuts_keys'] = ['Shortcuts', '-']
+    opts['shortcuts_alt'] = ['Alternative Shortcuts', '-']
     opts['requested_player'] = ['', '']
     opts['dirty_config'] = ['', False]
 

pyradio/config_window.py

@@ -105,6 +105,9 @@ class PyRadioConfigWindow():
     _help_text.append(['If set to True, the Server will be automatically started when PyRadio starts.', '|', r'If set to False, one can start the Server using the "\s" command from the Main program window.', '|', 'Default value: False'])
     _help_text.append(None)
     _help_text.append(['This options will open the configuration window for the RadioBrowser Online Stations Directory.',])
+    _help_text.append(None)
+    _help_text.append(['This options will open the configuration window for the Shortcuts Definitions.', '|', 'Currently not available.'])
+    _help_text.append(['This options will open the configuration window for the Alternative Shortcuts Definitions.', '|', 'Currently not available.'])
 
     _config_options = None
 

pyradio/keyboard.py

@@ -166,6 +166,7 @@ def populate_dict():
     curses.KEY_F7: 'F7',
     curses.KEY_F8: 'F8',
     curses.KEY_F9: 'F9',
+    curses.KEY_F10: 'F10',
 }
 
 curses_ascii_dict = {
@@ -221,9 +222,7 @@ def read_keyboard_shortcuts(file_path, reset=False):
         except (FileNotFoundError, json.JSONDecodeError, TypeError, IOError):
             pass
         if data is not None:
-            print('========')
             for n in data.keys():
-                print(f'{n} : {data[n]}')
                 kbkey[n] = data[n]  # Modify the existing kbkey
 
 def to_str(akey):

pyradio/radio.py

@@ -395,6 +395,51 @@ class PyRadio():
 
     _function_to_repeat = None
 
+    setup_return_status = True
+
+    _group_color_normal = 2
+    _group_color_active = 9
+
+    log = None
+
+    headWin = None
+    bodyWin = None
+    outerBodyWin = None
+    footerWin = None
+    headWin = None
+    txtWin = None
+
+    maxY = 0
+    maxX = 0
+    outerBodyMaxY = 0
+    outerBodyMaxX = 0
+    bodyMaxY = 0
+    bodyMaxX = 0
+    bodyWinStartY = 0
+    bodyWinEndY = 0
+
+    _missing_dependency = None
+
+    _last_played_station_id = 0
+
+    playback_timeout = 0
+
+
+    buffering = False
+    _curses_key_resize = 0
+    _update_stations_error_count = 0
+    new_filename = None
+    old_filename = None
+    _connection_type_edit = None
+    def_signal_handlers = None
+    _failed_register_file = None
+    _groups = None
+    _old_station_encoding = None
+    _reading_stations = None
+    _register_to_open = None
+    _server_dead_msg = None
+    _server_error_msg = None
+
     def ll(self, msg):
         logger.error('DE ==========')
         logger.error('DE ===> {}'.format(msg))
@@ -987,9 +1032,6 @@ def setup(self, stdscr):
         curses.start_color()
         curses.use_default_colors()
 
-        self._group_color_normal = 2
-        self._group_color_active = 9
-
         if self._cnf.use_themes:
             self._cnf.use_themes = calc_can_change_colors(self._cnf)
         #self._cnf.use_themes = False
@@ -2398,7 +2440,7 @@ def stopPlayerFromKeyboard(
             for the status update thread.
         '''
         logger.error('stopPlayerFromKeyboard()!!!!!')
-        self.stop_mpv_status_update_thread = True
+        self.player.stop_mpv_status_update_thread = True
         self.player.stop_update_notification_thread = True
         self.player.stop_win_vlc_status_update_thread = True
         if from_update_thread:
@@ -3873,7 +3915,7 @@ def _return_from_online_browser_search(self, ret):
         if self._cnf.browsing_station_service:
             self._cnf._online_browser.parent = self.bodyWin
 
-        self._number_of_radio_browser_search_results = ret[1]
+        # self._number_of_radio_browser_search_results = ret[1]
         if ret[1] == 0 and not self._cnf._online_browser.first_search:
             logger.error('DE --== no items found ==--\noperating mode = {}'.format(self.ws.operation_mode))
             ''' display no results message '''
@@ -6008,11 +6050,6 @@ def search_radio_browser_headless(self, index):
                     index,
                     go_back_in_history=False
                 )
-            # if self._number_of_radio_browser_search_results == 0:
-            #     logger.info('return 0 stations info')
-            #     return '<div class="alert alert-danger">0 stations returned!</div>'
-            # logger.info('return number of stations')
-            # return '<div class="alert alert-success">Number of stations: {}</div>'.format(self._number_of_radio_browser_search_results)
         else:
             if logger.isEnabledFor(logging.DEBUG):
                 logger.error('RadioBrowser headles search: browser is not active')
@@ -9658,11 +9695,12 @@ def _rename_playlist_from_normal_mode(self, copy, open_file, create, last_histor
         self.refreshBody()
         self._cnf.remove_playlist_history_duplicates()
         # self.ll('before')
-        self._find_playlists_after_rename(self.old_filename,
-                                          self.new_filename,
-                                          copy,
-                                          open_file,
-                                          old_file_is_reg)
+        self._find_playlists_after_rename(
+                self.old_filename,
+                self.new_filename,
+                copy,
+                open_file,
+                old_file_is_reg)
         if not copy:
             self._cnf.replace_playlist_history_items(
                     self.old_filename,
@@ -10227,16 +10265,16 @@ def _register_signals_handlers(self):
             #         logger.debug('SetConsoleCtrlHandler: Signal SIGINT failed to register (with Exception)!!!')
 
         else:
-            self.handled_signals = {
+            handled_signals = {
                 'SIGHUP': signal.SIGHUP,
                 'SIGTERM': signal.SIGTERM,
                 'SIGKIL': signal.SIGKILL,
             }
             self.def_signal_handlers = {}
             try:
-                for a_sig in self.handled_signals:
+                for a_sig in handled_signals:
                     self.def_signal_handlers[a_sig] = signal.signal(
-                        self.handled_signals[a_sig],
+                        handled_signals[a_sig],
                         self._linux_signal_handler
                     )
                     if logger.isEnabledFor(logging.DEBUG):
@@ -10270,7 +10308,7 @@ def _linux_signal_handler(self, a_signal, a_frame):
             return
         self._system_asked_to_terminate = True
         if logger.isEnabledFor(logging.INFO):
-            # logger.info('System asked me to terminate (signal: {})!!!'.format(list(self.handled_signals.keys())[list(self.handled_signals.values()).index(a_signal)]))
+            # logger.info('System asked me to terminate (signal: {})!!!'.format(list(handled_signals.keys())[list(handled_signals.values()).index(a_signal)]))
             logger.info('My terminal got closed... Terminating...')
         self._force_exit = True
         self.stop_update_notification_thread = True
@@ -10286,10 +10324,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 self.handled_signals:
+        for a_sig in handled_signals:
             try:
                 signal.signal(
-                    self.handled_signals[a_sig],
+                    handled_signals[a_sig],
                     self.def_signal_handlers[a_sig]
                 )
             except:
@@ -10397,10 +10435,8 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
             if self._register_to_open:
                 # logger.error('register_to_open = {}'.format(self._register_to_open))
                 stationFile, ret = self._cnf._get_register_filename_from_register()
-                self._is_register = True
             else:
                 stationFile, ret = self._cnf._get_playlist_abspath_from_data(stationFile=h_item[0])
-                self._is_register = False
             if ret > 0:
                 ''' Continue going through history items '''
                 func()

pyradio/xdg.py

@@ -313,6 +313,7 @@ class XdgDirs():
     dir_fixed_function = None
 
     titles_log_file = None
+    last_rec_dirs = None
 
     def __init__(self, config_dir=None, xdg_compliant=False, a_dir_fix_function=None):
         ''' Parameters