Fixing _max_chars_to_display

Author: s-n-g

Changelog

@@ -3,6 +3,8 @@
     * Main help window separated to two pages (navigation with "n" / "p")
     * Changing "e" to "E" to change a station's encoding
     * Changing "p" to "P" to jump to playing station / loaded playlist
+    * Adding H, L to jump to top / bottom of screen
+    * Canging M to jump to middle of screen
     * Changing volume, saving volume and muting is now available on most
       windows (pop up and questions)
     * Manipulating volume (keys m,v) on a help window, will close it

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 "July 2019"
+.TH PYRADIO 1 "September 2019"
 
 .SH NAME
 .PP
@@ -68,6 +68,16 @@ Play selected station
 Select and play a random station
 .IP \fBSpace\fR/\fBLeft\fR/\fBh
 Stop/start playing selected station
+.IP \fBP\fR
+Jump to playing station
+.IP \fBH\ M\ L
+Jump to top / middle / bottom of screen
+.IP \fBg
+Jump to the start of the playlist
+.IP \fI<n>\fBG
+Jump to the end of the playlist
+.br
+If \fI<n>\fR (line number) was entered, jump to it
 .IP \fB-\fR/\fB+\fR\ or\ \fB,\fR/\fB.
 Change volume
 .IP \fBm
@@ -76,8 +86,26 @@ Mute
 Save volume (\fIMPV\fR and \fIMPlayer\fR only)
 .IP \fBo\ s\ R
 \fBO\fIpen\fR / \fBS\fIave\fR / \fBR\fIeload\fR playlist
+.IP \fBa\ A\fR
+Add / append a new station
+.IP \fBe\fR
+Edit current station
+.IP \fBE\fR
+Change current station's encoding
 .IP \fBDEL\fR,\fBx
 Delete selected station
+.IP \fBJ
+Create a \fIJump tag
+.IP \fI<n>\fB^U\fR,\fI<n>\fB^D
+Move current station up / down
+.br
+If \fI<n>\fR (line number) was entered, or a \fIJump tag\fR has been defined, move the station there
+.IP \fBt
+Open the \fITheme Selection\fR window
+.IP \fBT
+Toggle background transparency
+.IP \fBc
+Open the \fIConfiguration window
 .IP \fB?
 Show keys help
 .IP \fBEsc\fR/\fBq
@@ -178,12 +206,14 @@ Once \fBpyradio\fR has been loaded, one can perform a series of actions on the c
 
 Currently, the following actions are available:
 
-One thing you may want to do is remove a station from a playlist, e.g. when found that it not longer works. You can do that by pressing "\fIDEL\fR" or "\fIx\fR".
+Pressing "\fIa\fR" or "\fIA\fR" will enable you to add a new station (either below the currently selected station or at the end of the list), while "\fIe\fR" will edit the currently selected station. All of these actions will open the "\fIStation Editor\fR".
 
-Pressing "\fIe\fR" will enable you to change the encoding of the selected station. If the station is currently playing, playback will be restarted so that the encoding's change takes effect (hopefully correctly displaying the station/song title).
+If you just want to change the encoding of the selected station, just press "\fIE\fR". If the station is currently playing, playback will be restarted so that the encoding's change takes effect (hopefully correctly displaying the station/song title).
 
 Then, when this is done, you can either save the modified playlist, by pressing "\fIs\fR", or reload the playlist from disk, by pressing "\fIR\fR". A modified playlist will \fIautomatically\fR be saved when \fBpyradio\fR exits (or Ctrl-C is pressed).
 
+One thing you may also want to do is remove a station from a playlist, e.g. when found that it not longer works. You can do that by pressing "\fIDEL\fR" or "\fIx\fR".
+
 Finally, opening another playlist is also possible. Just press "\fIo\fR" and you will be presented with a list of saved playists to choose from. These playlists must be saved beforehand in \fBpyradio\fR's configuration directory.
 
 While executing any of the previous actions, you may get confirmation messages (when opening a playlist while the current one is modified but not saved, for example) or error messages (when an action fails). Just follow the on screen information, keeping in mind that a capital letter as an answer will save this answer in \fBpyradio\fR's configuration file for future reference.
@@ -403,7 +433,7 @@ When the \fITheme selection window\fR is visible, a "\fI[T]\fR" string displayed
 
 \fBpyradio\fR uses session locking, which actually means that only the first instance executed within a given session will be able to write to the configuration file.
 
-Subsequent instances will be "\fIlocked\fR. This means that the user can still play stations, load and edit playlists, load and test themes, but any changes will \fBnot\fR be recorded in the configuration file.  
+Subsequent instances will be "\fIlocked\fR. This means that the user can still play stations, load and edit playlists, load and test themes, but any changes will \fBnot\fR be recorded in the configuration file.
 
 \fBSeeeion unlocking\fR
 
@@ -436,7 +466,7 @@ Let's see what \fBpyradio\fR files exist there:
 
 .HP
 
-\fI$ \fBls -d /usr/lib/python3.7/site-packages
+\fI$ \fBls -d /usr/lib/python3.7/site-packages/pyradio*
 
 \fI/usr/lib/python3.7/site-packages/pyradio-\fB0.7.6.2\fI-py3.7.egg
 .br

pyradio/radio.py

@@ -2051,26 +2051,35 @@ def keypress(self, char):
                     (self.ws.NORMAL_MODE, self.ws.PLAYLIST_MODE):
                 self.jumpnr = ''
                 self._random_requested = False
-                self.selection = self.startPos
-                self.refreshBody()
+                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
-                self.selection = self.startPos + int((self.bodyMaxY - 3) / 2)
-                self.refreshBody()
+                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
-                self.selection = self.startPos + self.bodyMaxY - 3
-                self.refreshBody()
+                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 \

pyradio/simple_curses_widgets.py

@@ -26,8 +26,10 @@ class SimpleCursesLineEdit(object):
     """ Default value for string length """
     _max_chars_to_display = 0
 
+    """ Cursor position within _max_chars_to_display """
     _curs_pos = 0
-    #_max_width = 0
+    """ First char of sting to display """
+    _first = 0
 
     """ init values """
     y = x = 0
@@ -195,14 +197,19 @@ def _calculate_window_metrics(self):
             else:
                 self._disp_caption = ''
         width = len(self._disp_caption) + self._max_chars_to_display + 4
+        logger.error('DE 0 width = {0}, max_chars_to_display = {1}'.format(width, self._max_chars_to_display))
         self._max_chars_to_display = self.width - len(self._disp_caption) - 4
+        logger.error('DE 1 width = {0}, max_chars_to_display = {1}'.format(width, self._max_chars_to_display))
         if self._boxed:
             self._height = 3
         else:
             self._height = 1
-            self._max_chars_to_display -= 2
+            self._max_chars_to_display += 2
+            if not self.bracket:
+                self._max_chars_to_display += 1
         if self.log is not None:
             self.log('string_len = {}'.format(self._max_chars_to_display))
+        logger.error('DE 2 width = {0}, max_chars_to_display = {1}'.format(width, self._max_chars_to_display))
         return
 
     def _prepare_to_show(self):
@@ -252,13 +259,14 @@ def refreshEditWindow(self, opening=False):
                 self._curs_pos = 0
         else:
             if self._string:
-                self._edit_win.addstr(0, 0, self._string, active_edit_color)
+                self._edit_win.addstr(0, 0, self._string[self._first:self._first+self._max_chars_to_display], active_edit_color)
             else:
                 self._curs_pos = 0
         if self.log is not None:
             self.log(' - curs_pos = {}\n'.format(self._curs_pos))
         if self.focused:
             self._edit_win.chgat(0, self._curs_pos, 1, self.cursor_color)
+        logger.error('DE string length = {}'.format(len(self.string)))
 
         self._edit_win.refresh()
 
@@ -404,9 +412,13 @@ def keypress(self, win, char):
         elif char in (curses.KEY_HOME, curses.ascii.SOH):
             """ KEY_HOME, ^A """
             self._curs_pos = 0
+            self._first = 0
         elif char in (curses.KEY_END, curses.ascii.ENQ):
             """ KEY_END, ^E """
             self._curs_pos = len(self._string)
+            self._first = len(self.string) - self._max_chars_to_display
+            if self._first < 0:
+                self._first = 0
         elif char in (curses.ascii.ETB, ):
             """ ^W, clear to start of line """
             self.string = self._string[self._curs_pos:]
@@ -490,6 +502,8 @@ def keypress(self, win, char):
                 self.log('====================\n')
             #if len(self._string) + 1 == self._max_width:
             if len(self._string) == self._max_chars_to_display:
+                logger.error('DE max width reached {0} - {1}'.format(len(self._string), self._max_chars_to_display))
+                #self._first += 1
                 return 1
             if version_info < (3, 0):
                 if 32 <= char < 127: