July 2011 - tor-commits - lists.torproject.org

[arm/release] Use a tree view for prettifying log entries.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit c9ac18befb91178fdcd4fb86c9fcbd503396c889 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jun 20 18:14:30 2011 +0500 Use a tree view for prettifying log entries. (In future, this can prove to be helpful by being sortable.) --- src/gui/arm.xml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- src/gui/logPanel.py | 21 +++++++------------ 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 8cbb924..f067542 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -134,6 +134,18 @@ </row> </data> </object> + <object class="GtkListStore" id="liststore_log"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkWindow" id="window_main"> <property name="title" translatable="yes">arm</property> <property name="default_width">640</property> @@ -672,10 +684,46 @@ each direction. (Default: 0) </property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkTextView" id="textview_log"> + <object class="GtkTreeView" id="treeview_log"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="buffer">textbuffer_log</property> + <property name="model">liststore_log</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> + <property name="title">Time</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_timestamp"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_log_type"> + <property name="title">Type</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_type"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_msg"> + <property name="title">Message</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_log_msg"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> + </object> + </child> </object> </child> </object> diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 174ed64..bacc6f2 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -4,6 +4,7 @@ Base class for implementing graphing functionality. import random import sys +import time from collections import deque @@ -28,24 +29,18 @@ class LogPanel: finally: log.LOG_LOCK.release() - textbuffer = self.builder.get_object('textbuffer_log') - - for color in RUNLEVEL_EVENT_COLOR.values(): - textbuffer.create_tag(color, foreground=color) - - gobject.timeout_add(1000, self.print_log) - - def print_log(self): - textbuffer = self.builder.get_object('textbuffer_log') - start, end = textbuffer.get_bounds() - textbuffer.delete(start, end) + def fill_log(self): + liststore = self.builder.get_object('liststore_log') + liststore.clear() for entry in self.msgLog: - iter = textbuffer.get_iter_at_mark(textbuffer.get_insert()) - textbuffer.insert_with_tags_by_name(iter, entry.getDisplayMessage() + "\n", entry.color) + timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) + row = (timeLabel, entry.type, entry.msg, entry.color) + liststore.append(row) def register_event(self, event): self.msgLog.appendleft(event) + self.fill_log() def pack_widgets(self): pass

1 0

[arm/release] Support logging of arm events.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d5556ad4ce0c43d0aca1b287ad59c3a90bd923c5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jun 20 16:55:05 2011 +0500 Support logging of arm events. --- src/gui/__init__.py | 2 +- src/gui/arm.xml | 8 +------ src/gui/controller.py | 14 +++++++----- src/gui/logPanel.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/gui/__init__.py b/src/gui/__init__.py index f461b3e..b700273 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["controller"] +__all__ = ["controller", "logPanel"] diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 11f5c63..8cbb924 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -692,11 +692,5 @@ each direction. (Default: 0) </property> </object> </child> </object> - <object class="GtkTextBuffer" id="textbuffer_log"> - <property name="text" translatable="yes">16:09:20 [NOTICE] Bootstrapped 90%: Establishing a Tor circuit. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:24 [NOTICE] Bootstrapped 100%: Done. -</property> - </object> + <object class="GtkTextBuffer" id="textbuffer_log"/> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 4da82c9..8f27df4 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,7 +1,8 @@ import gobject import gtk -from util import torTools +from util import log, torTools +from gui import logPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -17,14 +18,15 @@ class GuiController: self.bwStats = bandwidthStats.BandwidthStats(self.builder) self.bwStats.pack_widgets() + self.logPanel = logPanel.LogPanel(self.builder) + self.logPanel.pack_widgets() + + log.log(log.DEBUG, "Hello World!") + log.log(log.ERR, "Hello Again!") + def run(self): window = self.builder.get_object('window_main') - textbuffer = self.builder.get_object('textbuffer_log') - conn = torTools.getConn() - torPid = conn.getMyPid() - textbuffer.set_text("Tor pid: %s" % torPid) - window.show_all() gtk.main() diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py new file mode 100644 index 0000000..174ed64 --- /dev/null +++ b/src/gui/logPanel.py @@ -0,0 +1,56 @@ +""" +Base class for implementing graphing functionality. +""" + +import random +import sys + +from collections import deque + +import gobject +import gtk + +from TorCtl import TorCtl +from util import log, uiTools, torTools + +from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry + +class LogPanel: + def __init__(self, builder): + self.builder = builder + + self.msgLog = deque() + + log.LOG_LOCK.acquire() + try: + armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] + log.addListeners(armRunlevels, self._register_arm_event) + finally: + log.LOG_LOCK.release() + + textbuffer = self.builder.get_object('textbuffer_log') + + for color in RUNLEVEL_EVENT_COLOR.values(): + textbuffer.create_tag(color, foreground=color) + + gobject.timeout_add(1000, self.print_log) + + def print_log(self): + textbuffer = self.builder.get_object('textbuffer_log') + start, end = textbuffer.get_bounds() + textbuffer.delete(start, end) + + for entry in self.msgLog: + iter = textbuffer.get_iter_at_mark(textbuffer.get_insert()) + textbuffer.insert_with_tags_by_name(iter, entry.getDisplayMessage() + "\n", entry.color) + + def register_event(self, event): + self.msgLog.appendleft(event) + + def pack_widgets(self): + pass + + def _register_arm_event(self, level, msg, eventTime): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) +

1 0

[arm/release] Relay setup wizard role selection
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 5eb2155266cf4d50af23a9c0cd06d5ab05db9553 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 21 20:14:09 2011 -0700 Relay setup wizard role selection This provides the first prompt of the relay setup wizard which has options for the general role Tor will have. Options include: - Internal Realy - Exit Relay - Bridge - Client - Cancel Selection is currenty a no-op. Next thing to do are the sub-dialogs these options go to... --- README | 1 + src/cli/__init__.py | 2 +- src/cli/controller.py | 7 +++- src/cli/menu/actions.py | 2 + src/cli/menu/menu.py | 1 + src/cli/wizard.py | 98 +++++++++++++++++++++++++++++++++++++++++++++++ src/settings.cfg | 15 +++++++ src/util/uiTools.py | 11 +++++ 8 files changed, 135 insertions(+), 2 deletions(-) diff --git a/README b/README index 44fabf1..835b02b 100644 --- a/README +++ b/README @@ -187,6 +187,7 @@ Layout: headerPanel.py - top of all pages, providing general information descriptorPopup.py - displays connection descriptor data popups.py - toolkit providing display popups + wizard.py - provides the relay setup wizard logPanel.py - (page 1) displays tor, arm, and torctl events configPanel.py - (page 3) editor panel for the tor configuration diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 1564f68..435883d 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel"] +__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] diff --git a/src/cli/controller.py b/src/cli/controller.py index e20e023..e771a26 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -8,6 +8,7 @@ import curses import threading import cli.menu.menu +import cli.wizard import cli.popups import cli.headerPanel import cli.logPanel @@ -455,6 +456,7 @@ def startTorMonitor(startTime): cli.graphing.graphPanel.loadConfig(config) cli.connections.connEntry.loadConfig(config) + cli.wizard.loadConfig(config) # attempts to fetch the tor pid, warning if unsuccessful (this is needed for # checking its resource usage, among other things) @@ -536,7 +538,8 @@ def drawTorMonitor(stdscr, startTime): # main draw loop overrideKey = None # uses this rather than waiting on user input isUnresponsive = False # flag for heartbeat responsiveness check - + if not torTools.getConn().isAlive(): overrideKey = ord('w') # shows wizard + while not control.isDone(): displayPanels = control.getDisplayPanels() isUnresponsive = heartbeatCheck(isUnresponsive) @@ -593,6 +596,8 @@ def drawTorMonitor(stdscr, startTime): log.log(log.ERR, "Error detected when reloading tor: %s" % sysTools.getFileErrorMsg(exc)) elif key == ord('h') or key == ord('H'): overrideKey = cli.popups.showHelpPopup() + elif key == ord('w') or key == ord('W'): + cli.wizard.showWizard() else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index c571bd8..3c90b10 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -5,6 +5,7 @@ Generates the menu for arm, binding options with their related actions. import functools import cli.popups +import cli.wizard import cli.controller import cli.menu.item import cli.graphing.graphPanel @@ -53,6 +54,7 @@ def makeActionsMenu(): actionsMenu = cli.menu.item.Submenu("Actions") actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) actionsMenu.add(cli.menu.item.MenuItem("New Identity", headerPanel.sendNewnym)) + actionsMenu.add(cli.menu.item.MenuItem("Setup Wizard", cli.wizard.showWizard)) if control.isPaused(): label, arg = "Unpause", False else: label, arg = "Pause", True diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index 1dbbbd0..8302551 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -109,6 +109,7 @@ def showMenu(): popup.win.refresh() + curses.cbreak() key = control.getScreen().getch() cursor.handleKey(key) diff --git a/src/cli/wizard.py b/src/cli/wizard.py new file mode 100644 index 0000000..2b7cdf7 --- /dev/null +++ b/src/cli/wizard.py @@ -0,0 +1,98 @@ +""" +Provides user prompts for setting up a new relay. This autogenerates a torrc +that's used by arm to start its tor instance. +""" + +import curses + +import cli.popups +import cli.controller + +from util import enum, uiTools + +# basic configuration types we can run as +RunType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") + +# other options provided in the prompts +CANCEL, BACK = "Cancel", "Back" + +CONFIG = {"wizard.role.message": "", + "wizard.role.option.label": {}, + "wizard.role.option.description": {}} + +def loadConfig(config): + config.update(CONFIG) + +def showWizard(): + myRole = promptRunType() + +def promptRunType(): + """ + Provides a prompt for selecting the general role we'd like Tor to run with. + This returns a RunType enumeration for the selection, or None if the dialog + was canceled. + """ + + popup, _, _ = cli.popups.init(23, 58) + if not popup: return + control = cli.controller.getController() + key, selection = 0, 0 + + # constructs (enum, label, [description lines]) tuples for our options + options = [] + + for runType in RunType.values() + [CANCEL]: + label = CONFIG["wizard.role.option.label"].get(runType, "") + descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") + descLines = [] + + while descRemainder: + descLine, descRemainder = uiTools.cropStr(descRemainder, 54, None, endType = None, getRemainder = True) + descLines.append(descLine.strip()) + + options.append((runType, label, descLines)) + + try: + popup.win.box() + curses.cbreak() + format = uiTools.getColor("green") + y, msgRemainder = 1, CONFIG["wizard.role.message"] + + # provides the welcoming message + while msgRemainder: + msg, msgRemainder = uiTools.cropStr(msgRemainder, 54, None, endType = None, getRemainder = True) + popup.addstr(y, 2, msg.strip(), format | curses.A_BOLD) + y += 1 + + while not uiTools.isSelectionKey(key): + offset = 0 + + for i in range(len(options)): + _, label, lines = options[i] + optionFormat = format | curses.A_STANDOUT if i == selection else format + + # Curses has a weird bug where there's a one-pixel alignment + # difference between bold and regular text, so it looks better + # to render the whitespace here as not being bold. + + offset += 1 + popup.addstr(y + offset, 2, label, optionFormat | curses.A_BOLD) + popup.addstr(y + offset, 2 + len(label), " " * (54 - len(label)), optionFormat) + offset += 1 + + for line in lines: + popup.addstr(y + offset, 2, uiTools.padStr(line, 54), optionFormat) + offset += 1 + + popup.win.refresh() + key = control.getScreen().getch() + + if key == curses.KEY_UP: selection = max(0, selection - 1) + elif key == curses.KEY_DOWN: selection = min(len(options) - 1, selection + 1) + elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel + finally: + cli.popups.finalize() + + selectedOption = options[selection][0] + return None if selectedOption == CANCEL else selectedOption + diff --git a/src/settings.cfg b/src/settings.cfg index bced9a4..2ad2784 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -340,6 +340,21 @@ msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps +# descriptions used in the relay setup wizard +wizard.role.message Welcome to the Tor network! This will step you through the configuration process for being a part of it. To start with, what role would you like to have? + +wizard.role.option.label Relay => Internal Relay +wizard.role.option.label Exit => Exit Relay +wizard.role.option.label Bridge => Bridge +wizard.role.option.label Client => Client +wizard.role.option.label Cancel => Cancel + +wizard.role.option.description Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.role.option.description Exit => Connects between Tor an the outside Internet. This is a vital role, but can lead to abuse complaints. +wizard.role.option.description Bridge => Non-public relay specifically for helping censored users. +wizard.role.option.description Client => Use the network without contributing to it. +wizard.role.option.description Cancel => Close without starting Tor. + # some config options are fetched via special values torrc.map HiddenServiceDir => HiddenServiceOptions torrc.map HiddenServicePort => HiddenServiceOptions diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 40a3087..52885de 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -282,6 +282,17 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg +def padStr(msg, size): + """ + Provides the string padded with whitespace to the given length. + + Arguments: + msg - string to be padded + size - length to be padded to + """ + + return ("%%-%is" % size) % msg + def camelCase(label, divider = "_", joiner = " "): """ Converts the given string to camel case, ie:

1 0

[arm/release] Padding initial setup options
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 5ab244701c1bc56ff57b38371cc62cdbbc6e2bab Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 08:44:45 2011 -0700 Padding initial setup options Provides a better looking, more centered appearance. --- src/cli/wizard.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 2b7cdf7..f9dd770 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -11,7 +11,7 @@ import cli.controller from util import enum, uiTools # basic configuration types we can run as -RunType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # other options provided in the prompts CANCEL, BACK = "Cancel", "Back" @@ -24,16 +24,16 @@ def loadConfig(config): config.update(CONFIG) def showWizard(): - myRole = promptRunType() + myRelayType = promptRelayType() -def promptRunType(): +def promptRelayType(): """ Provides a prompt for selecting the general role we'd like Tor to run with. - This returns a RunType enumeration for the selection, or None if the dialog - was canceled. + This returns a RelayType enumeration for the selection, or None if the + dialog was canceled. """ - popup, _, _ = cli.popups.init(23, 58) + popup, _, _ = cli.popups.init(24, 58) if not popup: return control = cli.controller.getController() key, selection = 0, 0 @@ -41,13 +41,13 @@ def promptRunType(): # constructs (enum, label, [description lines]) tuples for our options options = [] - for runType in RunType.values() + [CANCEL]: + for runType in RelayType.values() + [CANCEL]: label = CONFIG["wizard.role.option.label"].get(runType, "") descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") descLines = [] while descRemainder: - descLine, descRemainder = uiTools.cropStr(descRemainder, 54, None, endType = None, getRemainder = True) + descLine, descRemainder = uiTools.cropStr(descRemainder, 52, None, endType = None, getRemainder = True) descLines.append(descLine.strip()) options.append((runType, label, descLines)) @@ -71,6 +71,10 @@ def promptRunType(): _, label, lines = options[i] optionFormat = format | curses.A_STANDOUT if i == selection else format + # appends an extra space to the start to provide nicer centering + label = " " + label + lines = [" " + line for line in lines] + # Curses has a weird bug where there's a one-pixel alignment # difference between bold and regular text, so it looks better # to render the whitespace here as not being bold.

1 0

[arm/release] fix: getstr y argument wasn't being respected
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4f8cd4c475d481453471191e435fa514267986a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 18:58:05 2011 -0700 fix: getstr y argument wasn't being respected Never used the row argument before - forgot to respect it in subwindow creation. --- src/util/panel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index aa3ca27..3f0a98a 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -592,7 +592,7 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] - inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) + inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1])

1 0

[arm/release] Connect a TorEventObserver instance with LogPanel.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4ea211ffc54b4c32b9d7cc90e4b395523145484b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 22 01:15:50 2011 +0500 Connect a TorEventObserver instance with LogPanel. --- src/gui/controller.py | 7 +------ src/gui/logPanel.py | 13 ++++++------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index c5c8767..090cc31 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -24,12 +24,7 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - def random_entries(): - while True: - log.log(log.DEBUG, "Hello World at %s" % time.asctime(time.localtime())) - time.sleep(5) - - thread.start_new_thread(random_entries, ()) + log.log(log.DEBUG, "Hello world!") def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 7197178..78b218a 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -14,7 +14,7 @@ import gtk from TorCtl import TorCtl from util import log, uiTools, torTools -from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry +from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry, TorEventObserver class LogPanel: def __init__(self, builder): @@ -22,12 +22,11 @@ class LogPanel: self.msgLog = deque() - log.LOG_LOCK.acquire() - try: - armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] - log.addListeners(armRunlevels, self._register_arm_event) - finally: - log.LOG_LOCK.release() + armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] + log.addListeners(armRunlevels, self._register_arm_event) + + conn = torTools.getConn() + conn.addEventListener(TorEventObserver(self.register_event)) def fill_log(self): liststore = self.builder.get_object('liststore_log')

1 0

[arm/release] fix: getstr requests can cause curses crash
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 460a76e802bebb57551af5d04bc214f0a6a54a0c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 18:41:17 2011 -0700 fix: getstr requests can cause curses crash The getstr function creates a curses subwindow which could make a raw addstr request that, if the initial value overflows the subwindow, causes curses to crash. --- src/util/panel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 3bdcd6f..aa3ca27 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -595,7 +595,7 @@ class Panel(): inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) # prepopulates the initial text - if initialText: inputSubwindow.addstr(0, 0, initialText) + if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1]) # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses

1 0

[arm/release] fix: clearing content in a getstr input field
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 6fa3123d8ad9c669db3079d144f7de5117eabd2b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 09:03:31 2011 -0700 fix: clearing content in a getstr input field Any stray characters within the textbox is interpreted as part of the initial input. Clearing the input field when we make it and giving an option for limiting its size. --- src/util/panel.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 5cbeaee..59d2b13 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -573,18 +573,23 @@ class Panel(): baseMsg = "Unclosed formatting tag%s:" % ("s" if len(expectedCloseTags) > 1 else "") raise ValueError("%s: '%s'\n \"%s\"" % (baseMsg, "', '".join(expectedCloseTags), msg)) - def getstr(self, y, x, initialText = "", format = None): + def getstr(self, y, x, initialText = "", format = None, maxWidth = None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then this terminates and provides back None. This should only be called from the context of a panel's draw method. + This blanks any content within the space that the input field is rendered + (otherwise stray characters would be interpreted as part of the initial + input). + Arguments: y - vertical location x - horizontal location initialText - starting text in this field format - format used for the text + maxWidth - maximum width for the text field """ if not format: format = curses.A_NORMAL @@ -595,8 +600,13 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] + if maxWidth: displayWidth = min(displayWidth, maxWidth + x) inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) + # blanks the field's area, filling it with the font in case it's hilighting + inputSubwindow.clear() + inputSubwindow.bkgd(' ', format) + # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1], format)

1 0

[arm/release] fix: man path for default armrc incorrect
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit adf5b6d8f99d3f68412e64e0d2fe45cf17b4f238 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 08:22:25 2011 -0700 fix: man path for default armrc incorrect This was changed a while back but didn't get reflected in the man page. Caught by Jérémy Bobbio (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631358) --- arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arm.1 b/arm.1 index 6a1fa19..7743035 100644 --- a/arm.1 +++ b/arm.1 @@ -27,7 +27,7 @@ tor control port arm should attach to (default is \fB127.0.0.1:9051\fR) .TP \fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user provided configuration file (default is \fB~/.armrc\fR) +user provided configuration file (default is \fB~/.arm/armrc\fR) .TP \fB\-d\fR, \fB\-\-debug\fR

1 0

[arm/release] Allow user to sort log entries in preferred order.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e5ae0d0a95b2739e3e1ec281eeab4f76d779087a Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 21 16:38:18 2011 +0500 Allow user to sort log entries in preferred order. --- src/gui/arm.xml | 18 +++++++++++------- src/gui/controller.py | 11 +++++++++-- src/gui/logPanel.py | 13 +++++++++++-- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index f067542..1e3681c 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -136,6 +136,8 @@ </object> <object class="GtkListStore" id="liststore_log"> <columns> +  + <column type="gulong"/>  <column type="gchararray"/>  @@ -691,11 +693,14 @@ each direction. (Default: 0) </property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> + <property name="sort_indicator">True</property> + <property name="sort_order">descending</property> + <property name="sort_column_id">1</property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_timestamp"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">1</attribute> </attributes> </child> </object> @@ -706,8 +711,8 @@ each direction. (Default: 0) </property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_type"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">2</attribute> </attributes> </child> </object> @@ -718,8 +723,8 @@ each direction. (Default: 0) </property> <child> <object class="GtkCellRendererText" id="cellrenderertext_log_msg"/> <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> + <attribute name="foreground">4</attribute> + <attribute name="markup">3</attribute> </attributes> </child> </object> @@ -740,5 +745,4 @@ each direction. (Default: 0) </property> </object> </child> </object> - <object class="GtkTextBuffer" id="textbuffer_log"/> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 8f27df4..c5c8767 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,6 +1,9 @@ import gobject import gtk +import thread +import time + from util import log, torTools from gui import logPanel from gui.graphing import bandwidthStats @@ -21,8 +24,12 @@ class GuiController: self.logPanel = logPanel.LogPanel(self.builder) self.logPanel.pack_widgets() - log.log(log.DEBUG, "Hello World!") - log.log(log.ERR, "Hello Again!") + def random_entries(): + while True: + log.log(log.DEBUG, "Hello World at %s" % time.asctime(time.localtime())) + time.sleep(5) + + thread.start_new_thread(random_entries, ()) def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index bacc6f2..7197178 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -35,7 +35,7 @@ class LogPanel: for entry in self.msgLog: timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) - row = (timeLabel, entry.type, entry.msg, entry.color) + row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) def register_event(self, event): @@ -43,7 +43,16 @@ class LogPanel: self.fill_log() def pack_widgets(self): - pass + liststore = self.builder.get_object('liststore_log') + + liststore.set_sort_func(1, self._compare_rows) + liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) + + def _compare_rows(self, treemodel, iter1, iter2, data=None): + timestamp_raw1 = treemodel.get(iter1, 0) + timestamp_raw2 = treemodel.get(iter2, 0) + + return cmp(timestamp_raw1, timestamp_raw2) def _register_arm_event(self, level, msg, eventTime): eventColor = RUNLEVEL_EVENT_COLOR[level]

1 0