- version 0.9.2.3

- fixing search function for Group Selection window (pressing "n" or "N" will now work)
- random playback will not stop on a Group Header
- do not put new selection in the middle of window if already visible (Group Selection window)

Author: s-n-g

Changelog

@@ -1,3 +1,11 @@
+2023-04-01 s-n-g
+    * version 0.9.2.3
+    * fixing search function for Group Selection window (pressing
+      "n" or "N" will now work)
+    * random playback will not stop on a Group Header
+    * do not put new selection in the middle of window if already
+      visible (Group Selection window)
+
 2023-03-31 s-n-g
     * version 0.9.2.2
     * adding support for Groups in playlists

README.html

@@ -202,6 +202,14 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <pre style="height: 200px;">
 
+2023-04-01 s-n-g
+    * version 0.9.2.3
+    * fixing search function for Group Selection window (pressing
+      "n" or "N" will now work)
+    * random playback will not stop on a Group Header
+    * do not put new selection in the middle of window if already
+      visible (Group Selection window)
+
 2023-03-31 s-n-g
     * version 0.9.2.2
     * adding support for Groups in playlists

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyradio"
-version = "0.9.2.2"
+version = "0.9.2.3"
 authors = [
   { name="Ben Dowling", email="[email protected]" },
   { name="Spiros Georgaras", email="[email protected]" },

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 9, 2, 2)
+version_info = (0, 9, 2, 3)
 
 # Set it to True if new stations have been
 # added to the package's stations.csv

pyradio/radio.py

@@ -4721,7 +4721,11 @@ def get_active_encoding(self, an_encoding):
     def play_random(self):
         # Pick a random radio station
         if self.number_of_items > 0:
-            self.setStation(random.randint(0, len(self.stations)))
+            while True:
+                rnd = random.randint(0, len(self.stations))
+                if self.stations[rnd][1] != '-':
+                    break
+            self.setStation(rnd)
             self.playSelection()
             self._put_selection_in_the_middle(force=True)
             self.refreshBody()
@@ -7765,28 +7769,6 @@ def keypress(self, char):
                 self.refreshBody()
             return
 
-        elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
-            ret = self._group_selection_window.keypress(char)
-            if ret <= 0:
-                if ret == 0:
-                    ret = self._groups[self._group_selection_window.selection][0]
-                    self.setStation(ret)
-                    self._put_selection_in_the_middle(force=True)
-                    self.refreshBody()
-                    self.selections[self.ws.NORMAL_MODE] = [self.selection,
-                                                            self.startPos,
-                                                            self.playing,
-                                                            self.stations]
-                self._group_selection_window = None
-                self._groups = None
-                self.ws.close_window()
-                self.refreshBody()
-            elif ret == 2:
-                ''' show help '''
-                self._show_group_help()
-                pass
-            return
-
         elif self.ws.operation_mode == self.ws.UPDATE_NOTIFICATION_OK_MODE:
             if char in self._global_functions.keys():
                 self._global_functions[char]()
@@ -7816,9 +7798,10 @@ def keypress(self, char):
                 self.refreshBody()
             return
 
+        # elif char in (ord('n'), ) and \
+        #         self.ws.operation_mode in self._search_modes.keys():
         elif char in (ord('n'), ) and \
                 self.ws.operation_mode in self._search_modes.keys():
-            # logger.error('DE n operation_mode = {}'.format(self.ws.operation_mode))
             self._give_me_a_search_class(self.ws.operation_mode)
             if self.ws.operation_mode == self.ws.NORMAL_MODE:
                 self._update_status_bar_right()
@@ -7948,6 +7931,28 @@ def keypress(self, char):
                 self.refreshBody()
                 return
 
+        elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
+            ret = self._group_selection_window.keypress(char)
+            if ret <= 0:
+                if ret == 0:
+                    ret = self._groups[self._group_selection_window.selection][0]
+                    self.setStation(ret)
+                    self._put_selection_in_the_middle(force=True)
+                    self.refreshBody()
+                    self.selections[self.ws.NORMAL_MODE] = [self.selection,
+                                                            self.startPos,
+                                                            self.playing,
+                                                            self.stations]
+                self._group_selection_window = None
+                self._groups = None
+                self.ws.close_window()
+                self.refreshBody()
+            elif ret == 2:
+                ''' show help '''
+                self._show_group_help()
+                pass
+            return
+
         elif char in (ord('T'), ):
             self._update_status_bar_right()
             if self.ws.operation_mode == self.ws.SESSION_LOCKED_MODE:

pyradio/simple_curses_widgets.py

@@ -1726,7 +1726,6 @@ def __init__(self,
         )
         self._get_window()
         self._calculate_max_height_max_width()
-        self._verify_selection_not_on_caption()
         self._make_sure_selection_is_visible()
 
     @property
@@ -1818,17 +1817,23 @@ def _set_selection(self, a_sel):
             self._old_start_pos = self._start_pos
 
             self._selection = a_sel
-            self._make_sure_selection_is_visible()
-            self._verify_selection_not_on_caption()
 
-            # log_it('last line = {}'.format(self._start_pos + self._maxY))
-            if a_sel < self._start_pos or a_sel >= self._start_pos + self._body_maxY:
-                self._start_pos = self._selection - int(self._body_maxY / 2) + 1
+            if self._make_sure_selection_is_visible():
                 self._refresh()
             else:
                 self._toggle_selected_item()
 
 
+            # self._make_sure_selection_is_visible()
+
+            # # log_it('last line = {}'.format(self._start_pos + self._maxY))
+            # if a_sel < self._start_pos or a_sel >= self._start_pos + self._body_maxY:
+            #     self._start_pos = self._selection - int(self._body_maxY / 2) + 1
+            #     self._refresh()
+            # else:
+            #     self._toggle_selected_item()
+
+
     def _get_window(self):
         Y, X = self._parent.getmaxyx()
         # log_it('== WIN Y = {0}, X = {1}'.format(Y, X))
@@ -1959,7 +1964,6 @@ def show(self, parent=None):
             return
 
         if new_win:
-            self._verify_selection_not_on_caption()
             self._make_sure_selection_is_visible()
             self.show()
             return
@@ -1987,6 +1991,7 @@ def _refresh(self):
             self._start_pos = 0
         elif self._start_pos > len(self._items) - 1 - self._body_maxY:
             self._start_pos = len(self._items) - self._body_maxY
+        # logger.error('refresh (st={0}, sel={1})'.format(self._start_pos, self._selection))
         for i in range(0, self._body_maxY):
             item_id = i + self._start_pos
             disp_item = self._format_line(i, active_item_length)
@@ -2063,19 +2068,28 @@ def _get_item_color(self, item_id):
         # log_it('--- END ---')
         return col
 
-    def _make_sure_selection_is_visible(self):
+    def _make_sure_selection_is_visible(self, mov=1):
+        ''' adjust self._start_pos to make self._selection visible
+            Returns
+                True    self._start_pos changed (use self._refresh)
+                False   self._start_pos not changed (use self._toggle_selected_item)
+        '''
         if len(self._items) <= self._body_maxY:
             self._start_pos = 0
             return
+        self._verify_selection_not_on_caption(mov)
+        self._old_start_pos = self._start_pos
         meso = int(self._body_maxY / 2)
-        st = old_st = self._start_pos
-        en = st + self._body_maxY - 1
+        self._end_pos = self._start_pos + self._body_maxY - 1
+
+        if self._start_pos <= self._selection <= self._end_pos:
+            return False
 
-        st = self._selection - meso
+        self._start_pos = self._selection - meso
 
-        if st < 0:
-            st = 0
-        self._start_pos = st
+        if self._start_pos < 0:
+            self._start_pos = 0
+        return True
 
     def _verify_selection_not_on_caption(self, movement=1):
         # log_it('\n\n1 mov = {0}, sel = {1}, items = {2}'.format(movement, self._selection, len(self._items)))
@@ -2121,8 +2135,10 @@ def delete_item(self, target):
             self.active = -1
 
         self._verify_selection_not_on_caption(mov)
-        if not self._make_sure_selection_is_visible():
+        if self._make_sure_selection_is_visible():
             self._refresh()
+        else:
+            self._toggle_selected_item()
 
         return len(self._items)
 
@@ -2158,6 +2174,7 @@ def _toggle_selected_item(self):
             # )
             # log_it('_toggle_selection_item: X={0}, setting new selection: {1}, line: {2}'.format(self._X, selection_id, self._Y + selection_id))
             update = True
+        # logger.error('toggle (st={0}, sel={1})'.format(self._start_pos, self._selection))
         if update:
             self._win.refresh()
             return True