- tor-commits - lists.torproject.org

[arm/master] Merging krkhan's menus work
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit ccd77c1e77c30265a6d36732697854cf6afc069b Merge: 32c6f17 62f1188 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 2 08:59:45 2011 -0700 Merging krkhan's menus work src/cli/__init__.py | 2 +- src/cli/controller.py | 17 ++- src/cli/menu.py | 438 +++++++++++++++++++++++++++++++++++++++++++++++++ src/cli/popups.py | 9 +- src/util/menuItem.py | 39 +++++ src/util/panel.py | 18 ++- 6 files changed, 518 insertions(+), 5 deletions(-)

1 0

[arm/master] Added support for File->Exit and Configuation->Reset Tor.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 62f118867dca5848d798bc2747a87b517bf81db9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jun 2 15:28:07 2011 +0500 Added support for File->Exit and Configuation->Reset Tor. Event handlers can return a key which shall be carried all the way back to the controller which can use it for the next override in case it's recognized. Exit and Reset Tor return 'q' and 'x' keys respectively. cli.__all__ is updated to include menu module. --- src/cli/__init__.py | 2 +- src/cli/controller.py | 5 ++++- src/cli/menu.py | 15 +++++++++++---- src/util/menuItem.py | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 1564f68..81fabeb 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "menu", "popups", "torrcPanel"] diff --git a/src/cli/controller.py b/src/cli/controller.py index d073312..bb258c3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -518,7 +518,10 @@ def drawTorMonitor(stdscr, startTime): menu = cli.menu.Menu() menuKeys = menu.showMenu(keys=menuKeys) if menuKeys != []: - overrideKey = ord('m') + for key in (ord('m'), ord('q'), ord('x')): + if key in menuKeys: + menuKeys.remove(key) + overrideKey = key elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py index beceb01..47e8d09 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -19,7 +19,7 @@ class Menu(): DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( menuItem.MenuItem(label="File", children=( menuItem.MenuItem(label="Exit", - callback=self._callbackDefault),)), + callback=lambda item: self._callbackReturnKey(ord('q'))),)), menuItem.MenuItem(label="Logs", children=( menuItem.MenuItem(label="Events", callback=lambda item: self._callbackPressKey('log', ord('e'))), @@ -88,7 +88,7 @@ class Menu(): menuItem.MenuItem(label="Reload", callback=lambda item: self._callbackPressKey('configFile', ord('r'))), menuItem.MenuItem(label="Reset Tor", - callback=self._callbackDefault),)) + callback=lambda item: self._callbackReturnKey(ord('x'))),)) )) self._first = [0] @@ -291,6 +291,7 @@ class Menu(): cascaded, returnkeys = self._cascadeNLevel() if cascaded == False: index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] + 1 + returnkeys.append(ord('m')) for i in range(index): returnkeys.append(curses.KEY_RIGHT) returnkeys.append(curses.KEY_DOWN) @@ -298,6 +299,7 @@ class Menu(): elif key == curses.KEY_LEFT: index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] - 1 index = index % self._rootItem.getChildrenCount() + returnkeys.append(ord('m')) for i in range(index): returnkeys.append(curses.KEY_RIGHT) returnkeys.append(curses.KEY_DOWN) @@ -306,7 +308,9 @@ class Menu(): self._removeLevel() break elif uiTools.isSelectionKey(key): - self._handleEvent() + returnkey = self._handleEvent() + if returnkey: + returnkeys.append(returnkey) self._removeLevel() break @@ -374,7 +378,7 @@ class Menu(): item = self._getCurrentItem() if item.isLeaf(): - item.select() + return item.select() else: self._cascadeNLevel() @@ -429,3 +433,6 @@ class Menu(): panel = control.getPanel(panel) panel.handleKey(key) + def _callbackReturnKey(self, key): + return key + diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 6868db6..b48c433 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -35,5 +35,5 @@ class MenuItem(): return len(self._children) def select(self): - self._callback(self) + return self._callback(self)

1 0

[arm/master] fix: minor tweaks to the readme summary wording
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 32c6f177144f634cd19ae1fb12ebbe268466470d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon May 30 09:25:58 2011 -0700 fix: minor tweaks to the readme summary wording --- README | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 456aba1..b20ec1c 100644 --- a/README +++ b/README @@ -4,13 +4,13 @@ All code under the GPL v3 (http://www.gnu.org/licenses/gpl.html) Project page: www.atagar.com/arm Description: -Command line application for monitoring Tor relays, providing real time status +Command line application for monitoring Tor, providing real time status information such as the current configuration, bandwidth usage, message log, connections, etc. This uses a curses interface much like 'top' does for system usage. The application is intended for command-line aficionados, ssh -connections, and anyone stuck with a tty terminal for checking their relay's -status. Releases should be stable so if you manage to make it crash (or have a -feature request) then please let me know! +connections, and anyone with a tty terminal for checking their relay's status. +Releases should be stable so if you manage to make it crash (or have a feature +request) then please let me know! The project was originally proposed in 2008 by Jacob and Karsten: http://archives.seul.org/or/dev/Jan-2008/msg00005.html

1 0

[arm/master] Fixed calculation of maximum printable menu items.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8941c87182b6050b6dc713cc7c920ae2e755648f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:06:00 2011 +0500 Fixed calculation of maximum printable menu items. --- src/cli/menu.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 315d349..0395abb 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -64,7 +64,7 @@ class Menu(): titlewidth = max(map(lambda title: len(title), titles)) + 2 # total number of titles that can be printed in current width - printable = (width - 2) / titlewidth + printable = width / titlewidth - 1 top = 1 left = 1

1 0

[arm/master] Controller page isn't changed in case the required panel isn't currently
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit a2937170af8f17ff048cccc1093776f174467352 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 1 17:12:35 2011 +0500 Controller page isn't changed in case the required panel isn't currently being displayed. --- src/cli/menu.py | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 29b6f82..beceb01 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -407,8 +407,6 @@ class Menu(): return False def _callbackSet(self, panel, attr, value, key=None): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) @@ -427,8 +425,6 @@ class Menu(): break def _callbackPressKey(self, panel, key): - self._callbackView(panel) - control = cli.controller.getController() panel = control.getPanel(panel) panel.handleKey(key)

1 0

[arm/master] fix: var misspelling crashed descriptor popup
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 823630f38f2cdc616dcd9907ff9be75584366126 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:27:25 2011 -0700 fix: var misspelling crashed descriptor popup --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/master] Initial commit for the menu code. Currently displays a top-bar in a
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 5fd9b5f74a86eb7e641366ae1c0a1a47404cf873 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:01:25 2011 +0500 Initial commit for the menu code. Currently displays a top-bar in a popup and dispatches the menu entry to the callback function, which shall later on be used to determine the panel/key combination for taking specified action. --- src/cli/controller.py | 18 +++++++- src/cli/menu.py | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 3 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e94f7f6..c506302 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -17,6 +17,7 @@ import cli.graphing.bandwidthStats import cli.graphing.connStats import cli.graphing.resourceStats import cli.connections.connPanel +import cli.menu from util import connections, conf, enum, log, panel, sysTools, torConfig, torTools @@ -76,8 +77,11 @@ def initController(stdscr, startTime): # fourth page: torrc pagePanels.append([cli.torrcPanel.TorrcPanel(stdscr, cli.torrcPanel.Config.TORRC, config)]) + # top menu + menu = cli.menu.Menu() + # initializes the controller - ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) + ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels, menu) # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") @@ -131,7 +135,7 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr, stickyPanels, pagePanels): + def __init__(self, stdscr, stickyPanels, pagePanels, menu): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. @@ -140,11 +144,13 @@ class Controller: stdscr - curses window stickyPanels - panels shown at the top of each page pagePanels - list of pages, each being a list of the panels on it + menu - popup drop-down menu """ self._screen = stdscr self._stickyPanels = stickyPanels self._pagePanels = pagePanels + self._menu = menu self._page = 0 self._isPaused = False self._forceRedraw = False @@ -182,6 +188,9 @@ class Controller: self._forceRedraw = True self.setMsg() + def getMenu(self): + return self._menu + def isPaused(self): """ True if the interface is paused, false otherwise. @@ -299,7 +308,7 @@ class Controller: if attr == None: if not self._isPaused: - msg = "page %i / %i - q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) + msg = "page %i / %i - m: menu, q: quit, p: pause, h: page help" % (self._page + 1, len(self._pagePanels)) attr = curses.A_NORMAL else: msg = "Paused" @@ -507,6 +516,9 @@ def drawTorMonitor(stdscr, startTime): control.prevPage() elif key == ord('p') or key == ord('P'): control.setPaused(not control.isPaused()) + elif key == ord('m') or key == ord('M'): + menu = control.getMenu() + menu.draw() elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py new file mode 100644 index 0000000..315d349 --- /dev/null +++ b/src/cli/menu.py @@ -0,0 +1,99 @@ +""" +A drop-down menu for sending actions to panels. +""" + +import curses +from collections import namedtuple +from operator import attrgetter + +import cli.controller +import popups +from util import log, panel, uiTools + +LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) +ParentEntry = namedtuple('ParentEntry', ['title', 'children']) + +class Menu(): + """Displays a popup menu and sends keys to appropriate panels""" + + def __init__(self, entry=None): + DEFAULT_ROOT = ParentEntry(title="Root", children=( + LeafEntry(title="File" , callback=self._callbackDefault), + LeafEntry(title="Logs" , callback=self._callbackDefault), + LeafEntry(title="View" , callback=self._callbackDefault), + LeafEntry(title="Graph" , callback=self._callbackDefault), + LeafEntry(title="Connections" , callback=self._callbackDefault), + LeafEntry(title="Configuration" , callback=self._callbackDefault))) + + self._selection = [0] + self._rootEntry = (entry and isinstance(entry, ParentEntry)) and entry or DEFAULT_ROOT + + def draw(self): + popup, width, height = popups.init(height=3) + if popup: + try: + popup.win.box() + + while True: + self._drawTopLevel(popup, width, height) + + popup.win.refresh() + + control = cli.controller.getController() + key = control.getScreen().getch() + + if key == curses.KEY_RIGHT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] + 1) % len(self._rootEntry.children) + elif key == curses.KEY_LEFT: + if len(self._selection) == 1: + # selection is on top menu + self._selection[0] = (self._selection[0] - 1) % len(self._rootEntry.children) + elif uiTools.isSelectionKey(key): + self._handleEvent() + break + + finally: + popups.finalize() + + def _drawTopLevel(self, popup, width, height): + titles = map(attrgetter('title'), self._rootEntry.children) + + # width per title is set according to the longest title + titlewidth = max(map(lambda title: len(title), titles)) + 2 + + # total number of titles that can be printed in current width + printable = (width - 2) / titlewidth + + top = 1 + left = 1 + for (index, entry) in enumerate(self._rootEntry.children[:printable]): + titleformat = curses.A_NORMAL + + if index == self._selection[0]: + titleformat = curses.A_STANDOUT + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + popup.win.addstr(top, left, entry.title.center(titlewidth), titleformat) + left = left + titlewidth + + popup.win.addch(top, left, curses.ACS_VLINE) + left = left + 1 + + def _handleEvent(self): + entry = self._rootEntry + + for index in self._selection: + if isinstance(entry, ParentEntry): + entry = entry.children[index] + else: + break + + if isinstance(entry, LeafEntry): + entry.callback(entry) + + def _callbackDefault(self, entry): + log.log(log.NOTICE, "%s selected" % entry.title) +

1 0

[arm/master] Fixed typo.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit 8b4dc162f75d5129e41f028c7253b7b265c8af76 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri May 27 18:00:20 2011 +0500 Fixed typo. --- src/cli/descriptorPopup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index e73e9fc..f75d7e6 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -104,7 +104,7 @@ def showDescriptorPopup(connectionPanel): """ # hides the title of the first panel on the page - contorl = controller.getController() + control = controller.getController() topPanel = control.getDisplayPanels(False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True)

1 0

[arm/master] Support long top menus on smaller screens, code review fixes.
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit fd920dfd4fc88d14b7e569b2513b449cc63cae99 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat May 28 18:29:15 2011 +0500 Support long top menus on smaller screens, code review fixes. The top-menu now displays "remaining" entries when right/left arrow keys are pressed enough times on shorter screens. Menus are no longer persistence and therefore are removed from Controller's init. Code review fixes: * Menu.draw() is renamed to Menu.showMenu(). * Overzealous map()s are replaced in favor of list comprehensions. * Popups are drawn through popup.add*() methods instead of drawing to windows directly. --- src/cli/controller.py | 12 ++----- src/cli/menu.py | 78 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index c506302..25c3051 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -81,7 +81,7 @@ def initController(stdscr, startTime): menu = cli.menu.Menu() # initializes the controller - ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels, menu) + ARM_CONTROLLER = Controller(stdscr, stickyPanels, pagePanels) # additional configuration for the graph panel graphPanel = ARM_CONTROLLER.getPanel("graph") @@ -135,7 +135,7 @@ class Controller: Tracks the global state of the interface """ - def __init__(self, stdscr, stickyPanels, pagePanels, menu): + def __init__(self, stdscr, stickyPanels, pagePanels): """ Creates a new controller instance. Panel lists are ordered as they appear, top to bottom on the page. @@ -150,7 +150,6 @@ class Controller: self._screen = stdscr self._stickyPanels = stickyPanels self._pagePanels = pagePanels - self._menu = menu self._page = 0 self._isPaused = False self._forceRedraw = False @@ -188,9 +187,6 @@ class Controller: self._forceRedraw = True self.setMsg() - def getMenu(self): - return self._menu - def isPaused(self): """ True if the interface is paused, false otherwise. @@ -517,8 +513,8 @@ def drawTorMonitor(stdscr, startTime): elif key == ord('p') or key == ord('P'): control.setPaused(not control.isPaused()) elif key == ord('m') or key == ord('M'): - menu = control.getMenu() - menu.draw() + menu = cli.menu.Menu() + menu.showMenu() elif key == ord('q') or key == ord('Q'): # provides prompt to confirm that arm should exit if CONFIG["features.confirmQuit"]: diff --git a/src/cli/menu.py b/src/cli/menu.py index 0395abb..bedb98e 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -4,7 +4,6 @@ A drop-down menu for sending actions to panels. import curses from collections import namedtuple -from operator import attrgetter import cli.controller import popups @@ -25,16 +24,22 @@ class Menu(): LeafEntry(title="Connections" , callback=self._callbackDefault), LeafEntry(title="Configuration" , callback=self._callbackDefault))) + self._first = [0] self._selection = [0] - self._rootEntry = (entry and isinstance(entry, ParentEntry)) and entry or DEFAULT_ROOT - def draw(self): + if entry and isinstance(entry, ParentEntry): + self._rootEntry = entry + else: + self._rootEntry = DEFAULT_ROOT + + def showMenu(self): popup, width, height = popups.init(height=3) if popup: try: - popup.win.box() - while True: + popup.win.erase() + popup.win.box() + self._drawTopLevel(popup, width, height) popup.win.refresh() @@ -44,12 +49,10 @@ class Menu(): if key == curses.KEY_RIGHT: if len(self._selection) == 1: - # selection is on top menu - self._selection[0] = (self._selection[0] + 1) % len(self._rootEntry.children) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: if len(self._selection) == 1: - # selection is on top menu - self._selection[0] = (self._selection[0] - 1) % len(self._rootEntry.children) + self._moveTopLevelLeft(width) elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -57,40 +60,71 @@ class Menu(): finally: popups.finalize() - def _drawTopLevel(self, popup, width, height): - titles = map(attrgetter('title'), self._rootEntry.children) + def _calculateTopLevelWidths(self, width): + titles = [menuItem.title for menuItem in self._rootEntry.children] # width per title is set according to the longest title - titlewidth = max(map(lambda title: len(title), titles)) + 2 + titlewidth = max(map(len, titles)) + 2 # total number of titles that can be printed in current width - printable = width / titlewidth - 1 + printable = min(width / titlewidth - 1, len(self._rootEntry.children)) + + return (titlewidth, printable) + + def _moveTopLevelRight(self, width): + _, printable = self._calculateTopLevelWidths(width) + + if self._selection[0] < printable - 1: + self._selection[0] = self._selection[0] + 1 + else: + self._selection[0] = 0 + if printable < len(self._rootEntry.children): + self._first[0] = (self._first[0] + printable) % len(self._rootEntry.children) + + if self._first[0] + self._selection[0] == len(self._rootEntry.children): + self._first[0] = 0 + self._selection[0] = 0 + + def _moveTopLevelLeft(self, width): + _, printable = self._calculateTopLevelWidths(width) + + if self._selection[0] > 0: + self._selection[0] = self._selection[0] - 1 + else: + self._first[0] = abs(self._first[0] - printable) % len(self._rootEntry.children) + self._selection[0] = len(self._rootEntry.children) - self._first[0] - 1 + + if self._selection[0] > printable: + self._selection[0] = printable - 1 + + def _drawTopLevel(self, popup, width, height): + titlewidth, printable = self._calculateTopLevelWidths(width) + children = self._rootEntry.children[self._first[0]:self._first[0] + printable] top = 1 left = 1 - for (index, entry) in enumerate(self._rootEntry.children[:printable]): - titleformat = curses.A_NORMAL - - if index == self._selection[0]: - titleformat = curses.A_STANDOUT + for (index, entry) in enumerate(children): + titleformat = curses.A_STANDOUT if index == self._selection[0] else curses.A_NORMAL - popup.win.addch(top, left, curses.ACS_VLINE) + popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - popup.win.addstr(top, left, entry.title.center(titlewidth), titleformat) + popup.addstr(top, left, entry.title.center(titlewidth), titleformat) left = left + titlewidth - popup.win.addch(top, left, curses.ACS_VLINE) + popup.addch(top, left, curses.ACS_VLINE) left = left + 1 def _handleEvent(self): entry = self._rootEntry + sums = [sum(values) for values in zip(self._first, self._selection)] - for index in self._selection: + for index in sums: if isinstance(entry, ParentEntry): entry = entry.children[index] else: break + log.log(log.ERR, "first: %d" % self._first[0]) if isinstance(entry, LeafEntry): entry.callback(entry)

1 0

[arm/master] Replaced namedtuples with MenuItem instances, fixed left arrow key on
by atagar＠torproject.org 04 Jun '11

04 Jun '11

commit cf4ae8454debdf8a9ace9a4f4cc3e4536152d1dd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun May 29 15:32:34 2011 +0500 Replaced namedtuples with MenuItem instances, fixed left arrow key on top level menu. The MenuItem class is added replacing LeafEntry and ParentEntry namedtuples. Replaced "entry" with "item" and defined the constant TOPLEVEL to improve readability. The scrolling calculations in _moveTopLevelLeft contained a bug, menus with large number of top items did not scroll to the end. Fixed by adding a check to see if we're "spilling" to left of first entry. --- src/cli/menu.py | 98 +++++++++++++++++++++++++------------------------- src/util/menuItem.py | 34 +++++++++++++++++ 2 files changed, 83 insertions(+), 49 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index bedb98e..71b56a4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -3,34 +3,32 @@ A drop-down menu for sending actions to panels. """ import curses -from collections import namedtuple import cli.controller import popups -from util import log, panel, uiTools +from util import log, panel, uiTools, menuItem -LeafEntry = namedtuple('LeafEntry', ['title', 'callback']) -ParentEntry = namedtuple('ParentEntry', ['title', 'children']) +TOPLEVEL = 0 class Menu(): """Displays a popup menu and sends keys to appropriate panels""" - def __init__(self, entry=None): - DEFAULT_ROOT = ParentEntry(title="Root", children=( - LeafEntry(title="File" , callback=self._callbackDefault), - LeafEntry(title="Logs" , callback=self._callbackDefault), - LeafEntry(title="View" , callback=self._callbackDefault), - LeafEntry(title="Graph" , callback=self._callbackDefault), - LeafEntry(title="Connections" , callback=self._callbackDefault), - LeafEntry(title="Configuration" , callback=self._callbackDefault))) + def __init__(self, item=None): + DEFAULT_ROOT = menuItem.MenuItem(label="Root", children=( + menuItem.MenuItem(label="File" , callback=self._callbackDefault), + menuItem.MenuItem(label="Logs" , callback=self._callbackDefault), + menuItem.MenuItem(label="View" , callback=self._callbackDefault), + menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault))) self._first = [0] self._selection = [0] - if entry and isinstance(entry, ParentEntry): - self._rootEntry = entry + if item and item.isParent(): + self._rootItem = item else: - self._rootEntry = DEFAULT_ROOT + self._rootItem = DEFAULT_ROOT def showMenu(self): popup, width, height = popups.init(height=3) @@ -61,73 +59,75 @@ class Menu(): popups.finalize() def _calculateTopLevelWidths(self, width): - titles = [menuItem.title for menuItem in self._rootEntry.children] + labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] - # width per title is set according to the longest title - titlewidth = max(map(len, titles)) + 2 + # width per label is set according to the longest label + labelwidth = max(map(len, labels)) + 2 - # total number of titles that can be printed in current width - printable = min(width / titlewidth - 1, len(self._rootEntry.children)) + # total number of labels that can be printed in current width + printable = min(width / labelwidth - 1, self._rootItem.getChildrenCount()) - return (titlewidth, printable) + return (labelwidth, printable) def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] < printable - 1: - self._selection[0] = self._selection[0] + 1 + if self._selection[TOPLEVEL] < printable - 1: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] + 1 else: - self._selection[0] = 0 - if printable < len(self._rootEntry.children): - self._first[0] = (self._first[0] + printable) % len(self._rootEntry.children) + self._selection[TOPLEVEL] = 0 + if printable < self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = (self._first[TOPLEVEL] + printable) % self._rootItem.getChildrenCount() - if self._first[0] + self._selection[0] == len(self._rootEntry.children): - self._first[0] = 0 - self._selection[0] = 0 + if self._first[TOPLEVEL] + self._selection[TOPLEVEL] == self._rootItem.getChildrenCount(): + self._first[TOPLEVEL] = 0 + self._selection[TOPLEVEL] = 0 def _moveTopLevelLeft(self, width): _, printable = self._calculateTopLevelWidths(width) - if self._selection[0] > 0: - self._selection[0] = self._selection[0] - 1 + if self._selection[TOPLEVEL] > 0: + self._selection[TOPLEVEL] = self._selection[TOPLEVEL] - 1 else: - self._first[0] = abs(self._first[0] - printable) % len(self._rootEntry.children) - self._selection[0] = len(self._rootEntry.children) - self._first[0] - 1 + if self._first[TOPLEVEL] == 0: + self._first[TOPLEVEL] = (self._rootItem.getChildrenCount() / printable) * printable + else: + self._first[TOPLEVEL] = abs(self._first[TOPLEVEL] - printable) % self._rootItem.getChildrenCount() + self._selection[TOPLEVEL] = self._rootItem.getChildrenCount() - self._first[TOPLEVEL] - 1 - if self._selection[0] > printable: - self._selection[0] = printable - 1 + if self._selection[TOPLEVEL] > printable: + self._selection[TOPLEVEL] = printable - 1 def _drawTopLevel(self, popup, width, height): - titlewidth, printable = self._calculateTopLevelWidths(width) - children = self._rootEntry.children[self._first[0]:self._first[0] + printable] + labelwidth, printable = self._calculateTopLevelWidths(width) + children = self._rootItem.getChildren()[self._first[TOPLEVEL]:self._first[TOPLEVEL] + printable] top = 1 left = 1 - for (index, entry) in enumerate(children): - titleformat = curses.A_STANDOUT if index == self._selection[0] else curses.A_NORMAL + for (index, item) in enumerate(children): + labelformat = curses.A_STANDOUT if index == self._selection[TOPLEVEL] else curses.A_NORMAL popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - popup.addstr(top, left, entry.title.center(titlewidth), titleformat) - left = left + titlewidth + popup.addstr(top, left, item.getLabel().center(labelwidth), labelformat) + left = left + labelwidth popup.addch(top, left, curses.ACS_VLINE) left = left + 1 def _handleEvent(self): - entry = self._rootEntry + item = self._rootItem sums = [sum(values) for values in zip(self._first, self._selection)] for index in sums: - if isinstance(entry, ParentEntry): - entry = entry.children[index] + if item.isParent(): + item = item.getChildren()[index] else: break - log.log(log.ERR, "first: %d" % self._first[0]) - if isinstance(entry, LeafEntry): - entry.callback(entry) + if item.isLeaf(): + item.select() - def _callbackDefault(self, entry): - log.log(log.NOTICE, "%s selected" % entry.title) + def _callbackDefault(self, item): + log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py new file mode 100644 index 0000000..4800a0f --- /dev/null +++ b/src/util/menuItem.py @@ -0,0 +1,34 @@ +""" +Menu Item class, used by the drop-down menus +""" + +class MenuItem(): + """Contains title, callback handler and possible children""" + + def __init__(self, label=None, callback=None, children=[], parent=None): + self._label = label + self._callback = callback + self._children = children + self._parent = parent + + def getLabel(self): + return self._label + + def isLeaf(self): + return self._children == [] + + def isParent(self): + return self._children != [] + + def getChildren(self): + return self._children + + def getParent(self): + return self._parent + + def getChildrenCount(self): + return len(self._children) + + def select(self): + self._callback(self) +

1 0