- Cahnging save shortcut (^W and w) to ^E (and e) for RadioBrowser

  Search Window
  - RadioBrowser Search Window uses global functions
  - Removing sudo from linux install

Author: s-n-g

devel/build_install_pyradio

@@ -404,13 +404,13 @@ for prog in sed ;do
 done
 
 # uninstall previous versions
-uninstall 1
+# uninstall 1
 
-# delete any files that were left from previous attempt
-sudo find . -iname "*.pyc" -delete 2>/dev/null
-sudo find . -iname "*.egg" -delete 2>/dev/null
+# # delete any files that were left from previous attempt
+# sudo find . -iname "*.pyc" -delete 2>/dev/null
+# sudo find . -iname "*.egg" -delete 2>/dev/null
 
-echo "***** installing for user..."
+# echo "***** installing for user..."
 do_dev
 
 if [ -e requirements.txt ];then

pyradio.1

@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio 1 "April 2022" PyRadio
+.TH pyradio 1 "May 2022" PyRadio
 
 .SH Name
 .PP

pyradio/browser.py

@@ -2815,7 +2815,7 @@ def _print_history_legend(self):
         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: ^W'
+        msg = 'Add/Del: ^Y/^X, Make default: ^B, Save history: ^E'
         thisX = self.maxX - 2 - len(msg)
         self._win.addstr(self.maxY - 2, thisX, msg)
         self._carret_chgat(self.maxY-2, thisX, msg)
@@ -3052,15 +3052,15 @@ def keypress(self, char):
 
         elif char in (curses.ascii.SO, ):
             ''' ^N - Next history item '''
-            logger.error('^N')
             self._ctrl_n()
 
         elif char in (curses.ascii.DLE, ):
             ''' ^P - Previous history item '''
             self._ctrl_p()
 
-        elif char in (curses.ascii.ETB, ):
-            ''' ^W - Save search history '''
+        # elif char in (curses.ascii.ETB, ):
+        elif char in (curses.ascii.ENQ, ):
+            ''' ^E - Save search history '''
             self._handle_new_or_existing_search_term()
             ''' Save search history '''
             return 5
@@ -3143,10 +3143,9 @@ def keypress(self, char):
                 ''' ^P - Previous history item '''
                 self._ctrl_p()
 
-            elif char in (ord('w'), ):
-                ''' ^W - Save search history '''
+            elif char in (ord('e'), ):
+                ''' ^E - Save search history '''
                 self._handle_new_or_existing_search_term()
-                ''' Save search history '''
                 return 5
 
             elif char in (ord('f'), ):

pyradio/edit.py

@@ -198,11 +198,14 @@ class PyRadioEditor(object):
     # 3: show all
     _too_small = False
 
+    _global_functions = {}
+
     def __init__(self,
                  stations,
                  selection,
                  parent,
                  config_encoding,
+                 global_functions=None,
                  adding=True):
         self._stations = stations
         self._selection = selection
@@ -213,6 +216,9 @@ def __init__(self,
         self._orig_encoding = config_encoding
         self._config_encoding = config_encoding
         self._adding = adding
+        self._global_functions = global_functions
+        if self._global_functions is None:
+            self._global_functions = {}
 
     @property
     def append(self):
@@ -622,6 +628,8 @@ def keypress(self, char):
                     self.new_station = None
                     self._reset_editors_modes()
                     ret = -1
+            elif chr(char) in self._global_functions.keys():
+                self._global_functions[chr(char)]()
 
         if self._focus > 1:
             self._reset_editors_modes()
@@ -645,7 +653,9 @@ class PyRadioRenameFile(object):
     """ PyRadio copy file dialog """
 
     def __init__(self, filename, parent, create=False,
-                 open_afterwards=True, title='', opened_from_editor=False):
+                 open_afterwards=True, title='',
+                 opened_from_editor=False,
+                 global_functions=None):
         self._invalid_chars = '<>|:"\\/?*'
         self.maxY = self.maxX = 0
         self._win = self._parent_win = self._line_editor = None
@@ -681,6 +691,9 @@ def __init__(self, filename, parent, create=False,
         self._open_afterwards = open_afterwards
         self._title = title if title else ' Rename Playlist '
         self._opened_from_editor = opened_from_editor
+        self._global_functions = global_functions
+        if self._global_functions is None:
+            self._global_functions = {}
 
     def __del__(self):
         try:
@@ -1135,6 +1148,8 @@ def keypress(self, char):
                     # cancel
                     self._widgets[0].string = ''
                     ret = -1
+            elif chr(char) in self._global_functions.keys():
+                self._global_functions[chr(char)]()
         #self._show_title()
         #self.show()
         return self._get_result(ret)

pyradio/radio.py

@@ -168,7 +168,6 @@ class PyRadio(object):
         is onen and focus is not in line editor '''
     _chars_to_bypass_on_editor = (ord('m'), ord('v'), ord('.'),
                                   ord(','), ord('+'), ord('-'))
-
     ''' Number of stations to change with the page up/down keys '''
     pageChange = 5
 
@@ -450,7 +449,6 @@ def __init__(self, pyradio_config,
                 '.': self._volume_up,
                 '-': self._volume_down,
                 ',': self._volume_down,
-                'm': self._volume_mute,
                 'v': self._volume_save
         }
 
@@ -480,6 +478,20 @@ def __init__(self, pyradio_config,
             curses.BUTTON_SHIFT: 'BUTTON_SHIFT',
         }
 
+        self._global_functions = {
+            'w': self._tag_a_title,
+            'W': self._toggle_titles_logging,
+            'T': self._toggle_transparency,
+            '+': self._volume_up,
+            '=': self._volume_up,
+            '.': self._volume_up,
+            '-': self._volume_down,
+            ',': self._volume_down,
+            'm': self._volume_mute,
+            'v': self._volume_save
+        }
+
+
     def __del__(self):
         self.transientWin = None
 
@@ -4572,6 +4584,12 @@ def _handle_limited_height_keys(self, char):
             self._update_status_bar_right()
             self._volume_save()
 
+        elif char in (ord('W'), ):
+            self._toggle_titles_logging()
+
+        elif char in (ord('w'), ):
+            self._tag_a_title()
+
     def _browser_server_selection(self):
         if self._cnf._online_browser:
             self._cnf._online_browser.select_servers()
@@ -4798,6 +4816,37 @@ def _can_show_theme_window_in_browser_search(self):
         else:
             return True
 
+    def _toggle_titles_logging(self):
+        self.toggle_titles_logging()
+        self.log.write_start_log_station_and_title()
+        if self._cnf.titles_log.titles_handler:
+            self._show_delayed_notification('___Titles Log Enabled___')
+        else:
+            self._show_delayed_notification('___Titles Log Disabled___')
+
+    def _tag_a_title(self):
+        if self.player.isPlaying():
+            if self._cnf.can_like_a_station():
+                toggled = False
+                if self._cnf.titles_log.titles_handler is None:
+                    self.toggle_titles_logging()
+                    self.log.write_start_log_station_and_title()
+                    toggled = True
+                ret = self._cnf.titles_log.tag_title(self.log)
+                if toggled:
+                    self.toggle_titles_logging()
+            else:
+                ret = 2
+
+            if ret == 0:
+                self._show_delayed_notification('___Title tagged as liked___')
+            elif ret == 1:
+                self._show_delayed_notification('___Error liking Title___', delay=1.2)
+            else:
+                self._show_delayed_notification('___Title already tagged as liked___')
+        else:
+            self._show_delayed_notification('___Error: Player not in playback___', delay=1.2)
+
     def keypress(self, char):
         if self._system_asked_to_terminate:
             ''' Make sure we exit when signal received '''
@@ -4818,42 +4867,15 @@ def keypress(self, char):
             self.ws.NORMAL_MODE,
             self.ws.PLAYLIST_MODE
         ):
-            if self.player.isPlaying():
-                if self._cnf.can_like_a_station():
-                    toggled = False
-                    if self._cnf.titles_log.titles_handler is None:
-                        self.toggle_titles_logging()
-                        self.log.write_start_log_station_and_title()
-                        toggled = True
-                    ret = self._cnf.titles_log.tag_title(self.log)
-                    if toggled:
-                        self.toggle_titles_logging()
-                else:
-                    ret = 2
-
-                if ret == 0:
-                    self._show_delayed_notification('___Title tagged as liked___')
-                elif ret == 1:
-                    self._show_delayed_notification('___Error liking Title___', delay=1.2)
-                else:
-                    self._show_delayed_notification('___Title already tagged as liked___')
-            else:
-                self._show_delayed_notification('___Error: Player not in playback___', delay=1.2)
+            self._tag_a_title()
             return
 
         elif char in (ord('W'), ) and self.ws.operation_mode in (
             self.ws.NORMAL_MODE,
             self.ws.PLAYLIST_MODE
         ):
-            self.toggle_titles_logging()
-            self.log.write_start_log_station_and_title()
-            if self._cnf.titles_log.titles_handler:
-                self._show_delayed_notification('___Titles Log Enabled___')
-            else:
-                self._show_delayed_notification('___Titles Log Disabled___')
+            self._toggle_titles_logging()
             return
-        # if self._limited_width_mode:
-        #     return
 
         ''' if small exit '''
         if self._limited_height_mode or self._limited_width_mode:
@@ -4991,9 +5013,11 @@ def keypress(self, char):
                     self._print_playlist_not_saved_error()
                 else:
                     self._rename_playlist_dialog = PyRadioRenameFile(
-                            self._cnf.station_path if self.ws.operation_mode == self.ws.NORMAL_MODE else self.stations[self.selection][3],
-                            self.outerBodyWin,
-                            opened_from_editor=True if self.ws.operation_mode == self.ws.NORMAL_MODE else False)
+                        self._cnf.station_path if self.ws.operation_mode == self.ws.NORMAL_MODE else self.stations[self.selection][3],
+                        self.outerBodyWin,
+                        opened_from_editor=True if self.ws.operation_mode == self.ws.NORMAL_MODE else False,
+                        global_functions=self._global_functions,
+                    )
                     if self.ws.operation_mode == self.ws.NORMAL_MODE:
                         #self._rename_playlist_dialog.checked_checkbox = (False, False)
                         if self._cnf.is_register:
@@ -5014,10 +5038,12 @@ def keypress(self, char):
                     ''' do not create playlist from registers list '''
                     self._update_status_bar_right(status_suffix='')
                     self._rename_playlist_dialog = PyRadioRenameFile(
-                            self._cnf.station_path,
-                            self.outerBodyWin,
-                            opened_from_editor=False,
-                            create=True)
+                        self._cnf.station_path,
+                        self.outerBodyWin,
+                        opened_from_editor=False,
+                        global_functions=self._global_functions,
+                        create=True
+                    )
                     self._rename_playlist_dialog.title = ' Create Playlist '
                     self._rename_playlist_dialog.show()
                     self.ws.operation_mode = self.ws.CREATE_PLAYLIST_MODE
@@ -5498,10 +5524,6 @@ def keypress(self, char):
             ''' In station editor '''
             # logger.error('DE char = {0} - {1}'.format(char, chr(char)))
             restart_player = False
-            if char in self._chars_to_bypass_on_editor and \
-                    self._station_editor.focus > 1:
-                self.volume_functions[chr(char)]()
-                return
             ret = self._station_editor.keypress(char)
             if ret == -3:
                 self._print_editor_url_error()
@@ -5578,10 +5600,6 @@ def keypress(self, char):
 
         elif self.ws.operation_mode in (self.ws.RENAME_PLAYLIST_MODE, self.ws.CREATE_PLAYLIST_MODE):
             '''  Rename playlist '''
-            if char in self._chars_to_bypass_on_editor and \
-                    self._rename_playlist_dialog.focus > 0:
-                self.volume_functions[chr(char)]()
-                return
             ret, self.old_filename, self.new_filename, copy, open_file, pl_create = self._rename_playlist_dialog.keypress(char)
             # logger.error('DE\n\n **** ps.p {}\n\n'.format(self._cnf._ps._p))
             if ret not in (0, 2):
@@ -6213,7 +6231,7 @@ def keypress(self, char):
 
         elif char in (ord('+'), ord('='), ord('.'),
                       ord('-'), ord(','), ord('m'),
-                      ord('v')):
+                      ord('v'), ord('W'), ord('w')):
             self._handle_limited_height_keys(char)
             return
 
@@ -6682,7 +6700,8 @@ def keypress(self, char):
                         self.stations,
                         self.selection,
                         self.outerBodyWin,
-                        self._cnf.default_encoding)
+                        self._cnf.default_encoding,
+                        global_functions=self._global_functions)
                     if char == ord('A'):
                         self._station_editor.append = True
                     self._station_editor.show()
@@ -6741,6 +6760,7 @@ def keypress(self, char):
                         self.selection,
                         self.outerBodyWin,
                         self._cnf.default_encoding,
+                        global_functions=self._global_functions,
                         adding=False)
                     self._station_editor.show(self.stations[self.selection])
                     self.ws.operation_mode = self.ws.EDIT_STATION_MODE

pyradio_rb.1

@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio_rb 1 "April 2022" pyradio
+.TH pyradio_rb 1 "May 2022" pyradio
 
 .SH Name
 .PP