- tor-commits - lists.torproject.org

[arm/release] fix: var misspelling crashed descriptor popup
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] fix: installation wasn't adding uninstall script
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 8b8b4230ce305d8aadc4eebc36b4bd9506bd096f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 07:02:37 2011 -0700 fix: installation wasn't adding uninstall script The uninstall wasn't among the set of non-python resources copied into /usr/share/arm during installation. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index cb0069f..cdda907 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ setup(name='arm', data_files=[("/usr/bin", ["arm"]), ("/usr/share/man/man1", [manFilename]), (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], + ("/usr/share/arm", ["src/settings.cfg", "src/uninstall"])], ) # Cleans up the temporary compressed man page.

1 0

[arm/release] fix: updating bandwidth graph on shutdown
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3cfa3533d3ce1e2ac24b382bc310710c5e02ee00 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 26 08:22:43 2011 -0700 fix: updating bandwidth graph on shutdown If we have accounting and shut down Tor the accounting section should say "Connection Closed...". However, this wasn't happening unless we forced a redraw, such as by changing pages. This change makes the bandwidthStats initiate a redraw itself on controller status changes. --- src/cli/graphing/bandwidthStats.py | 4 ++++ src/cli/graphing/graphPanel.py | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index d378c45..4e033f6 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -87,6 +87,10 @@ class BandwidthStats(graphPanel.GraphStats): if eventType == torTools.State.INIT and self._config["features.graph.bw.accounting.show"]: self.isAccounting = conn.getInfo('accounting/enabled') == '1' + + # redraws to reflect changes (this especially noticeable when we have + # accounting and shut down since it then gives notice of the shutdown) + if self._graphPanel and self.isSelected: self._graphPanel.redraw(True) def prepopulateFromState(self): """ diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index b48f82b..5fa1262 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -221,7 +221,7 @@ class GraphStats(TorCtl.PostEventListener): self.secondaryCounts[i].insert(0, 0) del self.secondaryCounts[i][self.maxCol + 1:] - if isRedraw: self._graphPanel.redraw(True) + if isRedraw and self._graphPanel: self._graphPanel.redraw(True) class GraphPanel(panel.Panel): """

1 0

[arm/release] Fixed typo.
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Initial commit for the menu code. Currently displays a top-bar in a
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Added support for multiple menu levels.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 46a1023c71f395c62a37a30c13e14db7b851640a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue May 31 02:31:23 2011 +0500 Added support for multiple menu levels. Once the menus have "dropped-down", handling of subsequent "levels" followed the same logical steps. Therefore *SecondLevel() methods have been replaced by *NLevel() equivalents. If a parent item is selected using any of the selection keys, its children are brought up instead of doing nothing. --- src/cli/menu.py | 192 +++++++++++++++++++++++++++++++++++--------------- src/util/menuItem.py | 6 +-- 2 files changed, 136 insertions(+), 62 deletions(-) diff --git a/src/cli/menu.py b/src/cli/menu.py index 69538e0..8ce97c4 100644 --- a/src/cli/menu.py +++ b/src/cli/menu.py @@ -8,7 +8,7 @@ import cli.controller import popups from util import log, panel, uiTools, menuItem -TOPLEVEL, SECONDLEVEL = range(2) +PARENTLEVEL, TOPLEVEL = (-1, 0) class Menu(): """Displays a popup menu and sends keys to appropriate panels""" @@ -22,23 +22,61 @@ class Menu(): menuItem.MenuItem(label="Clear" , callback=self._callbackDefault), menuItem.MenuItem(label="Save" , callback=self._callbackDefault), menuItem.MenuItem(label="Filter" , callback=self._callbackDefault), - menuItem.MenuItem(label="Duplicates" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Duplicates" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault),)) + )), menuItem.MenuItem(label="View" , children=( menuItem.MenuItem(label="Graph" , callback=self._callbackDefault), menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration" , callback=self._callbackDefault), menuItem.MenuItem(label="Configuration File" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Graph" , children=( - menuItem.MenuItem(label="Stats" , callback=self._callbackDefault), - menuItem.MenuItem(label="Size" , callback=self._callbackDefault), - menuItem.MenuItem(label="Update Interval" , callback=self._callbackDefault), - menuItem.MenuItem(label="Bounds" , callback=self._callbackDefault),)), + menuItem.MenuItem(label="Stats" , children=( + menuItem.MenuItem(label="Bandwidth" , callback=self._callbackDefault), + menuItem.MenuItem(label="Connections" , callback=self._callbackDefault), + menuItem.MenuItem(label="Resources" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Size" , children=( + menuItem.MenuItem(label="Increase" , callback=self._callbackDefault), + menuItem.MenuItem(label="Decrease" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Update Interval" , children=( + menuItem.MenuItem(label="Each second" , callback=self._callbackDefault), + menuItem.MenuItem(label="5 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 seconds" , callback=self._callbackDefault), + menuItem.MenuItem(label="1 minute" , callback=self._callbackDefault), + menuItem.MenuItem(label="30 minutes" , callback=self._callbackDefault), + menuItem.MenuItem(label="Hourly" , callback=self._callbackDefault), + menuItem.MenuItem(label="Daily" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Bounds" , children=( + menuItem.MenuItem(label="Local Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Global Max" , callback=self._callbackDefault), + menuItem.MenuItem(label="Tight" , callback=self._callbackDefault), + )),)), menuItem.MenuItem(label="Connections" , children=( - menuItem.MenuItem(label="Identity" , callback=self._callbackDefault), - menuItem.MenuItem(label="Resolver" , callback=self._callbackDefault), + menuItem.MenuItem(label="Identity" , children=( + menuItem.MenuItem(label="IP" , callback=self._callbackDefault), + menuItem.MenuItem(label="Fingerprints" , callback=self._callbackDefault), + menuItem.MenuItem(label="Nicknames" , callback=self._callbackDefault), + )), + menuItem.MenuItem(label="Resolver" , children=( + menuItem.MenuItem(label="auto" , callback=self._callbackDefault), + menuItem.MenuItem(label="proc" , callback=self._callbackDefault), + menuItem.MenuItem(label="netstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="ss" , callback=self._callbackDefault), + menuItem.MenuItem(label="lsof" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat" , callback=self._callbackDefault), + menuItem.MenuItem(label="sockstat (bsd)" , callback=self._callbackDefault), + menuItem.MenuItem(label="procstat (bsd)" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Sort Order" , callback=self._callbackDefault),)), menuItem.MenuItem(label="Configuration" , children=( - menuItem.MenuItem(label="Comments" , callback=self._callbackDefault), + menuItem.MenuItem(label="Comments" , children=( + menuItem.MenuItem(label="Hidden" , callback=self._callbackDefault), + menuItem.MenuItem(label="Visible" , callback=self._callbackDefault), + )), menuItem.MenuItem(label="Reload" , callback=self._callbackDefault), menuItem.MenuItem(label="Reset Tor" , callback=self._callbackDefault),)) )) @@ -67,15 +105,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_RIGHT: - if len(self._selection) == 1: - self._moveTopLevelRight(width) + self._moveTopLevelRight(width) elif key == curses.KEY_LEFT: - if len(self._selection) == 1: - self._moveTopLevelLeft(width) + self._moveTopLevelLeft(width) elif key == curses.KEY_DOWN: - if len(self._selection) == 1: - self._dropSecondLevel() - break + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() break @@ -87,6 +122,21 @@ class Menu(): index = self._first[TOPLEVEL] + self._selection[TOPLEVEL] return self._rootItem.getChildren()[index] + def _getCurrentItem(self, level=0): + item = self._rootItem + if level == 0: + sums = [sum(values) for values in zip(self._first, self._selection)] + else: + sums = [sum(values) for values in zip(self._first[:level], self._selection[:level])] + + for index in sums: + if item.isParent(): + item = item.getChildren()[index] + else: + break + + return item + def _calculateTopLevelWidths(self, width=0): labels = [menuItem.getLabel() for menuItem in self._rootItem.getChildren()] @@ -119,6 +169,33 @@ class Menu(): return printable if printable else parent.getChildrenCount() + def _calculateNLevelWidths(self, level=0): + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + labels = [menuItem.getLabel() for menuItem in parent.getChildren()] + + labelwidth = max(map(len, labels)) + + return labelwidth + + def _calculateNLevelHeights(self, height=0, level=0): + control = cli.controller.getController() + height, _ = control.getScreen().getmaxyx() + topSize = sum(stickyPanel.getHeight() for stickyPanel in control.getStickyPanels()) + height = height - topSize + + parent = self._getCurrentItem(level) + + if parent.isLeaf(): + return 0 + + printable = min(height - 4, parent.getChildrenCount()) + + return printable if printable else parent.getChildrenCount() + def _moveTopLevelRight(self, width): _, printable = self._calculateTopLevelWidths(width) @@ -165,12 +242,17 @@ class Menu(): popup.addch(top, left, curses.ACS_VLINE) left = left + 1 - def _dropSecondLevel(self): + def _showNLevel(self): self._first.append(0) self._selection.append(0) - labelwidth = self._calculateSecondLevelWidths() - printable = self._calculateSecondLevelHeights() + parent = self._getCurrentItem(level=PARENTLEVEL) + + if parent.isLeaf(): + return + + labelwidth = self._calculateNLevelWidths(level=PARENTLEVEL) + printable = self._calculateNLevelHeights(level=PARENTLEVEL) toplabelwidth, _ = self._calculateTopLevelWidths() left = (toplabelwidth + 2) * self._selection[TOPLEVEL] @@ -183,7 +265,7 @@ class Menu(): popup.win.erase() popup.win.box() - self._drawSecondLevel(popup, width, height) + self._drawNLevel(popup, width, height) popup.win.refresh() @@ -191,9 +273,12 @@ class Menu(): key = control.getScreen().getch() if key == curses.KEY_DOWN: - self._moveSecondLevelDown(height) + self._moveNLevelDown(height) elif key == curses.KEY_UP: - self._moveSecondLevelUp(height) + self._moveNLevelUp(height) + elif key == curses.KEY_RIGHT: + self._showNLevel() + break elif uiTools.isSelectionKey(key): self._handleEvent() self._first.pop() @@ -203,64 +288,57 @@ class Menu(): finally: popups.finalize() - def _drawSecondLevel(self, popup, width, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() - children = parent.getChildren()[self._first[SECONDLEVEL]:self._first[SECONDLEVEL] + printable] - - toplabelwidth, _ = self._calculateTopLevelWidths(width) + def _drawNLevel(self, popup, width, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) + children = parent.getChildren()[self._first[PARENTLEVEL]:self._first[PARENTLEVEL] + printable] top = 1 left = 1 for (index, item) in enumerate(children): - labelformat = curses.A_STANDOUT if index == self._selection[SECONDLEVEL] else curses.A_NORMAL + labelformat = curses.A_STANDOUT if index == self._selection[PARENTLEVEL] else curses.A_NORMAL popup.addstr(top, left, item.getLabel(), labelformat) top = top + 1 - def _moveSecondLevelDown(self, height): - printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + def _moveNLevelDown(self, height): + printable = self._calculateNLevelHeights(level=PARENTLEVEL) + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] < printable - 1: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] + 1 + if self._selection[PARENTLEVEL] < printable - 1: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] + 1 else: - self._selection[SECONDLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 if printable < parent.getChildrenCount(): - self._first[SECONDLEVEL] = (self._first[SECONDLEVEL] + printable) % parent.getChildrenCount() + self._first[PARENTLEVEL] = (self._first[PARENTLEVEL] + printable) % parent.getChildrenCount() - if self._first[SECONDLEVEL] + self._selection[SECONDLEVEL] == parent.getChildrenCount(): - self._first[SECONDLEVEL] = 0 - self._selection[SECONDLEVEL] = 0 + if self._first[PARENTLEVEL] + self._selection[PARENTLEVEL] == parent.getChildrenCount(): + self._first[PARENTLEVEL] = 0 + self._selection[PARENTLEVEL] = 0 - def _moveSecondLevelUp(self, height): + def _moveNLevelUp(self, height): printable = self._calculateSecondLevelHeights() - parent = self._getCurrentTopLevelItem() + parent = self._getCurrentItem(level=PARENTLEVEL) - if self._selection[SECONDLEVEL] > 0: - self._selection[SECONDLEVEL] = self._selection[SECONDLEVEL] - 1 + if self._selection[PARENTLEVEL] > 0: + self._selection[PARENTLEVEL] = self._selection[PARENTLEVEL] - 1 else: - if self._first[SECONDLEVEL] == 0: - self._first[SECONDLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() + if self._first[PARENTLEVEL] == 0: + self._first[PARENTLEVEL] = ((parent.getChildrenCount() / printable) * printable) % parent.getChildrenCount() else: - self._first[SECONDLEVEL] = abs(self._first[SECONDLEVEL] - printable) % parent.getChildrenCount() - self._selection[SECONDLEVEL] = parent.getChildrenCount() - self._first[SECONDLEVEL] - 1 + self._first[PARENTLEVEL] = abs(self._first[PARENTLEVEL] - printable) % parent.getChildrenCount() + self._selection[PARENTLEVEL] = parent.getChildrenCount() - self._first[PARENTLEVEL] - 1 - if self._selection[SECONDLEVEL] > printable: - self._selection[SECONDLEVEL] = printable - 1 + if self._selection[PARENTLEVEL] > printable: + self._selection[PARENTLEVEL] = printable - 1 def _handleEvent(self): - item = self._rootItem - sums = [sum(values) for values in zip(self._first, self._selection)] - - for index in sums: - if item.isParent(): - item = item.getChildren()[index] - else: - break + item = self._getCurrentItem() if item.isLeaf(): item.select() + else: + self._showNLevel() def _callbackDefault(self, item): log.log(log.NOTICE, "%s selected" % item.getLabel()) diff --git a/src/util/menuItem.py b/src/util/menuItem.py index 4800a0f..3dbf922 100644 --- a/src/util/menuItem.py +++ b/src/util/menuItem.py @@ -5,11 +5,10 @@ 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): + def __init__(self, label=None, callback=None, children=[]): self._label = label self._callback = callback self._children = children - self._parent = parent def getLabel(self): return self._label @@ -23,9 +22,6 @@ class MenuItem(): def getChildren(self): return self._children - def getParent(self): - return self._parent - def getChildrenCount(self): return len(self._children)

1 0

[arm/release] Fixed calculation of maximum printable menu items.
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] fix: minor tweaks to the readme summary wording
by atagar＠torproject.org 17 Jul '11

17 Jul '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/release] Replacing quit confirmation to use the popup util
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 9ddfb9127a41991428736d98ef075cd77817eda4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:13:01 2011 -0700 Replacing quit confirmation to use the popup util --- src/cli/controller.py | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 1189781..6c26d81 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -686,24 +686,9 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides prompt to confirm that arm should exit if CONFIRM_QUIT: - panel.CURSES_LOCK.acquire() - try: - setPauseState(panels, isPaused, page, True) - - # provides prompt - panels["control"].setMsg("Are you sure (q again to confirm)?", curses.A_BOLD) - panels["control"].redraw(True) - - curses.cbreak() - confirmationKey = stdscr.getch() - quitConfirmed = confirmationKey in (ord('q'), ord('Q')) - curses.halfdelay(REFRESH_RATE * 10) - - if not quitConfirmed: - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) - setPauseState(panels, isPaused, page) - finally: - panel.CURSES_LOCK.release() + msg = "Are you sure (q again to confirm)?" + confirmationKey = popups.showMsg(msg, attr = curses.A_BOLD) + quitConfirmed = confirmationKey in (ord('q'), ord('Q')) if quitConfirmed: # quits arm

1 0

[arm/release] Removing last references to the old style popups
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit fc16a755e7140e8d5aa6d502053e5109078cacc9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 12 21:17:39 2011 -0700 Removing last references to the old style popups Dropping the ancient Popup class and removing the static panel reference that was previously used for all popups. All of its actual uses have been removed in the previous set of commits to use the new popup utils. --- src/cli/controller.py | 61 ++++--------------------------------------------- 1 files changed, 5 insertions(+), 56 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 6c26d81..51b64c7 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -89,7 +89,7 @@ REFRESH_RATE = 5 # seconds between redrawing screen CTL_HELP, CTL_PAUSED = range(2) # panel order per page -PAGE_S = ["header", "control", "popup"] # sticky (ie, always available) page +PAGE_S = ["header", "control"] # sticky (ie, always available) page PAGES = [ ["graph", "log"], ["conn"], @@ -182,46 +182,6 @@ class ControlPanel(panel.Panel): self.addstr(0, xLoc + 1, " " * barProgress, curses.A_STANDOUT | uiTools.getColor("red")) self.addstr(0, xLoc + barWidth + 1, "]", curses.A_BOLD) -class Popup(panel.Panel): - """ - Temporarily providing old panel methods until permanent workaround for popup - can be derrived (this passive drawing method is horrible - I'll need to - provide a version using the more active repaint design later in the - revision). - """ - - def __init__(self, stdscr, height): - panel.Panel.__init__(self, stdscr, "popup", 0, height) - - def setPaused(self, isPause): - panel.Panel.setPaused(self, isPause, True) - - # The following methods are to emulate old panel functionality (this was the - # only implementations to use these methods and will require a complete - # rewrite when refactoring gets here) - def clear(self): - if self.win: - self.isDisplaced = self.top > self.win.getparyx()[0] - if not self.isDisplaced: self.win.erase() - - def refresh(self): - if self.win and not self.isDisplaced: self.win.refresh() - - def recreate(self, stdscr, newWidth=-1, newTop=None): - self.setParent(stdscr) - self.setWidth(newWidth) - if newTop != None: self.setTop(newTop) - - newHeight, newWidth = self.getPreferredSize() - if newHeight > 0: - self.win = self.parent.subwin(newHeight, newWidth, self.top, 0) - elif self.win == None: - # don't want to leave the window as none (in very edge cases could cause - # problems) - rather, create a displaced instance - self.win = self.parent.subwin(1, newWidth, 0, 0) - - self.maxY, self.maxX = self.win.getmaxyx() - def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): """ Writes text with word wrapping, returning the ending y/x coordinate. @@ -435,7 +395,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels = { "header": headerPanel.HeaderPanel(stdscr, startTime, config), - "popup": Popup(stdscr, 9), "graph": graphing.graphPanel.GraphPanel(stdscr), "log": logPanel.LogPanel(stdscr, loggedEvents, config)} @@ -516,7 +475,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): isPaused = False # if true updates are frozen overrideKey = None # immediately runs with this input rather than waiting for the user if set page = 0 - panels["popup"].redraw(True) # hack to make sure popup has a window instance (not entirely sure why...) PAGE = page @@ -599,8 +557,6 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): panels[panelKey].setTop(startY) startY += panels[panelKey].getHeight() - panels["popup"].recreate(stdscr, 80, startY) - for panelSet in PAGES: tmpStartY = startY @@ -627,17 +583,10 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # I haven't the foggiest why, but doesn't work if redrawn out of order... for panelKey in (PAGE_S + PAGES[page]): - # redrawing popup can result in display flicker when it should be hidden - if panelKey != "popup": - newSize = stdscr.getmaxyx() - isResize = lastSize != newSize - lastSize = newSize - - if panelKey in ("header", "graph", "log", "config", "torrc", "conn2"): - # revised panel (manages its own content refreshing) - panels[panelKey].redraw(isResize) - else: - panels[panelKey].redraw(True) + newSize = stdscr.getmaxyx() + isResize = lastSize != newSize + lastSize = newSize + panels[panelKey].redraw(isResize) stdscr.refresh()

1 0