radio-browser: stations' cursor devided between columns

Author: s-n-g

pyradio/browser.py

@@ -42,6 +42,21 @@ def __init__(self, search=None):
         self._url_timeout = 3
         self._search_timeout = 3
 
+        # Normally outer boddy (holding box, header, internal header) is
+        # 2 chars wider that the internal body (holding the stations)
+        # This property value is half the difference (normally 2 / 2 = 1)
+        # Used to chgat the columns' separators in internal body
+        # Check if the cursor is divided as required and adjust
+        self._outer_internal_body_diff = 1
+
+    @property
+    def outer_internal_body_diff(self):
+        return self._outer_internal_body_diff
+
+    @outer_internal_body_diff.setter
+    def outer_internal_body_diff(self, value):
+        raise ValueError('property is read only')
+
     @property
     def internal_header_height(self):
         return self._internal_header_height
@@ -137,10 +152,12 @@ class PyRadioBrowserInfoBrowser(PyRadioStationsBrowser):
     _have_to_retrieve_url = True
     _internal_header_height = 1
 
-    _url_timeout = 3
-    _search_timeout = 3
 
     def __init__(self, search=None):
+        if PY3:
+            super().__init__()
+        else:
+            super(PyRadioBrowserInfoBrowser, self).__init__()
         self._raw_stations = []
         if search:
             self.search(search)

pyradio/radio.py

@@ -272,7 +272,7 @@ def setup(self, stdscr):
             self.setup_return_status = False
             return
         if logger.isEnabledFor(logging.INFO):
-            logger.info("GUI initialization on python v. {0} on {1}".format(python_version.replace('\n', ' ').replace('\r', ' '), system()))
+            logger.info("TUI initialization on python v. {0} on {1}".format(python_version.replace('\n', ' ').replace('\r', ' '), system()))
             logger.info('Terminal supports {} colors'.format(curses.COLORS))
         self.stdscr = stdscr
         from pyradio import version
@@ -553,10 +553,13 @@ def __displayBodyLine(self, lineNum, pad, station):
         if lineNum + self.startPos == self.selection and \
                 self.selection == self.playing:
             col = curses.color_pair(9)
-            # sep_col = curses.color_pair(5)
+            # initialize col_sep here to have separated cursor
+            sep_col = curses.color_pair(5)
             self.bodyWin.hline(lineNum, 0, ' ', self.bodyMaxX, col)
         elif lineNum + self.startPos == self.selection:
             col = curses.color_pair(6)
+            # initialize col_sep here to have separated cursor
+            sep_col = curses.color_pair(5)
             self.bodyWin.hline(lineNum, 0, ' ', self.bodyMaxX, col)
         elif lineNum + self.startPos == self.playing:
             col = curses.color_pair(4)
@@ -582,8 +585,9 @@ def __displayBodyLine(self, lineNum, pad, station):
 
             if self._cnf.browsing_station_service and sep_col:
                 ticks = self._cnf.online_browser.get_columns_separators(self.bodyMaxX)
-                for n in ticks:
-                    self.bodyWin.chgat(lineNum + 1, n, 1, sep_col)
+                if ticks:
+                    for n in ticks:
+                        self.bodyWin.chgat(lineNum, n - self._cnf.online_browser.outer_internal_body_diff , 1, sep_col)
 
     def run(self):
         if self.ws.operation_mode == self.ws.NO_PLAYER_ERROR_MODE:
@@ -2519,7 +2523,7 @@ def keypress(self, char):
                         self.stations.append(self._station_editor.new_station)
                         self.number_of_items = len(self.stations)
                         self.selection = self.number_of_items - 1
-                        self.startPos = self.number_of_items - self.bodyMaxY2
+                        self.startPos = self.number_of_items - self.bodyMaxY
                     else:
                         ret, self.number_of_items = self._cnf.insert_station(self._station_editor.new_station, self.selection + 1)
                         self.stations = self._cnf.stations