adding get_internal_header

Author: s-n-g

pyradio/browser.py

@@ -477,36 +477,45 @@ def _get_output_format(self, width):
         else:
             self._output_format = 5
 
-    def get_columns_separators(self, width, force_py2=False):
-        if not force_py2 and not PY3:
-            return []
+    def get_columns_separators(self, width):
         self._get_output_format(width)
         if self._output_format == 0:
-            return []
+            return ()
         elif self._output_format == 1:
-            return [ width - 10 ]
+            return ( width - 10 )
         elif self._output_format == 2:
-            return [width -18,
+            return (width -18,
                     width -10
-                    ]
+                    )
         elif self._output_format == 3:
-            return [width -27,
+            return (width -27,
                     width -19,
                     width -10
-                    ]
+                    )
         elif self._output_format == 4:
-            return [width -42,
+            return (width -42,
                     width -34,
                     width -25,
                     width -14
-                    ]
+                    )
         elif self._output_format == 5:
-            return [width -58,
+            return (width -58,
                     width -50,
                     width -41,
                     width -30,
                     width -15
-                    ]
+                    )
+
+    def get_internal_header(self, width):
+        title = ((),
+                ('Bitrate'),
+                ('Votes', 'Bitrate'),
+                ('Votes', 'Clicks', 'Bitrate'),
+                ('Votes', 'Clicks', 'Bitrate', 'Country'),
+                ('Votes', 'Clicks', 'Bitrate', 'Country', 'Language')
+        )
+        col_sep = self.get_columns_separators(width)
+        return col_sep, title[self._output_format]
 
 
 class PyRadioBrowserInfoData(object):

pyradio/radio.py

@@ -493,7 +493,7 @@ def _print_body_header(self):
             cur_mode = self.ws.previous_operation_mode
         if cur_mode == self.ws.NORMAL_MODE:
             if self._cnf.browsing_station_service:
-                ticks = self._cnf.online_browser.get_columns_separators(self.bodyMaxX - 2, force_py2=True)
+                ticks = self._cnf.online_browser.get_columns_separators(self.bodyMaxX - 2)
                 if ticks:
                     for n in ticks:
                         if version_info < (3, 0):
@@ -558,7 +558,7 @@ def __displayBodyLine(self, lineNum, pad, station):
             self.bodyWin.addstr(lineNum + 1, 1, line, col)
 
             if self._cnf.browsing_station_service and sep_col:
-                ticks = self._cnf.online_browser.get_columns_separators(self.bodyMaxX - 2, force_py2=True)
+                ticks = self._cnf.online_browser.get_columns_separators(self.bodyMaxX - 2)
                 for n in ticks:
                     self.bodyWin.chgat(lineNum + 1, n, 1, sep_col)