Version 0.8.2 - fixing regressions from 0.8.1

Author: s-n-g

Changelog

@@ -1,6 +1,12 @@
+2019-10-20 s-n-g
+    * Version 0.8.2
+    * Fixing chars H,L,M rejected by line editor
+    * Fixing station editor rejecting "\?"
+    * Updating station's editor help messages
+
 2019-10-19 s-n-g
     * Version 0.8.1
-    * CJK Unified Ideographs supported by the line edittor
+    * CJK Unified Ideographs supported by the line editor
     * On python 2, trying to edit a station whose name contains
       non-ASCII characters is prohibited and will end up in
       displaying a relevant message

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 1)
+version_info = (0, 8, 2)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pyradio/edit.py

@@ -480,8 +480,6 @@ def keypress(self, char):
             elif char == ord('s') and self._focus > 1:
                 ret = self._return_station()
                 self.focus = abs(ret + 2)
-            elif char == ord('?') and self.focus <= 1:
-                ret = 2
             elif (char in (curses.ascii.DC2, 18) and not self._adding) or \
                     (char == ord('r') and not self._adding and self.focus >1):
                 # ^R, revert to saved
@@ -502,10 +500,7 @@ def keypress(self, char):
                    -1: cancel
                 """
                 ret = self._line_editor[self._focus].keypress(self._win, char)
-                if ret == 2:
-                    # display help
-                    ret = 2
-                elif ret == 1:
+                if ret == 1:
                     # get next char
                     ret = 0
                 elif ret == 0:

pyradio/radio.py

@@ -1196,6 +1196,7 @@ def _show_line_editor_help(self):
             DEL|,|^D              |Delete character.
             Backspace|,|^H        |Backspace (delete previous character).
             Up| / |Down           |Go to previous / next field.
+            \\?| / |\\\\             |Insert a "|?|" or a "|\\|", respectively.
             Esc                 |Cancel operation.
 
             |Managing player volume does not work in editing mode.
@@ -1209,6 +1210,7 @@ def _show_line_editor_help(self):
             DEL|,|^D              |Delete character.
             Backspace|,|^H        |Backspace (delete previous character).
             Up| / |Down           |Go to previous / next field.
+            \\?| / |\\\\             |Insert a "|?|" or a "|\\|", respectively.
             Esc                 |Cancel operation.
 
             |Managing player volume does not work in editing mode.
@@ -2064,41 +2066,38 @@ def keypress(self, char):
             """ if no player, don't serve keyboard """
             return
 
-        elif char == ord('H'):
-            if self.ws.operation_mode in \
-                    (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
-                self.jumpnr = ''
-                self._random_requested = False
-                if self.number_of_items > 0:
-                    self.selection = self.startPos
-                    self.refreshBody()
-                return
+        elif char == ord('H') and self.ws.operation_mode in \
+                (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
+            self.jumpnr = ''
+            self._random_requested = False
+            if self.number_of_items > 0:
+                self.selection = self.startPos
+                self.refreshBody()
+            return
 
-        elif char == ord('M'):
-            if self.ws.operation_mode in \
-                    (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
-                self.jumpnr = ''
-                self._random_requested = False
-                if self.number_of_items > 0:
-                    if self.number_of_items < self.bodyMaxY - 2:
-                        self.selection = int(self.number_of_items / 2)
-                    else:
-                        self.selection = self.startPos + int((self.bodyMaxY - 3) / 2)
-                    self.refreshBody()
-                return
+        elif char == ord('M') and self.ws.operation_mode in \
+                (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
+            self.jumpnr = ''
+            self._random_requested = False
+            if self.number_of_items > 0:
+                if self.number_of_items < self.bodyMaxY - 2:
+                    self.selection = int(self.number_of_items / 2)
+                else:
+                    self.selection = self.startPos + int((self.bodyMaxY - 3) / 2)
+                self.refreshBody()
+            return
 
-        elif char == ord('L'):
-            if self.ws.operation_mode in \
-                    (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
-                self.jumpnr = ''
-                self._random_requested = False
-                if self.number_of_items > 0:
-                    if self.number_of_items < self.bodyMaxY - 2:
-                        self.setStation(-1)
-                    else:
-                        self.selection = self.startPos + self.bodyMaxY - 3
-                    self.refreshBody()
-                return
+        elif char == ord('L') and self.ws.operation_mode in \
+                (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
+            self.jumpnr = ''
+            self._random_requested = False
+            if self.number_of_items > 0:
+                if self.number_of_items < self.bodyMaxY - 2:
+                    self.setStation(-1)
+                else:
+                    self.selection = self.startPos + self.bodyMaxY - 3
+                self.refreshBody()
+            return
 
         elif char in (ord('t'), ) and \
                 self.ws.operation_mode not in (self.ws.EDIT_STATION_MODE,