- tor-commits - lists.torproject.org

[arm/release] Dropping remaining addfstr usage
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6144d50da64fe94bf8ab30c30f5044453cefde01 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 16 10:11:50 2011 -0700 Dropping remaining addfstr usage Long ago, in the dawn of arm, I added a helper function "addfstr" that allowed for adding strings with formatting tags similar to html. All usage of it with arbitrary input was dropped due to the possability of tag injection screwing up the display, and this change drops its last remaining usage. This hurts the code's readability a bit and at I'd like to figure out a nicer, general purpose pattern for multi-format line rendering but tags aren't the solution. Back to the drawing board... This leaves the panel utility for now. --- src/cli/graphing/bandwidthStats.py | 8 +++- src/cli/headerPanel.py | 79 +++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/src/cli/graphing/bandwidthStats.py b/src/cli/graphing/bandwidthStats.py index 4e033f6..b92a58c 100644 --- a/src/cli/graphing/bandwidthStats.py +++ b/src/cli/graphing/bandwidthStats.py @@ -4,6 +4,7 @@ stats if they're set. """ import time +import curses from cli.graphing import graphPanel from util import log, sysTools, torTools, uiTools @@ -254,7 +255,9 @@ class BandwidthStats(graphPanel.GraphStats): # failed to be queried status, hibernateColor = "unknown", "red" - panel.addfstr(labelingLine + 2, 0, "Accounting (<%s>%s</%s>)" % (hibernateColor, status, hibernateColor)) + panel.addstr(labelingLine + 2, 0, "Accounting (", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, status, curses.A_BOLD | uiTools.getColor(hibernateColor)) + panel.addstr(labelingLine + 2, 12 + len(status), ")", curses.A_BOLD) resetTime = self.accountingInfo["resetTime"] if not resetTime: resetTime = "unknown" @@ -268,7 +271,8 @@ class BandwidthStats(graphPanel.GraphStats): if used and total: panel.addstr(labelingLine + 3, 37, "%s / %s" % (used, total), uiTools.getColor(self.getColor(False))) else: - panel.addfstr(labelingLine + 2, 0, "Accounting: Connection Closed...") + panel.addstr(labelingLine + 2, 0, "Accounting:", curses.A_BOLD) + panel.addstr(labelingLine + 2, 12, "Connection Closed...") def getTitle(self, width): stats = list(self._titleStats) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 93930b1..d367b98 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -161,39 +161,44 @@ class HeaderPanel(panel.Panel, threading.Thread): if 7 + len(self.vals["tor/version"]) + len(self.vals["tor/versionStatus"]) <= contentSpace: versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "white" - versionStatusMsg = "<%s>%s</%s>" % (versionColor, self.vals["tor/versionStatus"], versionColor) - self.addfstr(0, 43, "Tor %s (%s)" % (self.vals["tor/version"], versionStatusMsg)) + labelPrefix = "Tor %s (" % self.vals["tor/version"] + self.addstr(0, 43, labelPrefix) + self.addstr(0, 43 + len(labelPrefix), self.vals["tor/versionStatus"], uiTools.getColor(versionColor)) + self.addstr(0, 43 + len(labelPrefix) + len(self.vals["tor/versionStatus"]), ")") elif 11 <= contentSpace: self.addstr(0, 43, uiTools.cropStr("Tor %s" % self.vals["tor/version"], contentSpace, 4)) # Line 2 / Line 2 Left (tor ip/port information) + x = 0 if self.vals["tor/orPort"]: myAddress = "Unknown" if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] # acting as a relay (we can assume certain parameters are set - entry = "" dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" for label in (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel): - if len(entry) + len(label) <= leftWidth: entry += label + if x + len(label) <= leftWidth: + self.addstr(1, x, label) + x += len(label) else: break else: # non-relay (client only) # TODO: not sure what sort of stats to provide... - entry = "<red>Relaying Disabled</red>" + self.addstr(1, x, "Relaying Disabled", curses.A_BOLD | uiTools.getColor("red")) + x += 17 if self.vals["tor/isAuthPassword"]: authType = "password" elif self.vals["tor/isAuthCookie"]: authType = "cookie" else: authType = "open" - if len(entry) + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: + if x + 19 + len(self.vals["tor/controlPort"]) + len(authType) <= leftWidth: authColor = "red" if authType == "open" else "green" - authLabel = "<%s>%s</%s>" % (authColor, authType, authColor) - self.addfstr(1, 0, "%s, Control Port (%s): %s" % (entry, authLabel, self.vals["tor/controlPort"])) - elif len(entry) + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: - self.addstr(1, 0, "%s, Control Port: %s" % (entry, self.vals["tor/controlPort"])) - else: self.addstr(1, 0, entry) + self.addstr(1, x, ", Control Port (") + self.addstr(1, x + 16, authType, uiTools.getColor(authColor)) + self.addstr(1, x + 16 + len(authType), "): %s" % self.vals["tor/controlPort"]) + elif x + 16 + len(self.vals["tor/controlPort"]) <= leftWidth: + self.addstr(1, 0, ", Control Port: %s" % self.vals["tor/controlPort"]) # Line 3 / Line 1 Right (system usage info) y, x = (0, leftWidth) if isWide else (2, 0) @@ -250,20 +255,29 @@ class HeaderPanel(panel.Panel, threading.Thread): # Line 5 / Line 3 Left (flags) if self._isTorConnected: - flagLine = "flags: " - for flag in self.vals["tor/flags"]: - flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" - flagLine += "<%s>%s</%s>, " % (flagColor, flag, flagColor) + y, x = (2 if isWide else 4, 0) + self.addstr(y, x, "flags: ") + x += 7 - if len(self.vals["tor/flags"]) > 0: flagLine = flagLine[:-2] - else: flagLine += "<cyan>none</cyan>" - - self.addfstr(2 if isWide else 4, 0, flagLine) + if len(self.vals["tor/flags"]) > 0: + for i in range(len(self.vals["tor/flags"])): + flag = self.vals["tor/flags"][i] + flagColor = FLAG_COLORS[flag] if flag in FLAG_COLORS.keys() else "white" + + self.addstr(y, x, flag, curses.A_BOLD | uiTools.getColor(flagColor)) + x += len(flag) + + if i < len(self.vals["tor/flags"]) - 1: + self.addstr(y, x, ", ") + x += 2 + else: + self.addstr(y, x, "none", curses.A_BOLD | uiTools.getColor("cyan")) else: + y = 2 if isWide else 4 statusTime = torTools.getConn().getStatus()[1] statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) - msg = "<red>Tor Disconnected</red> (%s) - press r to reconnect" % statusTimeLabel - self.addfstr(2 if isWide else 4, 0, msg) + self.addstr(y, 0, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) + self.addstr(y, 16, " (%s) - press r to reconnect" % statusTimeLabel) # Undisplayed / Line 3 Right (exit policy) if isWide: @@ -273,18 +287,27 @@ class HeaderPanel(panel.Panel, threading.Thread): if exitPolicy == "": exitPolicy = "<default>" elif not exitPolicy.endswith((" *:*", " *")): exitPolicy += ", <default>" + self.addstr(2, leftWidth, "exit policy: ") + x = leftWidth + 13 + # color codes accepts to be green, rejects to be red, and default marker to be cyan isSimple = len(exitPolicy) > rightWidth - 13 policies = exitPolicy.split(", ") for i in range(len(policies)): policy = policies[i].strip() - displayedPolicy = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy - if policy.startswith("accept"): policy = "<green>%s</green>" % displayedPolicy - elif policy.startswith("reject"): policy = "<red>%s</red>" % displayedPolicy - elif policy.startswith("<default>"): policy = "<cyan>%s</cyan>" % displayedPolicy - policies[i] = policy - - self.addfstr(2, leftWidth, "exit policy: %s" % ", ".join(policies)) + policyLabel = policy.replace("accept", "").replace("reject", "").strip() if isSimple else policy + + policyColor = "white" + if policy.startswith("accept"): policyColor = "green" + elif policy.startswith("reject"): policyColor = "red" + elif policy.startswith("<default>"): policyColor = "cyan" + + self.addstr(2, x, policyLabel, curses.A_BOLD | uiTools.getColor(policyColor)) + x += len(policyLabel) + + if i < len(policies) - 1: + self.addstr(2, x, ", ") + x += 2 else: # Client only # TODO: not sure what information to provide here...

1 0

[arm/release] Adding an option to override interface colors
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d3a1f351009103169e63e85ab366ca4167cb2add Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 12:42:49 2011 -0700 Adding an option to override interface colors This causes all color requests for the interface to be replaced with the overridden color (ie, everything except white content is replaced). This is a neat looking effect and will be added as an option to the menu (it's currently a config option). --- armrc.sample | 5 +++++ src/util/uiTools.py | 38 +++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 1 deletions(-) diff --git a/armrc.sample b/armrc.sample index ecfe45a..1eafe77 100644 --- a/armrc.sample +++ b/armrc.sample @@ -19,6 +19,11 @@ queries.useProc true # Renders the interface with color if set and the terminal supports it features.colorInterface true +# Replaces all colored content (ie, anything that isn't white) with this +# color. Valid options are: +# none, red, green, yellow, blue, cyan, magenta, black, white +features.colorOverride none + # Includes unicode characters in the interface. features.printUnicode true diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 0ff680e..5999c64 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -37,7 +37,8 @@ Ending = enum.Enum("ELLIPSE", "HYPHEN") SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) CONFIG = {"features.colorInterface": True, "features.printUnicode": True, - "log.cursesColorSupport": log.INFO} + "log.cursesColorSupport": log.INFO, + "log.configEntryTypeError": log.NOTICE} # Flag indicating if unicode is supported by curses. If None then this has yet # to be determined. @@ -45,6 +46,14 @@ IS_UNICODE_SUPPORTED = None def loadConfig(config): config.update(CONFIG) + + CONFIG["features.colorOverride"] = "none" + colorOverride = config.get("features.colorOverride", "none") + + if colorOverride != "none": + try: setColorOverride(colorOverride) + except ValueError, exc: + log.log(CONFIG["log.configEntryTypeError"], exc) def demoGlyphs(): """ @@ -143,9 +152,36 @@ def getColor(color): color - name of the foreground color to be returned """ + colorOverride = getColorOverride() + if colorOverride: color = colorOverride if not COLOR_ATTR_INITIALIZED: _initColors() return COLOR_ATTR[color] +def setColorOverride(color = None): + """ + Overwrites all requests for color with the given color instead. This raises + a ValueError if the color is invalid. + + Arguments: + color - name of the color to overwrite requests with, None to use normal + coloring + """ + + if color == None: + CONFIG["features.colorOverride"] = "none" + elif color in COLOR_LIST.keys(): + CONFIG["features.colorOverride"] = color + else: raise ValueError("\"%s\" isn't a valid color" % color) + +def getColorOverride(): + """ + Provides the override color used by the interface, None if it isn't set. + """ + + colorOverride = CONFIG.get("features.colorOverride", "none") + if colorOverride == "none": return None + else: return colorOverride + def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, getRemainder = False): """ Provides the msg constrained to the given length, truncating on word breaks.

1 0

[arm/release] Improved interaction for graph resizing
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e0534d9de792dcbba5382cb5cc6f431392b12632 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 14:22:47 2011 -0700 Improved interaction for graph resizing Rather than using the 'n' and 'm' keys to resize the graph (with was both bad and being overwritten by other functions) we now use the 'r' key to enter a resizing mode where they can use up/down to resize the graph. This is more intuitive and avoids occupying extra hotkeys. --- src/cli/graphing/graphPanel.py | 53 ++++++++++++++++++++++++++++------------ 1 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 5fa1262..0207604 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -21,6 +21,7 @@ import curses from TorCtl import TorCtl import cli.popups +import cli.controller from util import enum, panel, torTools, uiTools @@ -261,21 +262,42 @@ class GraphPanel(panel.Panel): def handleKey(self, key): isKeystrokeConsumed = True - if key in (ord('n'), ord('N'), ord('m'), ord('M')): - # Unfortunately modifier keys don't work with the up/down arrows (sending - # multiple keycodes). The only exception to this is shift + left/right, - # but for now just gonna use standard characters. + if key == ord('r') or key == ord('R'): + control = cli.controller.getController() - if key in (ord('n'), ord('N')): - self.setGraphHeight(self.graphHeight - 1) - else: - # don't grow the graph if it's already consuming the whole display - # (plus an extra line for the graph/log gap) - maxHeight = self.parent.getmaxyx()[0] - self.top - currentHeight = self.getHeight() - - if currentHeight < maxHeight + 1: - self.setGraphHeight(self.graphHeight + 1) + panel.CURSES_LOCK.acquire() + try: + while True: + msg = "press the down/up to resize the graph, and enter when done" + control.setMsg(msg, curses.A_BOLD, True) + curses.cbreak() + key = control.getScreen().getch() + + if key == curses.KEY_DOWN: + # don't grow the graph if it's already consuming the whole display + # (plus an extra line for the graph/log gap) + maxHeight = self.parent.getmaxyx()[0] - self.top + currentHeight = self.getHeight() + + if currentHeight < maxHeight + 1: + self.setGraphHeight(self.graphHeight + 1) + elif key == curses.KEY_UP: + self.setGraphHeight(self.graphHeight - 1) + elif uiTools.isSelectionKey(key): break + + # redraws the resized panels + displayPanels = control.getDisplayPanels() + + occupiedContent = 0 + for panelImpl in displayPanels: + panelImpl.setTop(occupiedContent) + occupiedContent += panelImpl.getHeight() + + for panelImpl in displayPanels: + panelImpl.redraw(True) + finally: + control.setMsg() + panel.CURSES_LOCK.release() elif key == ord('b') or key == ord('B'): # uses the next boundary type self.bounds = Bounds.next(self.bounds) @@ -314,8 +336,7 @@ class GraphPanel(panel.Panel): else: graphedStats = "none" options = [] - options.append(("m", "increase graph size", None)) - options.append(("n", "decrease graph size", None)) + options.append(("r", "resize graph", None)) options.append(("s", "graphed stats", graphedStats)) options.append(("b", "graph bounds", self.bounds.lower())) options.append(("i", "graph update interval", UPDATE_INTERVALS[self.updateInterval][0]))

1 0

[arm/release] Moving menu generation into a dedicated file
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit af0580268ef996be857eb8300aecf1848894b724 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 18:53:02 2011 -0700 Moving menu generation into a dedicated file --- src/cli/menu/__init__.py | 2 +- src/cli/menu/actions.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++ src/cli/menu/menu.py | 69 +------------------------------------------ 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/src/cli/menu/__init__.py b/src/cli/menu/__init__.py index e6b5f10..f6d43ec 100644 --- a/src/cli/menu/__init__.py +++ b/src/cli/menu/__init__.py @@ -2,5 +2,5 @@ Resources for displaying the menu. """ -__all__ = ["item", "menu"] +__all__ = ["actions", "item", "menu"] diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py new file mode 100644 index 0000000..f6f88ba --- /dev/null +++ b/src/cli/menu/actions.py @@ -0,0 +1,73 @@ +""" +Generates the menu for arm, binding options with their related actions. +""" + +import cli.menu.item + +def makeMenu(): + """ + Constructs the base menu and all of its contents. + """ + + baseMenu = cli.menu.item.Submenu("") + + fileMenu = cli.menu.item.Submenu("File") + fileMenu.add(cli.menu.item.MenuItem("Exit", None)) + baseMenu.add(fileMenu) + + logsMenu = cli.menu.item.Submenu("Logs") + logsMenu.add(cli.menu.item.MenuItem("Events", None)) + logsMenu.add(cli.menu.item.MenuItem("Clear", None)) + logsMenu.add(cli.menu.item.MenuItem("Save", None)) + logsMenu.add(cli.menu.item.MenuItem("Filter", None)) + + duplicatesSubmenu = cli.menu.item.Submenu("Duplicates") + duplicatesSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) + duplicatesSubmenu.add(cli.menu.item.MenuItem("Visible", None)) + logsMenu.add(duplicatesSubmenu) + baseMenu.add(logsMenu) + + viewMenu = cli.menu.item.Submenu("View") + viewMenu.add(cli.menu.item.MenuItem("Graph", None)) + viewMenu.add(cli.menu.item.MenuItem("Connections", None)) + viewMenu.add(cli.menu.item.MenuItem("Configuration", None)) + viewMenu.add(cli.menu.item.MenuItem("Configuration File", None)) + baseMenu.add(viewMenu) + + graphMenu = cli.menu.item.Submenu("Graph") + graphMenu.add(cli.menu.item.MenuItem("Stats", None)) + + sizeSubmenu = cli.menu.item.Submenu("Size") + sizeSubmenu.add(cli.menu.item.MenuItem("Increase", None)) + sizeSubmenu.add(cli.menu.item.MenuItem("Decrease", None)) + graphMenu.add(sizeSubmenu) + + graphMenu.add(cli.menu.item.MenuItem("Update Interval", None)) + + boundsSubmenu = cli.menu.item.Submenu("Bounds") + boundsSubmenu.add(cli.menu.item.MenuItem("Local Max", None)) + boundsSubmenu.add(cli.menu.item.MenuItem("Global Max", None)) + boundsSubmenu.add(cli.menu.item.MenuItem("Tight", None)) + graphMenu.add(boundsSubmenu) + baseMenu.add(graphMenu) + + connectionsMenu = cli.menu.item.Submenu("Connections") + connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) + connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) + connectionsMenu.add(cli.menu.item.MenuItem("Sort Order", None)) + baseMenu.add(connectionsMenu) + + configurationMenu = cli.menu.item.Submenu("Configuration") + + commentsSubmenu = cli.menu.item.Submenu("Comments") + commentsSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) + commentsSubmenu.add(cli.menu.item.MenuItem("Visible", None)) + configurationMenu.add(commentsSubmenu) + + configurationMenu.add(cli.menu.item.MenuItem("Reload", None)) + configurationMenu.add(cli.menu.item.MenuItem("Reset Tor", None)) + baseMenu.add(configurationMenu) + + return baseMenu + + diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index f83b76d..e0728e8 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -4,75 +4,10 @@ import curses import cli.popups import cli.controller import cli.menu.item +import cli.menu.actions from util import uiTools -def makeMenu(): - """ - Constructs the base menu and all of its contents. - """ - - baseMenu = cli.menu.item.Submenu("") - - fileMenu = cli.menu.item.Submenu("File") - fileMenu.add(cli.menu.item.MenuItem("Exit", None)) - baseMenu.add(fileMenu) - - logsMenu = cli.menu.item.Submenu("Logs") - logsMenu.add(cli.menu.item.MenuItem("Events", None)) - logsMenu.add(cli.menu.item.MenuItem("Clear", None)) - logsMenu.add(cli.menu.item.MenuItem("Save", None)) - logsMenu.add(cli.menu.item.MenuItem("Filter", None)) - - duplicatesSubmenu = cli.menu.item.Submenu("Duplicates") - duplicatesSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - duplicatesSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - logsMenu.add(duplicatesSubmenu) - baseMenu.add(logsMenu) - - viewMenu = cli.menu.item.Submenu("View") - viewMenu.add(cli.menu.item.MenuItem("Graph", None)) - viewMenu.add(cli.menu.item.MenuItem("Connections", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration File", None)) - baseMenu.add(viewMenu) - - graphMenu = cli.menu.item.Submenu("Graph") - graphMenu.add(cli.menu.item.MenuItem("Stats", None)) - - sizeSubmenu = cli.menu.item.Submenu("Size") - sizeSubmenu.add(cli.menu.item.MenuItem("Increase", None)) - sizeSubmenu.add(cli.menu.item.MenuItem("Decrease", None)) - graphMenu.add(sizeSubmenu) - - graphMenu.add(cli.menu.item.MenuItem("Update Interval", None)) - - boundsSubmenu = cli.menu.item.Submenu("Bounds") - boundsSubmenu.add(cli.menu.item.MenuItem("Local Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Global Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Tight", None)) - graphMenu.add(boundsSubmenu) - baseMenu.add(graphMenu) - - connectionsMenu = cli.menu.item.Submenu("Connections") - connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Sort Order", None)) - baseMenu.add(connectionsMenu) - - configurationMenu = cli.menu.item.Submenu("Configuration") - - commentsSubmenu = cli.menu.item.Submenu("Comments") - commentsSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - commentsSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - configurationMenu.add(commentsSubmenu) - - configurationMenu.add(cli.menu.item.MenuItem("Reload", None)) - configurationMenu.add(cli.menu.item.MenuItem("Reset Tor", None)) - baseMenu.add(configurationMenu) - - return baseMenu - class MenuCursor: """ Tracks selection and key handling in the menu. @@ -139,7 +74,7 @@ def showMenu(): try: # generates the menu and uses the initial selection of the first item in # the file menu - menu = makeMenu() + menu = cli.menu.actions.makeMenu() cursor = MenuCursor(menu.getChildren()[0].getChildren()[0]) while not cursor.isDone():

1 0

[arm/release] Binding handlers for the view submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 3cc2ecf82d693a782c11d5a4f6fb41e94e7b5d05 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 20:55:34 2011 -0700 Binding handlers for the view submenu Submenu consisting of page and color selection. --- src/cli/configPanel.py | 2 +- src/cli/connections/connPanel.py | 2 +- src/cli/controller.py | 48 +++++++++++++++++++++++++++---------- src/cli/descriptorPopup.py | 2 +- src/cli/menu/actions.py | 44 ++++++++++++++++++++++++++++------ src/cli/menu/item.py | 46 ++++++++++++++++++++++++++++++++++++ src/cli/popups.py | 2 +- src/cli/torrcPanel.py | 2 +- src/util/uiTools.py | 36 ++++++++++++++++++++++++++-- 9 files changed, 155 insertions(+), 29 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index c44d295..c2e290d 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -172,7 +172,7 @@ class ConfigPanel(panel.Panel): """ def __init__(self, stdscr, configType, config=None): - panel.Panel.__init__(self, stdscr, "configState", 0) + panel.Panel.__init__(self, stdscr, "configuration", 0) self.sortOrdering = DEFAULT_SORT_ORDER self._config = dict(DEFAULT_CONFIG) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 45750c3..8b86c65 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -31,7 +31,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): """ def __init__(self, stdscr, config=None): - panel.Panel.__init__(self, stdscr, "conn", 0) + panel.Panel.__init__(self, stdscr, "connections", 0) threading.Thread.__init__(self) self.setDaemon(True) diff --git a/src/cli/controller.py b/src/cli/controller.py index faf9248..cf17da3 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -160,6 +160,14 @@ class Controller: return self._screen + def getPageCount(self): + """ + Provides the number of pages the interface has. This may be zero if all + page panels have been disabled. + """ + + return len(self._pagePanels) + def getPage(self): """ Provides the number belonging to this page. Page numbers start at zero. @@ -167,23 +175,35 @@ class Controller: return self._page + def setPage(self, pageNumber): + """ + Sets the selected page, raising a ValueError if the page number is invalid. + + Arguments: + pageNumber - page number to be selected + """ + + if pageNumber < 0 or pageNumber >= self.getPageCount(): + raise ValueError("Invalid page number: %i" % pageNumber) + + if pageNumber != self._page: + self._page = pageNumber + self._forceRedraw = True + self.setMsg() + def nextPage(self): """ Increments the page number. """ - self._page = (self._page + 1) % len(self._pagePanels) - self._forceRedraw = True - self.setMsg() + self.setPage((self._page + 1) % len(self._pagePanels)) def prevPage(self): """ Decrements the page number. """ - self._page = (self._page - 1) % len(self._pagePanels) - self._forceRedraw = True - self.setMsg() + self.setPage((self._page - 1) % len(self._pagePanels)) def isPaused(self): """ @@ -227,20 +247,22 @@ class Controller: return list(self._stickyPanels) - def getDisplayPanels(self, includeSticky = True): + def getDisplayPanels(self, pageNumber = None, includeSticky = True): """ - Provides all panels belonging to the current page and sticky content above - it. This is ordered they way they are presented (top to bottom) on the - page. + Provides all panels belonging to a page and sticky content above it. This + is ordered they way they are presented (top to bottom) on the page. Arguments: + pageNumber - page number of the panels to be returned, the current + page if None includeSticky - includes sticky panels in the results if true """ + returnPage = self._page if pageNumber == None else pageNumber + if includeSticky: - return self._stickyPanels + self._pagePanels[self._page] - else: - return list(self._pagePanels[self._page]) + return self._stickyPanels + self._pagePanels[returnPage] + else: return list(self._pagePanels[returnPage]) def getDaemonPanels(self): """ diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py index f75d7e6..5b9f646 100644 --- a/src/cli/descriptorPopup.py +++ b/src/cli/descriptorPopup.py @@ -105,7 +105,7 @@ def showDescriptorPopup(connectionPanel): # hides the title of the first panel on the page control = controller.getController() - topPanel = control.getDisplayPanels(False)[0] + topPanel = control.getDisplayPanels(includeSticky = False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 751751f..f81a162 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -7,7 +7,7 @@ import functools import cli.controller import cli.menu.item -from util import torTools +from util import torTools, uiTools def makeMenu(): """ @@ -16,6 +16,7 @@ def makeMenu(): baseMenu = cli.menu.item.Submenu("") baseMenu.add(makeActionsMenu()) + baseMenu.add(makeViewMenu()) logsMenu = cli.menu.item.Submenu("Logs") logsMenu.add(cli.menu.item.MenuItem("Events", None)) @@ -29,13 +30,6 @@ def makeMenu(): logsMenu.add(duplicatesSubmenu) baseMenu.add(logsMenu) - viewMenu = cli.menu.item.Submenu("View") - viewMenu.add(cli.menu.item.MenuItem("Graph", None)) - viewMenu.add(cli.menu.item.MenuItem("Connections", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration File", None)) - baseMenu.add(viewMenu) - graphMenu = cli.menu.item.Submenu("Graph") graphMenu.add(cli.menu.item.MenuItem("Stats", None)) @@ -93,3 +87,37 @@ def makeActionsMenu(): actionsMenu.add(cli.menu.item.MenuItem("Exit", control.quit)) return actionsMenu +def makeViewMenu(): + """ + Submenu consisting of... + [X] <Page 1> + [ ] <Page 2> + [ ] etc... + Color (Submenu) + """ + + viewMenu = cli.menu.item.Submenu("View") + control = cli.controller.getController() + + if control.getPageCount() > 0: + pageGroup = cli.menu.item.SelectionGroup(control.setPage, control.getPage()) + + for i in range(control.getPageCount()): + pagePanels = control.getDisplayPanels(pageNumber = i, includeSticky = False) + label = " / ".join([uiTools.camelCase(panel.getName()) for panel in pagePanels]) + + viewMenu.add(cli.menu.item.SelectionMenuItem(label, pageGroup, i)) + + if uiTools.isColorSupported(): + colorMenu = cli.menu.item.Submenu("Color") + colorGroup = cli.menu.item.SelectionGroup(uiTools.setColorOverride, uiTools.getColorOverride()) + + colorMenu.add(cli.menu.item.SelectionMenuItem("All", colorGroup, None)) + + for color in uiTools.COLOR_LIST: + colorMenu.add(cli.menu.item.SelectionMenuItem(uiTools.camelCase(color), colorGroup, color)) + + viewMenu.add(colorMenu) + + return viewMenu + diff --git a/src/cli/menu/item.py b/src/cli/menu/item.py index 8c5d314..beaac9c 100644 --- a/src/cli/menu/item.py +++ b/src/cli/menu/item.py @@ -147,3 +147,49 @@ class Submenu(MenuItem): def select(self): return False +class SelectionGroup(): + """ + Radio button groups that SelectionMenuItems can belong to. + """ + + def __init__(self, action, selectedArg): + self.action = action + self.selectedArg = selectedArg + +class SelectionMenuItem(MenuItem): + """ + Menu item with an associated group which determines the selection. This is + for the common single argument getter/setter pattern. + """ + + def __init__(self, label, group, arg): + MenuItem.__init__(self, label, None) + self._group = group + self._arg = arg + + def isSelected(self): + """ + True if we're the selected item, false otherwise. + """ + + return self._arg == self._group.selectedArg + + def getLabel(self): + """ + Provides our label with a "[X]" prefix if selected and "[ ]" if not. + """ + + myLabel = MenuItem.getLabel(self)[1] + myPrefix = "[X] " if self.isSelected() else "[ ] " + return (myPrefix, myLabel, "") + + def select(self): + """ + Performs the group's setter action with our argument. + """ + + if not self.isSelected(): + self._group.action(self._arg) + + return True + diff --git a/src/cli/popups.py b/src/cli/popups.py index 8061c8f..5f1eac2 100644 --- a/src/cli/popups.py +++ b/src/cli/popups.py @@ -280,7 +280,7 @@ def showMenu(title, options, oldSelection): try: # hides the title of the first panel on the page control = cli.controller.getController() - topPanel = control.getDisplayPanels(False)[0] + topPanel = control.getDisplayPanels(includeSticky = False)[0] topPanel.setTitleVisible(False) topPanel.redraw(True) diff --git a/src/cli/torrcPanel.py b/src/cli/torrcPanel.py index e14a16a..a12cc87 100644 --- a/src/cli/torrcPanel.py +++ b/src/cli/torrcPanel.py @@ -24,7 +24,7 @@ class TorrcPanel(panel.Panel): """ def __init__(self, stdscr, configType, config=None): - panel.Panel.__init__(self, stdscr, "configFile", 0) + panel.Panel.__init__(self, stdscr, "torrc", 0) self._config = dict(DEFAULT_CONFIG) if config: diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 5999c64..34d9210 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -18,6 +18,9 @@ COLOR_LIST = {"red": curses.COLOR_RED, "green": curses.COLOR_GREEN, "cyan": curses.COLOR_CYAN, "magenta": curses.COLOR_MAGENTA, "black": curses.COLOR_BLACK, "white": curses.COLOR_WHITE} +# boolean for if we have color support enabled, None not yet determined +COLOR_IS_SUPPORTED = None + # mappings for getColor() - this uses the default terminal color scheme if # color support is unavailable COLOR_ATTR_INITIALIZED = False @@ -138,6 +141,14 @@ def getPrintable(line, keepNewlines = True): line = "".join([char for char in line if (isprint(char) or (keepNewlines and char == "\n"))]) return line +def isColorSupported(): + """ + True if the display supports showing color, false otherwise. + """ + + if COLOR_IS_SUPPORTED == None: _initColors() + return COLOR_IS_SUPPORTED + def getColor(color): """ Provides attribute corresponding to a given text color. Supported colors @@ -261,6 +272,24 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg +def camelCase(label): + """ + Converts the given string to camel case, ie: + >>> camelCase("I_LIKE_PEPPERJACK!") + 'I Like Pepperjack!' + + Arguments: + label - input string to be converted + """ + + words = [] + for entry in label.split("_"): + if len(entry) == 0: words.append("") + elif len(entry) == 1: words.append(entry.upper()) + else: words.append(entry[0].upper() + entry[1:].lower()) + + return " ".join(words) + def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): """ Draws a box in the panel with the given bounds. @@ -719,16 +748,17 @@ def _initColors(): calling curses.initscr(). """ - global COLOR_ATTR_INITIALIZED + global COLOR_ATTR_INITIALIZED, COLOR_IS_SUPPORTED if not COLOR_ATTR_INITIALIZED: COLOR_ATTR_INITIALIZED = True + COLOR_IS_SUPPORTED = False if not CONFIG["features.colorInterface"]: return - try: hasColorSupport = curses.has_colors() + try: COLOR_IS_SUPPORTED = curses.has_colors() except curses.error: return # initscr hasn't been called yet # initializes color mappings if color support is available - if hasColorSupport: + if COLOR_IS_SUPPORTED: colorpair = 0 log.log(CONFIG["log.cursesColorSupport"], "Terminal color support detected and enabled")

1 0

[arm/release] Binding handlers for the actions submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 66e10cc08f300e46d8c6eb9857a664d824bf1159 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 19:19:41 2011 -0700 Binding handlers for the actions submenu Making a functional actions submenu which includes options for... - Close Menu - Pause / Unpause - Reset Tor - Quit --- src/cli/controller.py | 23 +++++++++++++++++++---- src/cli/menu/actions.py | 30 ++++++++++++++++++++++++++---- src/cli/menu/item.py | 7 +++++-- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 997d9d3..faf9248 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -150,6 +150,7 @@ class Controller: self._page = 0 self._isPaused = False self._forceRedraw = False + self._isDone = False self.setMsg() # initializes our control message def getScreen(self): @@ -312,6 +313,20 @@ class Controller: if redraw: controlPanel.redraw(True) else: self._forceRedraw = True + + def isDone(self): + """ + True if arm should be terminated, false otherwise. + """ + + return self._isDone + + def quit(self): + """ + Terminates arm after the input is processed. + """ + + self._isDone = True def shutdownDaemons(): """ @@ -477,7 +492,7 @@ def drawTorMonitor(stdscr, startTime): menuKeys = [] - while True: + while not control.isDone(): displayPanels = control.getDisplayPanels() isUnresponsive = heartbeatCheck(isUnresponsive) @@ -529,9 +544,7 @@ def drawTorMonitor(stdscr, startTime): quitConfirmed = confirmationKey in (ord('q'), ord('Q')) else: quitConfirmed = True - if quitConfirmed: - shutdownDaemons() - break + if quitConfirmed: control.quit() elif key == ord('x') or key == ord('X'): # provides prompt to confirm that arm should issue a sighup msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" @@ -547,4 +560,6 @@ def drawTorMonitor(stdscr, startTime): for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) if isKeystrokeConsumed: break + + shutdownDaemons() diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index f6f88ba..751751f 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -2,18 +2,20 @@ Generates the menu for arm, binding options with their related actions. """ +import functools + +import cli.controller import cli.menu.item +from util import torTools + def makeMenu(): """ Constructs the base menu and all of its contents. """ baseMenu = cli.menu.item.Submenu("") - - fileMenu = cli.menu.item.Submenu("File") - fileMenu.add(cli.menu.item.MenuItem("Exit", None)) - baseMenu.add(fileMenu) + baseMenu.add(makeActionsMenu()) logsMenu = cli.menu.item.Submenu("Logs") logsMenu.add(cli.menu.item.MenuItem("Events", None)) @@ -70,4 +72,24 @@ def makeMenu(): return baseMenu +def makeActionsMenu(): + """ + Submenu consisting of... + Close Menu + Pause / Unpause + Reset Tor + Exit + """ + + control = cli.controller.getController() + actionsMenu = cli.menu.item.Submenu("Actions") + actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) + + if control.isPaused(): label, arg = "Unpause", False + else: label, arg = "Pause", True + actionsMenu.add(cli.menu.item.MenuItem(label, functools.partial(control.setPaused, arg))) + + actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", torTools.getConn().reload)) + actionsMenu.add(cli.menu.item.MenuItem("Exit", control.quit)) + return actionsMenu diff --git a/src/cli/menu/item.py b/src/cli/menu/item.py index bfc7ffd..8c5d314 100644 --- a/src/cli/menu/item.py +++ b/src/cli/menu/item.py @@ -53,8 +53,8 @@ class MenuItem(): the menu and false otherwise. """ - if self._callback: return self._callback() - else: return False + if self._callback: self._callback() + return True def next(self): """ @@ -143,4 +143,7 @@ class Submenu(MenuItem): """ return not bool(self._children) + + def select(self): + return False

1 0

[arm/release] Binding handlers for the log submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 62c76582c3816e58f1108ffd095ca8aae92105fb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 13:18:36 2011 -0700 Binding handlers for the log submenu --- src/cli/controller.py | 19 ++++- src/cli/graphing/graphPanel.py | 11 +--- src/cli/logPanel.py | 160 +++++++++++++++++++++++++++------------- src/cli/menu/actions.py | 56 +++++++++++---- src/cli/menu/menu.py | 4 +- 5 files changed, 168 insertions(+), 82 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index cf17da3..6158ade 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -288,12 +288,27 @@ class Controller: return allPanels - def requestRedraw(self): + def requestRedraw(self, immediate = False): """ Requests that all content is redrawn when the interface is next rendered. + + Arguments: + immediate - redraws now if true, otherwise waits for when next normally + drawn """ - self._forceRedraw = True + if immediate: + displayPanels = self.getDisplayPanels() + + occupiedContent = 0 + for panelImpl in displayPanels: + panelImpl.setTop(occupiedContent) + occupiedContent += panelImpl.getHeight() + + for panelImpl in displayPanels: + panelImpl.redraw(True) + else: + self._forceRedraw = True def isRedrawRequested(self, clearFlag = False): """ diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 69b9121..8c3adf7 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -307,16 +307,7 @@ class GraphPanel(panel.Panel): panel.CURSES_LOCK.acquire() try: while True: - # redraws the resized panels - displayPanels = control.getDisplayPanels() - - occupiedContent = 0 - for panelImpl in displayPanels: - panelImpl.setTop(occupiedContent) - occupiedContent += panelImpl.getHeight() - - for panelImpl in displayPanels: - panelImpl.redraw(True) + control.requestRedraw(True) msg = "press the down/up to resize the graph, and enter when done" control.setMsg(msg, curses.A_BOLD, True) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 6d54ab4..ef372ab 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -13,6 +13,7 @@ import threading from TorCtl import TorCtl import popups +import cli.controller from version import VERSION from util import conf, log, panel, sysTools, torTools, uiTools @@ -668,6 +669,17 @@ class LogPanel(panel.Panel, threading.Thread): log.log(self._config["log.logPanel.logFileWriteFailed"], "Unable to write to log file: %s" % sysTools.getFileErrorMsg(exc)) self.logFile = None + def setDuplicateVisability(self, isVisible): + """ + Sets if duplicate log entries are collaped or expanded. + + Arguments: + isVisible - if true all log entries are shown, otherwise they're + deduplicated + """ + + self.showDuplicates = isVisible + def registerEvent(self, event): """ Notes event and redraws log. If paused it's held in a temporary buffer. @@ -728,6 +740,13 @@ class LogPanel(panel.Panel, threading.Thread): self.redraw(True) self.valsLock.release() + def getFilter(self): + """ + Provides our currently selected regex filter. + """ + + return self.filterOptions[0] if self.regexFilter else None + def setFilter(self, logFilter): """ Filters log entries according to the given regular expression. @@ -744,6 +763,90 @@ class LogPanel(panel.Panel, threading.Thread): self.redraw(True) self.valsLock.release() + def makeFilterSelection(self, selectedOption): + """ + Makes the given filter selection, applying it to the log and reorganizing + our filter selection. + + Arguments: + selectedOption - regex filter we've already added, None if no filter + should be applied + """ + + if selectedOption: + try: + self.setFilter(re.compile(selectedOption)) + + # move selection to top + self.filterOptions.remove(selectedOption) + self.filterOptions.insert(0, selectedOption) + except re.error, exc: + # shouldn't happen since we've already checked validity + msg = "Invalid regular expression ('%s': %s) - removing from listing" % (selectedOption, exc) + log.log(log.WARN, msg) + self.filterOptions.remove(selectedOption) + else: self.setFilter(None) + + def showFilterPrompt(self): + """ + Prompts the user to add a new regex filter. + """ + + cli.controller.getController().requestRedraw(True) + regexInput = popups.inputPrompt("Regular expression: ") + + if regexInput: + try: + self.setFilter(re.compile(regexInput)) + if regexInput in self.filterOptions: self.filterOptions.remove(regexInput) + self.filterOptions.insert(0, regexInput) + except re.error, exc: + popups.showMsg("Unable to compile expression: %s" % exc, 2) + + def showEventSelectionPrompt(self): + """ + Prompts the user to select the events being listened for. + """ + + # allow user to enter new types of events to log - unchanged if left blank + cli.controller.getController().requestRedraw(True) + popup, width, height = popups.init(11, 80) + + if popup: + try: + # displays the available flags + popup.win.box() + popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) + eventLines = EVENT_LISTING.split("\n") + + for i in range(len(eventLines)): + popup.addstr(i + 1, 1, eventLines[i][6:]) + + popup.win.refresh() + + userInput = popups.inputPrompt("Events to log: ") + if userInput: + userInput = userInput.replace(' ', '') # strips spaces + try: self.setLoggedEvents(expandEvents(userInput)) + except ValueError, exc: + popups.showMsg("Invalid flags: %s" % str(exc), 2) + finally: popups.finalize() + + def showSnapshotPrompt(self): + """ + Lets user enter a path to take a snapshot, canceling if left blank. + """ + + cli.controller.getController().requestRedraw(True) + pathInput = popups.inputPrompt("Path to save log snapshot: ") + + if pathInput: + try: + self.saveSnapshot(pathInput) + popups.showMsg("Saved: %s" % pathInput, 2) + except IOError, exc: + popups.showMsg("Unable to save snapshot: %s" % sysTools.getFileErrorMsg(exc), 2) + def clear(self): """ Clears the contents of the event log. @@ -817,66 +920,17 @@ class LogPanel(panel.Panel, threading.Thread): self.setFilter(None) elif selection == len(options) - 1: # selected 'New...' option - prompt user to input regular expression - regexInput = popups.inputPrompt("Regular expression: ") - - if regexInput: - try: - self.setFilter(re.compile(regexInput)) - if regexInput in self.filterOptions: self.filterOptions.remove(regexInput) - self.filterOptions.insert(0, regexInput) - except re.error, exc: - popups.showMsg("Unable to compile expression: %s" % exc, 2) + self.showFilterPrompt() elif selection != -1: - selectedOption = self.filterOptions[selection - 1] - - try: - self.setFilter(re.compile(selectedOption)) - - # move selection to top - self.filterOptions.remove(selectedOption) - self.filterOptions.insert(0, selectedOption) - except re.error, exc: - # shouldn't happen since we've already checked validity - msg = "Invalid regular expression ('%s': %s) - removing from listing" % (selectedOption, exc) - log.log(log.WARN, msg) - self.filterOptions.remove(selectedOption) + self.makeFilterSelection(self.filterOptions[selection - 1]) finally: panel.CURSES_LOCK.release() if len(self.filterOptions) > MAX_REGEX_FILTERS: del self.filterOptions[MAX_REGEX_FILTERS:] elif key == ord('e') or key == ord('E'): - # allow user to enter new types of events to log - unchanged if left blank - popup, width, height = popups.init(11, 80) - - if popup: - try: - # displays the available flags - popup.win.box() - popup.addstr(0, 0, "Event Types:", curses.A_STANDOUT) - eventLines = EVENT_LISTING.split("\n") - - for i in range(len(eventLines)): - popup.addstr(i + 1, 1, eventLines[i][6:]) - - popup.win.refresh() - - userInput = popups.inputPrompt("Events to log: ") - if userInput: - userInput = userInput.replace(' ', '') # strips spaces - try: self.setLoggedEvents(expandEvents(userInput)) - except ValueError, exc: - popups.showMsg("Invalid flags: %s" % str(exc), 2) - finally: popups.finalize() + self.showEventSelectionPrompt() elif key == ord('a') or key == ord('A'): - # lets user enter a path to take a snapshot, canceling if left blank - pathInput = popups.inputPrompt("Path to save log snapshot: ") - - if pathInput: - try: - self.saveSnapshot(pathInput) - popups.showMsg("Saved: %s" % pathInput, 2) - except IOError, exc: - popups.showMsg("Unable to save snapshot: %s" % sysTools.getFileErrorMsg(exc), 2) + self.showSnapshotPrompt() else: isKeystrokeConsumed = False return isKeystrokeConsumed diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 9d69cb4..c8b8da3 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -24,18 +24,8 @@ def makeMenu(): for pagePanel in control.getDisplayPanels(includeSticky = False): if pagePanel.getName() == "graph": baseMenu.add(makeGraphMenu(pagePanel)) - - logsMenu = cli.menu.item.Submenu("Logs") - logsMenu.add(cli.menu.item.MenuItem("Events", None)) - logsMenu.add(cli.menu.item.MenuItem("Clear", None)) - logsMenu.add(cli.menu.item.MenuItem("Save", None)) - logsMenu.add(cli.menu.item.MenuItem("Filter", None)) - - duplicatesSubmenu = cli.menu.item.Submenu("Duplicates") - duplicatesSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - duplicatesSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - logsMenu.add(duplicatesSubmenu) - baseMenu.add(logsMenu) + elif pagePanel.getName() == "log": + baseMenu.add(makeLogMenu(pagePanel)) connectionsMenu = cli.menu.item.Submenu("Connections") connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) @@ -117,7 +107,7 @@ def makeGraphMenu(graphPanel): [X] <Stat 1> [ ] <Stat 2> [ ] <Stat 2> - Resize + Resize... Interval (Submenu) Bounds (Submenu) @@ -138,7 +128,7 @@ def makeGraphMenu(graphPanel): graphMenu.add(cli.menu.item.SelectionMenuItem(label, statGroup, statKey)) # resizing option - graphMenu.add(cli.menu.item.MenuItem("Resize", graphPanel.resizeGraph)) + graphMenu.add(cli.menu.item.MenuItem("Resize...", graphPanel.resizeGraph)) # interval submenu intervalMenu = cli.menu.item.Submenu("Interval") @@ -162,3 +152,41 @@ def makeGraphMenu(graphPanel): return graphMenu +def makeLogMenu(logPanel): + """ + Submenu for the log panel, consisting of... + Events... + Snapshot... + Clear + Show / Hide Duplicates + Filter (Submenu) + + Arguments: + logPanel - instance of the log panel + """ + + logMenu = cli.menu.item.Submenu("Log") + + logMenu.add(cli.menu.item.MenuItem("Events...", logPanel.showEventSelectionPrompt)) + logMenu.add(cli.menu.item.MenuItem("Snapshot...", logPanel.showSnapshotPrompt)) + logMenu.add(cli.menu.item.MenuItem("Clear", logPanel.clear)) + + if logPanel.showDuplicates: label, arg = "Hide", False + else: label, arg = "Show", True + logMenu.add(cli.menu.item.MenuItem("%s Duplicates" % label, functools.partial(logPanel.setDuplicateVisability, arg))) + + # filter submenu + filterMenu = cli.menu.item.Submenu("Filter") + filterGroup = cli.menu.item.SelectionGroup(logPanel.makeFilterSelection, logPanel.getFilter()) + + filterMenu.add(cli.menu.item.SelectionMenuItem("None", filterGroup, None)) + + for option in logPanel.filterOptions: + filterMenu.add(cli.menu.item.SelectionMenuItem(option, filterGroup, option)) + + filterMenu.add(cli.menu.item.MenuItem("New...", logPanel.showFilterPrompt)) + logMenu.add(filterMenu) + + return logMenu + + diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index e0728e8..b411a9c 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -110,9 +110,7 @@ def showMenu(): cursor.handleKey(key) # redraws the rest of the interface if we're rendering on it again - if not cursor.isDone(): - for panelImpl in control.getDisplayPanels(): - panelImpl.redraw(True) + if not cursor.isDone(): control.requestRedraw(True) finally: control.setMsg() cli.popups.finalize()

1 0

[arm/release] Binding handlers for the graph submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit ea0b39251a9371cd81262bc360c644ab18acf1c8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 12:11:23 2011 -0700 Binding handlers for the graph submenu --- src/cli/graphing/graphPanel.py | 121 ++++++++++++++++++++++++++++------------ src/cli/menu/actions.py | 75 +++++++++++++++++++------ src/util/uiTools.py | 10 ++- 3 files changed, 150 insertions(+), 56 deletions(-) diff --git a/src/cli/graphing/graphPanel.py b/src/cli/graphing/graphPanel.py index 0207604..69b9121 100644 --- a/src/cli/graphing/graphPanel.py +++ b/src/cli/graphing/graphPanel.py @@ -239,6 +239,40 @@ class GraphPanel(panel.Panel): self.stats = {} # available stats (mappings of label -> instance) self.setPauseAttr("stats") + def getUpdateInterval(self): + """ + Provides the rate that we update the graph at. + """ + + return self.updateInterval + + def setUpdateInterval(self, updateInterval): + """ + Sets the rate that we update the graph at. + + Arguments: + updateInterval - update time enum + """ + + self.updateInterval = updateInterval + + def getBoundsType(self): + """ + Provides the type of graph bounds used. + """ + + return self.bounds + + def setBoundsType(self, boundsType): + """ + Sets the type of graph boundaries we use. + + Arguments: + boundsType - graph bounds enum + """ + + self.bounds = boundsType + def getHeight(self): """ Provides the height requested by the currently displayed GraphStats (zero @@ -260,44 +294,54 @@ class GraphPanel(panel.Panel): self.graphHeight = max(MIN_GRAPH_HEIGHT, newGraphHeight) + def resizeGraph(self): + """ + Prompts for user input to resize the graph panel. Options include... + down arrow - grow graph + up arrow - shrink graph + enter / space - set size + """ + + control = cli.controller.getController() + + panel.CURSES_LOCK.acquire() + try: + while True: + # redraws the resized panels + displayPanels = control.getDisplayPanels() + + occupiedContent = 0 + for panelImpl in displayPanels: + panelImpl.setTop(occupiedContent) + occupiedContent += panelImpl.getHeight() + + for panelImpl in displayPanels: + panelImpl.redraw(True) + + msg = "press the down/up to resize the graph, and enter when done" + control.setMsg(msg, curses.A_BOLD, True) + curses.cbreak() + key = control.getScreen().getch() + + if key == curses.KEY_DOWN: + # don't grow the graph if it's already consuming the whole display + # (plus an extra line for the graph/log gap) + maxHeight = self.parent.getmaxyx()[0] - self.top + currentHeight = self.getHeight() + + if currentHeight < maxHeight + 1: + self.setGraphHeight(self.graphHeight + 1) + elif key == curses.KEY_UP: + self.setGraphHeight(self.graphHeight - 1) + elif uiTools.isSelectionKey(key): break + finally: + control.setMsg() + panel.CURSES_LOCK.release() + def handleKey(self, key): isKeystrokeConsumed = True if key == ord('r') or key == ord('R'): - control = cli.controller.getController() - - panel.CURSES_LOCK.acquire() - try: - while True: - msg = "press the down/up to resize the graph, and enter when done" - control.setMsg(msg, curses.A_BOLD, True) - curses.cbreak() - key = control.getScreen().getch() - - if key == curses.KEY_DOWN: - # don't grow the graph if it's already consuming the whole display - # (plus an extra line for the graph/log gap) - maxHeight = self.parent.getmaxyx()[0] - self.top - currentHeight = self.getHeight() - - if currentHeight < maxHeight + 1: - self.setGraphHeight(self.graphHeight + 1) - elif key == curses.KEY_UP: - self.setGraphHeight(self.graphHeight - 1) - elif uiTools.isSelectionKey(key): break - - # redraws the resized panels - displayPanels = control.getDisplayPanels() - - occupiedContent = 0 - for panelImpl in displayPanels: - panelImpl.setTop(occupiedContent) - occupiedContent += panelImpl.getHeight() - - for panelImpl in displayPanels: - panelImpl.redraw(True) - finally: - control.setMsg() - panel.CURSES_LOCK.release() + self.resizeGraph() elif key == ord('b') or key == ord('B'): # uses the next boundary type self.bounds = Bounds.next(self.bounds) @@ -447,6 +491,13 @@ class GraphPanel(panel.Panel): stats._graphPanel = self self.stats[label] = stats + def getStats(self): + """ + Provides the currently selected stats label. + """ + + return self.currentDisplay + def setStats(self, label): """ Sets the currently displayed stats instance, hiding panel if None. diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index f81a162..9d69cb4 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -6,6 +6,7 @@ import functools import cli.controller import cli.menu.item +import cli.graphing.graphPanel from util import torTools, uiTools @@ -18,6 +19,12 @@ def makeMenu(): baseMenu.add(makeActionsMenu()) baseMenu.add(makeViewMenu()) + control = cli.controller.getController() + + for pagePanel in control.getDisplayPanels(includeSticky = False): + if pagePanel.getName() == "graph": + baseMenu.add(makeGraphMenu(pagePanel)) + logsMenu = cli.menu.item.Submenu("Logs") logsMenu.add(cli.menu.item.MenuItem("Events", None)) logsMenu.add(cli.menu.item.MenuItem("Clear", None)) @@ -30,23 +37,6 @@ def makeMenu(): logsMenu.add(duplicatesSubmenu) baseMenu.add(logsMenu) - graphMenu = cli.menu.item.Submenu("Graph") - graphMenu.add(cli.menu.item.MenuItem("Stats", None)) - - sizeSubmenu = cli.menu.item.Submenu("Size") - sizeSubmenu.add(cli.menu.item.MenuItem("Increase", None)) - sizeSubmenu.add(cli.menu.item.MenuItem("Decrease", None)) - graphMenu.add(sizeSubmenu) - - graphMenu.add(cli.menu.item.MenuItem("Update Interval", None)) - - boundsSubmenu = cli.menu.item.Submenu("Bounds") - boundsSubmenu.add(cli.menu.item.MenuItem("Local Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Global Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Tight", None)) - graphMenu.add(boundsSubmenu) - baseMenu.add(graphMenu) - connectionsMenu = cli.menu.item.Submenu("Connections") connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) @@ -121,3 +111,54 @@ def makeViewMenu(): return viewMenu +def makeGraphMenu(graphPanel): + """ + Submenu for the graph panel, consisting of... + [X] <Stat 1> + [ ] <Stat 2> + [ ] <Stat 2> + Resize + Interval (Submenu) + Bounds (Submenu) + + Arguments: + graphPanel - instance of the graph panel + """ + + graphMenu = cli.menu.item.Submenu("Graph") + + # stats options + statGroup = cli.menu.item.SelectionGroup(graphPanel.setStats, graphPanel.getStats()) + availableStats = graphPanel.stats.keys() + availableStats.sort() + + for statKey in ["None"] + availableStats: + label = uiTools.camelCase(statKey, divider = " ") + statKey = None if statKey == "None" else statKey + graphMenu.add(cli.menu.item.SelectionMenuItem(label, statGroup, statKey)) + + # resizing option + graphMenu.add(cli.menu.item.MenuItem("Resize", graphPanel.resizeGraph)) + + # interval submenu + intervalMenu = cli.menu.item.Submenu("Interval") + intervalGroup = cli.menu.item.SelectionGroup(graphPanel.setUpdateInterval, graphPanel.getUpdateInterval()) + + for i in range(len(cli.graphing.graphPanel.UPDATE_INTERVALS)): + label = cli.graphing.graphPanel.UPDATE_INTERVALS[i][0] + label = uiTools.camelCase(label, divider = " ") + intervalMenu.add(cli.menu.item.SelectionMenuItem(label, intervalGroup, i)) + + graphMenu.add(intervalMenu) + + # bounds submenu + boundsMenu = cli.menu.item.Submenu("Bounds") + boundsGroup = cli.menu.item.SelectionGroup(graphPanel.setBoundsType, graphPanel.getBoundsType()) + + for boundsType in cli.graphing.graphPanel.Bounds.values(): + boundsMenu.add(cli.menu.item.SelectionMenuItem(boundsType, boundsGroup, boundsType)) + + graphMenu.add(boundsMenu) + + return graphMenu + diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 34d9210..5204960 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -272,23 +272,25 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg -def camelCase(label): +def camelCase(label, divider = "_", joiner = " "): """ Converts the given string to camel case, ie: >>> camelCase("I_LIKE_PEPPERJACK!") 'I Like Pepperjack!' Arguments: - label - input string to be converted + label - input string to be converted + divider - character to be used for word breaks + joiner - character used to fill between word breaks """ words = [] - for entry in label.split("_"): + for entry in label.split(divider): if len(entry) == 0: words.append("") elif len(entry) == 1: words.append(entry.upper()) else: words.append(entry[0].upper() + entry[1:].lower()) - return " ".join(words) + return joiner.join(words) def drawBox(panel, top, left, width, height, attr=curses.A_NORMAL): """

1 0

[arm/release] Binding handlers for the connections submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6ae0b6e6aa1481718443f3e367a91d15a5bdaa6f Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 13:48:13 2011 -0700 Binding handlers for the connections submenu --- src/cli/connections/connPanel.py | 30 +++++++++++++++++----- src/cli/menu/actions.py | 50 ++++++++++++++++++++++++++++++++----- src/util/connections.py | 19 ++++++++++++++ 3 files changed, 85 insertions(+), 14 deletions(-) diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 8b86c65..9490ddc 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -6,6 +6,7 @@ import time import curses import threading +import cli.controller import cli.descriptorPopup import cli.popups @@ -124,6 +125,13 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._entryLines += entry.getLines() self.valsLock.release() + def getListingType(self): + """ + Provides the priority content we list connections by. + """ + + return self._listingType + def setListingType(self, listingType): """ Sets the priority information presented by the panel. @@ -143,6 +151,20 @@ class ConnectionPanel(panel.Panel, threading.Thread): self.valsLock.release() + def showSortDialog(self): + """ + Provides the sort dialog for our connections. + """ + + # set ordering for connection options + cli.controller.getController().requestRedraw(True) + titleLabel = "Connection Ordering:" + options = entries.SortAttr.values() + oldSelection = self._sortOrdering + optionColors = dict([(attr, entries.SORT_COLORS[attr]) for attr in options]) + results = cli.popups.showSortDialog(titleLabel, options, oldSelection, optionColors) + if results: self.setSortOrder(results) + def handleKey(self, key): self.valsLock.acquire() @@ -156,13 +178,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): self._showDetails = not self._showDetails self.redraw(True) elif key == ord('s') or key == ord('S'): - # set ordering for connection options - titleLabel = "Connection Ordering:" - options = entries.SortAttr.values() - oldSelection = self._sortOrdering - optionColors = dict([(attr, entries.SORT_COLORS[attr]) for attr in options]) - results = cli.popups.showSortDialog(titleLabel, options, oldSelection, optionColors) - if results: self.setSortOrder(results) + self.showSortDialog() elif key == ord('u') or key == ord('U'): # provides a menu to pick the connection resolver title = "Resolver Util:" diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index c8b8da3..2827742 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -8,7 +8,7 @@ import cli.controller import cli.menu.item import cli.graphing.graphPanel -from util import torTools, uiTools +from util import connections, torTools, uiTools def makeMenu(): """ @@ -26,12 +26,8 @@ def makeMenu(): baseMenu.add(makeGraphMenu(pagePanel)) elif pagePanel.getName() == "log": baseMenu.add(makeLogMenu(pagePanel)) - - connectionsMenu = cli.menu.item.Submenu("Connections") - connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Sort Order", None)) - baseMenu.add(connectionsMenu) + elif pagePanel.getName() == "connections": + baseMenu.add(makeConnectionsMenu(pagePanel)) configurationMenu = cli.menu.item.Submenu("Configuration") @@ -188,5 +184,45 @@ def makeLogMenu(logPanel): logMenu.add(filterMenu) return logMenu + +def makeConnectionsMenu(connPanel): + """ + Submenu for the connections panel, consisting of... + [X] IP Address + [ ] Fingerprint + [ ] Nickname + Sorting... + Resolver (Submenu) + + Arguments: + connPanel - instance of the connections panel + """ + + connectionsMenu = cli.menu.item.Submenu("Connections") + + # listing options + listingGroup = cli.menu.item.SelectionGroup(connPanel.setListingType, connPanel.getListingType()) + + listingOptions = cli.connections.entries.ListingType.values() + listingOptions.remove(cli.connections.entries.ListingType.HOSTNAME) + + for option in listingOptions: + connectionsMenu.add(cli.menu.item.SelectionMenuItem(option, listingGroup, option)) + + # sorting option + connectionsMenu.add(cli.menu.item.MenuItem("Sorting...", connPanel.showSortDialog)) + + # resolver submenu + connResolver = connections.getResolver("tor") + resolverMenu = cli.menu.item.Submenu("Resolver") + resolverGroup = cli.menu.item.SelectionGroup(connResolver.setOverwriteResolver, connResolver.getOverwriteResolver()) + + resolverMenu.add(cli.menu.item.SelectionMenuItem("auto", resolverGroup, None)) + + for option in connections.Resolver.values(): + resolverMenu.add(cli.menu.item.SelectionMenuItem(option, resolverGroup, option)) + + connectionsMenu.add(resolverMenu) + return connectionsMenu diff --git a/src/util/connections.py b/src/util/connections.py index 47aa8af..97de3ea 100644 --- a/src/util/connections.py +++ b/src/util/connections.py @@ -444,6 +444,25 @@ class ConnectionResolver(threading.Thread): # avoid having stray spikes up the rate. self._rateThresholdBroken = 0 + def getOverwriteResolver(self): + """ + Provides the resolver connection resolution is forced to use. This returns + None if it's dynamically determined. + """ + + return self.overwriteResolver + + def setOverwriteResolver(self, overwriteResolver): + """ + Sets the resolver used for connection resolution, if None then this is + automatically determined based on what is available. + + Arguments: + overwriteResolver - connection resolver to be used + """ + + self.overwriteResolver = overwriteResolver + def run(self): while not self._halt: minWait = self.resolveRate if self.resolveRate else self.defaultRate

1 0

[arm/release] Binding handlers for the configuration submenu
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 93875272baf20437578a4b3e18e4b39a8a9efb9e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jun 12 14:08:31 2011 -0700 Binding handlers for the configuration submenu --- src/cli/configPanel.py | 232 ++++++++++++++++++++++++++--------------------- src/cli/menu/actions.py | 34 +++++-- 2 files changed, 153 insertions(+), 113 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index c2e290d..4647286 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -6,7 +6,7 @@ and the resulting configuration files saved. import curses import threading -import controller +import cli.controller import popups from util import conf, enum, panel, sysTools, torConfig, torTools, uiTools @@ -242,6 +242,17 @@ class ConfigPanel(panel.Panel): return self.scroller.getCursorSelection(self._getConfigOptions()) + def setFiltering(self, isFiltered): + """ + Sets if configuration options are filtered or not. + + Arguments: + isFiltered - if true then only relatively important options will be + shown, otherwise everything is shown + """ + + self.showAll = not isFiltered + def setSortOrder(self, ordering = None): """ Sets the configuration attributes we're sorting by and resorts the @@ -258,6 +269,24 @@ class ConfigPanel(panel.Panel): self.confImportantContents.sort(key=lambda i: (i.getAll(self.sortOrdering))) self.valsLock.release() + def showSortDialog(self): + """ + Provides the sort dialog for our configuration options. + """ + + # set ordering for config options + cli.controller.getController().requestRedraw(True) + titleLabel = "Config Option Ordering:" + options = [FIELD_ATTR[field][0] for field in Field.values()] + oldSelection = [FIELD_ATTR[field][0] for field in self.sortOrdering] + optionColors = dict([FIELD_ATTR[field] for field in Field.values()]) + results = popups.showSortDialog(titleLabel, options, oldSelection, optionColors) + + if results: + # converts labels back to enums + resultEnums = [getFieldFromLabel(label) for label in results] + self.setSortOrder(resultEnums) + def handleKey(self, key): self.valsLock.acquire() isKeystrokeConsumed = True @@ -313,118 +342,117 @@ class ConfigPanel(panel.Panel): self.showAll = not self.showAll self.redraw(True) elif key == ord('s') or key == ord('S'): - # set ordering for config options - titleLabel = "Config Option Ordering:" - options = [FIELD_ATTR[field][0] for field in Field.values()] - oldSelection = [FIELD_ATTR[field][0] for field in self.sortOrdering] - optionColors = dict([FIELD_ATTR[field] for field in Field.values()]) - results = popups.showSortDialog(titleLabel, options, oldSelection, optionColors) - - if results: - # converts labels back to enums - resultEnums = [getFieldFromLabel(label) for label in results] - self.setSortOrder(resultEnums) + self.showSortDialog() elif key == ord('w') or key == ord('W'): - # display a popup for saving the current configuration - configLines = torConfig.getCustomOptions(True) - popup, width, height = popups.init(len(configLines) + 2) - if not popup: return + self.showWriteDialog() + else: isKeystrokeConsumed = False + + self.valsLock.release() + return isKeystrokeConsumed + + def showWriteDialog(self): + """ + Provies an interface to confirm if the configuration is saved and, if so, + where. + """ + + # display a popup for saving the current configuration + cli.controller.getController().requestRedraw(True) + configLines = torConfig.getCustomOptions(True) + popup, width, height = popups.init(len(configLines) + 2) + if not popup: return + + try: + # displayed options (truncating the labels if there's limited room) + if width >= 30: selectionOptions = ("Save", "Save As...", "Cancel") + else: selectionOptions = ("Save", "Save As", "X") - try: - # displayed options (truncating the labels if there's limited room) - if width >= 30: selectionOptions = ("Save", "Save As...", "Cancel") - else: selectionOptions = ("Save", "Save As", "X") + # checks if we can show options beside the last line of visible content + isOptionLineSeparate = False + lastIndex = min(height - 2, len(configLines) - 1) + + # if we don't have room to display the selection options and room to + # grow then display the selection options on its own line + if width < (30 + len(configLines[lastIndex])): + popup.setHeight(height + 1) + popup.redraw(True) # recreates the window instance + newHeight, _ = popup.getPreferredSize() - # checks if we can show options beside the last line of visible content - isOptionLineSeparate = False - lastIndex = min(height - 2, len(configLines) - 1) + if newHeight > height: + height = newHeight + isOptionLineSeparate = True + + key, selection = 0, 2 + while not uiTools.isSelectionKey(key): + # if the popup has been resized then recreate it (needed for the + # proper border height) + newHeight, newWidth = popup.getPreferredSize() + if (height, width) != (newHeight, newWidth): + height, width = newHeight, newWidth + popup.redraw(True) - # if we don't have room to display the selection options and room to - # grow then display the selection options on its own line - if width < (30 + len(configLines[lastIndex])): - popup.setHeight(height + 1) - popup.redraw(True) # recreates the window instance - newHeight, _ = popup.getPreferredSize() - - if newHeight > height: - height = newHeight - isOptionLineSeparate = True + # if there isn't room to display the popup then cancel it + if height <= 2: + selection = 2 + break - key, selection = 0, 2 - while not uiTools.isSelectionKey(key): - # if the popup has been resized then recreate it (needed for the - # proper border height) - newHeight, newWidth = popup.getPreferredSize() - if (height, width) != (newHeight, newWidth): - height, width = newHeight, newWidth - popup.redraw(True) - - # if there isn't room to display the popup then cancel it - if height <= 2: - selection = 2 - break - - popup.win.erase() - popup.win.box() - popup.addstr(0, 0, "Configuration being saved:", curses.A_STANDOUT) + popup.win.erase() + popup.win.box() + popup.addstr(0, 0, "Configuration being saved:", curses.A_STANDOUT) + + visibleConfigLines = height - 3 if isOptionLineSeparate else height - 2 + for i in range(visibleConfigLines): + line = uiTools.cropStr(configLines[i], width - 2) - visibleConfigLines = height - 3 if isOptionLineSeparate else height - 2 - for i in range(visibleConfigLines): - line = uiTools.cropStr(configLines[i], width - 2) - - if " " in line: - option, arg = line.split(" ", 1) - popup.addstr(i + 1, 1, option, curses.A_BOLD | uiTools.getColor("green")) - popup.addstr(i + 1, len(option) + 2, arg, curses.A_BOLD | uiTools.getColor("cyan")) - else: - popup.addstr(i + 1, 1, line, curses.A_BOLD | uiTools.getColor("green")) + if " " in line: + option, arg = line.split(" ", 1) + popup.addstr(i + 1, 1, option, curses.A_BOLD | uiTools.getColor("green")) + popup.addstr(i + 1, len(option) + 2, arg, curses.A_BOLD | uiTools.getColor("cyan")) + else: + popup.addstr(i + 1, 1, line, curses.A_BOLD | uiTools.getColor("green")) + + # draws selection options (drawn right to left) + drawX = width - 1 + for i in range(len(selectionOptions) - 1, -1, -1): + optionLabel = selectionOptions[i] + drawX -= (len(optionLabel) + 2) - # draws selection options (drawn right to left) - drawX = width - 1 - for i in range(len(selectionOptions) - 1, -1, -1): - optionLabel = selectionOptions[i] - drawX -= (len(optionLabel) + 2) - - # if we've run out of room then drop the option (this will only - # occure on tiny displays) - if drawX < 1: break - - selectionFormat = curses.A_STANDOUT if i == selection else curses.A_NORMAL - popup.addstr(height - 2, drawX, "[") - popup.addstr(height - 2, drawX + 1, optionLabel, selectionFormat | curses.A_BOLD) - popup.addstr(height - 2, drawX + len(optionLabel) + 1, "]") - - drawX -= 1 # space gap between the options + # if we've run out of room then drop the option (this will only + # occure on tiny displays) + if drawX < 1: break - popup.win.refresh() + selectionFormat = curses.A_STANDOUT if i == selection else curses.A_NORMAL + popup.addstr(height - 2, drawX, "[") + popup.addstr(height - 2, drawX + 1, optionLabel, selectionFormat | curses.A_BOLD) + popup.addstr(height - 2, drawX + len(optionLabel) + 1, "]") - key = controller.getController().getScreen().getch() - if key == curses.KEY_LEFT: selection = max(0, selection - 1) - elif key == curses.KEY_RIGHT: selection = min(len(selectionOptions) - 1, selection + 1) + drawX -= 1 # space gap between the options - if selection in (0, 1): - loadedTorrc, promptCanceled = torConfig.getTorrc(), False - try: configLocation = loadedTorrc.getConfigLocation() - except IOError: configLocation = "" - - if selection == 1: - # prompts user for a configuration location - configLocation = popups.inputPrompt("Save to (esc to cancel): ", configLocation) - if not configLocation: promptCanceled = True + popup.win.refresh() + + key = cli.controller.getController().getScreen().getch() + if key == curses.KEY_LEFT: selection = max(0, selection - 1) + elif key == curses.KEY_RIGHT: selection = min(len(selectionOptions) - 1, selection + 1) + + if selection in (0, 1): + loadedTorrc, promptCanceled = torConfig.getTorrc(), False + try: configLocation = loadedTorrc.getConfigLocation() + except IOError: configLocation = "" + + if selection == 1: + # prompts user for a configuration location + configLocation = popups.inputPrompt("Save to (esc to cancel): ", configLocation) + if not configLocation: promptCanceled = True + + if not promptCanceled: + try: + torConfig.saveConf(configLocation, configLines) + msg = "Saved configuration to %s" % configLocation + except IOError, exc: + msg = "Unable to save configuration (%s)" % sysTools.getFileErrorMsg(exc) - if not promptCanceled: - try: - torConfig.saveConf(configLocation, configLines) - msg = "Saved configuration to %s" % configLocation - except IOError, exc: - msg = "Unable to save configuration (%s)" % sysTools.getFileErrorMsg(exc) - - popups.showMsg(msg, 2) - finally: popups.finalize() - else: isKeystrokeConsumed = False - - self.valsLock.release() - return isKeystrokeConsumed + popups.showMsg(msg, 2) + finally: popups.finalize() def getHelp(self): options = [] diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index 2827742..2072ead 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -28,17 +28,8 @@ def makeMenu(): baseMenu.add(makeLogMenu(pagePanel)) elif pagePanel.getName() == "connections": baseMenu.add(makeConnectionsMenu(pagePanel)) - - configurationMenu = cli.menu.item.Submenu("Configuration") - - commentsSubmenu = cli.menu.item.Submenu("Comments") - commentsSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - commentsSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - configurationMenu.add(commentsSubmenu) - - configurationMenu.add(cli.menu.item.MenuItem("Reload", None)) - configurationMenu.add(cli.menu.item.MenuItem("Reset Tor", None)) - baseMenu.add(configurationMenu) + elif pagePanel.getName() == "configuration": + baseMenu.add(makeConfigurationMenu(pagePanel)) return baseMenu @@ -226,3 +217,24 @@ def makeConnectionsMenu(connPanel): return connectionsMenu +def makeConfigurationMenu(configPanel): + """ + Submenu for the configuration panel, consisting of... + Save Config... + Sorting... + Filter / Unfilter Options + + Arguments: + configPanel - instance of the configuration panel + """ + + configMenu = cli.menu.item.Submenu("Configuration") + configMenu.add(cli.menu.item.MenuItem("Save Config...", configPanel.showWriteDialog)) + configMenu.add(cli.menu.item.MenuItem("Sorting...", configPanel.showSortDialog)) + + if configPanel.showAll: label, arg = "Filter", True + else: label, arg = "Unfilter", False + configMenu.add(cli.menu.item.MenuItem("%s Options" % label, functools.partial(configPanel.setFiltering, arg))) + + return configMenu +

1 0