From b2e5cb58c47a27b94e671d68e9c2cca20f4597ab Mon Sep 17 00:00:00 2001 From: nicolargo Date: Sat, 1 Jun 2024 17:28:52 +0200 Subject: [PATCH] Reduce code complexity #2801 --- glances/outputs/glances_curses_browser.py | 27 ++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/glances/outputs/glances_curses_browser.py b/glances/outputs/glances_curses_browser.py index 950a4349..858fd5fc 100644 --- a/glances/outputs/glances_curses_browser.py +++ b/glances/outputs/glances_curses_browser.py @@ -249,15 +249,19 @@ class GlancesCursesBrowser(_GlancesCurses): screen_x = self.screen.getmaxyx()[1] screen_y = self.screen.getmaxyx()[0] stats_max = screen_y - 3 - stats_len = len(stats) - self._page_max_lines = stats_max - self._page_max = int(math.ceil(stats_len / stats_max)) - # Init position - x = 0 - y = 0 + self._page_max = int(math.ceil(len(stats) / stats_max)) - # Display top header + # Display header + x, y = self.__display_header(stats, 0, 0, screen_x, screen_y) + + # Display Glances server list + # ================================ + return self.__display_server_list(stats, x, y, screen_x, screen_y) + + def __display_header(self, stats, x, y, screen_x, screen_y): + stats_len = len(stats) + stats_max = screen_y - 3 if stats_len == 0: if self.first_scan and not self.args.disable_autodiscover: msg = 'Glances is scanning your network. Please wait...' @@ -282,11 +286,14 @@ class GlancesCursesBrowser(_GlancesCurses): msg = f'{page_lines} servers displayed.({self._current_page + 1}/{self._page_max}) {status_count}' self.term_window.addnstr(y + 1, x, msg, screen_x - x) - if stats_len == 0: + return x, y + + def __display_server_list(self, stats, x, y, screen_x, screen_y): + if len(stats) == 0: + # No server to display return False - # Display the Glances server list - # ================================ + stats_max = screen_y - 3 # Table of table # Item description: [stats_id, column name, column size]