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

[arm/master] Use consistent coloring across logs, graphs and conns.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit ead474f1498dfe6baa1fd6636ec7d14da6706bb6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 10 20:43:56 2011 +0500 Use consistent coloring across logs, graphs and conns. --- src/gui/arm.xml | 3 +++ src/gui/connections/circEntry.py | 7 +++++-- src/gui/connections/connEntry.py | 5 +++-- src/gui/graphing/graphStats.py | 9 +++++---- src/gui/logPanel.py | 16 ++++++++++------ src/util/gtkTools.py | 21 +++++++++++++++++++++ 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 0aafb28..67409ae 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -435,6 +435,7 @@ <property name="model">treestore_conn</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> @@ -617,6 +618,7 @@ each direction. (Default: 0) </property> <property name="model">liststore_sticky</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> @@ -667,6 +669,7 @@ each direction. (Default: 0) </property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore_log</property> + <property name="rules_hint">True</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index a7ddc13..b3aa29a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -5,6 +5,7 @@ Connection panel entries for client circuits. import time from cli.connections import circEntry +from util import gtkTools class CircEntry(circEntry.CircEntry): @classmethod @@ -20,8 +21,9 @@ class CircHeaderLine(circEntry.CircHeaderLine): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) + theme = gtkTools.Theme() - return (local, foreign, timeLabel, self.baseType, 'blue') + return (local, foreign, timeLabel, self.baseType, theme.colors['active']) class CircLine(circEntry.CircLine): @classmethod @@ -32,6 +34,7 @@ class CircLine(circEntry.CircLine): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) + theme = gtkTools.Theme() - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, theme.colors['normal']) diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index 1acef49..e7e666b 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -7,7 +7,7 @@ import time from cli.connections import connEntry, entries from cli.connections.connEntry import CONFIG, Category -from util import uiTools, torTools +from util import gtkTools, uiTools, torTools class ConnectionEntry(connEntry.ConnectionEntry): @classmethod @@ -55,6 +55,7 @@ class ConnectionLine(connEntry.ConnectionLine): dst = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) + theme = gtkTools.Theme() - return (src, dst, timeLabel, self.getType(), 'red') + return (src, dst, timeLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 51150f8..250503d 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -11,7 +11,7 @@ import gobject import gtk from TorCtl import TorCtl -from util import uiTools, torTools +from util import gtkTools, uiTools, torTools from cagraph.ca_graph import CaGraph from cagraph.axis.xaxis import CaGraphXAxis @@ -62,10 +62,11 @@ class GraphStats(TorCtl.PostEventListener): series = CaGraphSeriesArea(graph, 0, 1) - primaryColor = placeholder.style.fg[gtk.STATE_NORMAL] - secondaryColor = placeholder.style.fg[gtk.STATE_INSENSITIVE] + theme = gtkTools.Theme() + primaryColor = theme.colors['normal'] + secondaryColor = theme.colors['insensitive'] colors = { 'primary' : (primaryColor.red_float, primaryColor.green_float, primaryColor.blue_float, 0.5), - 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.7) } + 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.5) } series.style.point_radius = 0.0 series.style.line_color = colors[name] diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 20331ad..192eb8d 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -13,14 +13,14 @@ import gobject import gtk from TorCtl import TorCtl -from util import log, uiTools, torTools +from util import log, gtkTools, uiTools, torTools from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, LogEntry, TorEventObserver, DEFAULT_CONFIG) -RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", - log.WARN: "#AB7814", log.ERR: "#EC131F"} +RUNLEVEL_EVENT_COLOR = {log.DEBUG: 'insensitive', log.INFO: 'normal', log.NOTICE: 'normal', + log.WARN: 'active', log.ERR: 'active'} STARTUP_EVENTS = 'N3' REFRESH_RATE = 3 @@ -52,7 +52,8 @@ class LogPanel: armEventBacklog = deque() for level, msg, eventTime in log._getEntries(setRunlevels): - armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) + theme = gtkTools.Theme() + armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, theme.colors[RUNLEVEL_EVENT_COLOR[level]]) armEventBacklog.appendleft(armEventEntry) while armEventBacklog or torEventBacklog: @@ -88,6 +89,7 @@ class LogPanel: try: for entry in self.msgLog: timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) + row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) finally: @@ -107,11 +109,13 @@ class LogPanel: gobject.idle_add(self.fill_log) def _register_arm_event(self, level, msg, eventTime): - eventColor = RUNLEVEL_EVENT_COLOR[level] + theme = gtkTools.Theme() + eventColor = theme.colors[RUNLEVEL_EVENT_COLOR[level]] self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) def _register_torctl_event(self, level, msg): - eventColor = RUNLEVEL_EVENT_COLOR[level] + theme = gtkTools.Theme() + eventColor = theme.colors[RUNLEVEL_EVENT_COLOR[level]] self.register_event(LogEntry(time.time(), "TORCTL_%s" % level, msg, eventColor)) def _compare_rows(self, treemodel, iter1, iter2, data=None): diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py new file mode 100644 index 0000000..083fb5d --- /dev/null +++ b/src/util/gtkTools.py @@ -0,0 +1,21 @@ +""" +Helper module for getting Gtk+ theme colors. +""" + +import gtk + +COLOR_MAP = { + 'normal' : ('fg', gtk.STATE_NORMAL), + 'active' : ('fg', gtk.STATE_ACTIVE), + 'insensitive' : ('fg', gtk.STATE_INSENSITIVE), +} + +class Theme: + def __init__(self): + self.colors = {} + + widget = gtk.Button() + + for (key, (prop, state)) in COLOR_MAP.items(): + self.colors[key] = getattr(widget.style, prop)[state] +

1 0

[arm/master] Use gtk theme colors for bandwidth graphs.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit c599d1faca5a66c34a26b7bf5231844e80fb81b7 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 10 19:47:46 2011 +0500 Use gtk theme colors for bandwidth graphs. --- src/gui/graphing/graphStats.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 0d9ac5f..51150f8 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -62,10 +62,14 @@ class GraphStats(TorCtl.PostEventListener): series = CaGraphSeriesArea(graph, 0, 1) - line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} - fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} - series.style.line_color = line_colors[name] - series.style.fill_color = fill_colors[name] + primaryColor = placeholder.style.fg[gtk.STATE_NORMAL] + secondaryColor = placeholder.style.fg[gtk.STATE_INSENSITIVE] + colors = { 'primary' : (primaryColor.red_float, primaryColor.green_float, primaryColor.blue_float, 0.5), + 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.7) } + + series.style.point_radius = 0.0 + series.style.line_color = colors[name] + series.style.fill_color = colors[name] graph.seriess.append(series) graph.grid = CaGraphGrid(graph, 0, 1)

1 0

[arm/master] Display circuit lines appropriately.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit d3ebb46af66d04be2f78905e8ea6d18c07ce6b52 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jul 11 01:04:11 2011 +0500 Display circuit lines appropriately. --- src/gui/connections/circEntry.py | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index b3aa29a..11876f8 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -4,37 +4,39 @@ Connection panel entries for client circuits. import time -from cli.connections import circEntry -from util import gtkTools +from cli.connections import circEntry, entries +from gui.connections import connEntry +from util import gtkTools, uiTools class CircEntry(circEntry.CircEntry): @classmethod def convertToGui(self, instance): instance.__class__ = self -class CircHeaderLine(circEntry.CircHeaderLine): +class CircHeaderLine(circEntry.CircHeaderLine, connEntry.ConnectionLine): @classmethod def convertToGui(self, instance): instance.__class__ = self def getListingRow(self, listingType): - local = "%s:%s" % (self.local.ipAddr, self.local.port) - foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) - timeLabel = "%d s" % (time.time() - self.startTime) + row = connEntry.ConnectionLine.getListingRow(self, listingType) theme = gtkTools.Theme() + return row[:-1] + (theme.colors['active'],) - return (local, foreign, timeLabel, self.baseType, theme.colors['active']) - -class CircLine(circEntry.CircLine): +class CircLine(circEntry.CircLine, connEntry.ConnectionLine): @classmethod def convertToGui(self, instance): instance.__class__ = self def getListingRow(self, listingType): - local = "%s:%s" % (self.local.ipAddr, self.local.port) - foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) - timeLabel = "%d s" % (time.time() - self.startTime) + dst, etc = "", "" + + if listingType == entries.ListingType.IP_ADDRESS: + dst = self.getDestinationLabel(100, includeLocale=True) + etc = self.foreign.getNickname() + + timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) theme = gtkTools.Theme() - return (local, foreign, timeLabel, self.baseType, theme.colors['normal']) + return (dst, etc, timeLabel, self.getType(), theme.colors['insensitive'])

1 0

[arm/master] Derive sticky panel values from CLI HeaderPanel.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 1bd068fab1fae856d7ca64114fcae03c769b9246 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:08:38 2011 +0500 Derive sticky panel values from CLI HeaderPanel. --- src/gui/arm.xml | 47 ------------------- src/gui/controller.py | 5 ++- src/gui/stickyPanel.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 48 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 67409ae..f71d0b7 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -11,53 +11,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">arm</col> - <col id="1" translatable="yes">orthanc (Linux 2.6.35.11-83.fc14)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Tor</col> - <col id="1" translatable="yes">0.2.1.28 (obsolete)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Relaying</col> - <col id="1" translatable="yes">Disabled</col> - <col id="2" translatable="yes">red</col> - </row> - <row> - <col id="0" translatable="yes">Control Port</col> - <col id="1" translatable="yes">9051 (open)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU Tor</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU arm</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Memory</col> - <col id="1" translatable="yes">20 MB (1.0%)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">PID</col> - <col id="1" translatable="yes">3980</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Uptime</col> - <col id="1" translatable="yes">01:01:34</col> - <col id="2" translatable="yes">black</col> - </row> - </data> </object> <object class="GtkTreeStore" id="treestore_conn"> <columns> diff --git a/src/gui/controller.py b/src/gui/controller.py index a69fdef..854e388 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import time from util import log, torTools from connections import connPanel -from gui import logPanel +from gui import logPanel, stickyPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,6 +29,9 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() + self.stickyPanel = stickyPanel.StickyPanel(self.builder) + self.stickyPanel.pack_widgets() + def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py new file mode 100644 index 0000000..89b5485 --- /dev/null +++ b/src/gui/stickyPanel.py @@ -0,0 +1,118 @@ +""" +Sticky panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from TorCtl import TorCtl +from util import connections, sysTools, gtkTools, uiTools, torTools + +class StickyPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + def _fill_entries(self): + self.valsLock.acquire() + + liststore = self.builder.get_object('liststore_sticky') + theme = gtkTools.Theme() + + liststore.clear() + + key = "arm" + value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" + key = "Tor" + value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + includeControlPort = True + key = "Relaying" + 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"] + + dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" + + value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + else: + if self._isTorConnected: + value = "Disabled" + else: + statusTime = torTools.getConn().getStatus()[1] + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" + + value = "%s%s" % ("Tor Disconnected", statusTimeLabel) + includeControlPort = False + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Control Port" + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + authColor = "red" if authType == "open" else "green" + value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) + row = (key, value, theme.colors['active']) + liststore.append(row) + + + if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) + else: memoryLabel = "0" + + if self.vals["tor/startTime"]: + if self.isPaused() or not self._isTorConnected: + uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) + else: + uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) + + key = "CPU" + value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Memory" + value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "PID" + value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Uptime" + value = uptimeLabel + row = (key, value, theme.colors['active']) + liststore.append(row) + + self.valsLock.release() + + return True +

1 0

[arm/master] Display placementLabel instead of timestamp for circuit lines.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 473a6b53d584108492b3a21cc0036117cc02b9b4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 13 14:44:13 2011 +0500 Display placementLabel instead of timestamp for circuit lines. --- src/gui/connections/circEntry.py | 3 +-- src/gui/connections/connPanel.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 11876f8..deb720a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -35,8 +35,7 @@ class CircLine(circEntry.CircLine, connEntry.ConnectionLine): dst = self.getDestinationLabel(100, includeLocale=True) etc = self.foreign.getNickname() - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) theme = gtkTools.Theme() - return (dst, etc, timeLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 3b980e1..e6a7c5b 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -69,8 +69,9 @@ class ConnectionPanel(CliConnectionPanel): cacheKey = calculateCacheKey(line) if self.cache.has_key(cacheKey): - timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cacheKey], 2, timeLabel) + if not isinstance(line, circEntry.CircLine): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break

1 0

[arm/master] Use treestore and group circuit entries by header, cache the model.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 0b58312fe6b543cef4193c7f1cda36e801b5d36e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 8 18:32:56 2011 +0500 Use treestore and group circuit entries by header, cache the model. The treestore is updated only if the (local, foreign) tuple for one of the entries is not found in cache. Otherwise, only the time column is updated. --- src/gui/arm.xml | 4 +- src/gui/connections/connPanel.py | 43 ++++++++++++++++++++++++++++++++----- src/starter.py | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index dca5f33..0aafb28 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -59,7 +59,7 @@ </row> </data> </object> - <object class="GtkListStore" id="liststore_conn"> + <object class="GtkTreeStore" id="treestore_conn"> <columns>  <column type="gchararray"/> @@ -432,7 +432,7 @@ <object class="GtkTreeView" id="treeview_conn"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore_conn</property> + <property name="model">treestore_conn</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> <property name="search_column">0</property> diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index cbabc41..ad57878 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,10 +11,10 @@ from collections import deque import gobject import gtk -from cli.connections import connEntry +from cli.connections import circEntry, connEntry from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel from TorCtl import TorCtl -from util import connections, uiTools, torTools +from util import connections, sysTools, uiTools, torTools REFRESH_RATE = 3 @@ -23,8 +23,12 @@ class ConnectionPanel(CliConnectionPanel): CliConnectionPanel.__init__(self, None) self.builder = builder + self.cache = {} - self.resolver = connections.getResolver('tor') + conn = torTools.getConn() + torPid = conn.getMyPid() + torCmdName = sysTools.getProcessName(torPid, "tor") + connections.getResolver(torCmdName, torPid, "tor") gobject.timeout_add(3000, self._fill_entries) @@ -37,8 +41,25 @@ class ConnectionPanel(CliConnectionPanel): label = self.builder.get_object('label_conn_top') label.set_text(self._title) - liststore = self.builder.get_object('liststore_conn') - liststore.clear() + treestore = self.builder.get_object('treestore_conn') + + # first pass checks whether we have enough entries cached to not update the treeview + for (index, line) in enumerate(self._entryLines): + local = "%s:%s" % (line.local.ipAddr, line.local.port) + foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + cachekey = (local, foreign) + if self.cache.has_key(cachekey): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cachekey], 2, timeLabel) + else: + break + + if index == len(self._entryLines) - 1: + return + + treestore.clear() + + headeriter = None for line in self._entryLines: if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): @@ -48,7 +69,17 @@ class ConnectionPanel(CliConnectionPanel): foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) timeLabel = "%d s" % (time.time() - line.startTime) row = (local, foreign, timeLabel, line.baseType, 'black') - liststore.append(row) + + if isinstance(line, circEntry.CircHeaderLine): + currentiter = treestore.append(None, row) + headeriter = currentiter + elif isinstance(line, circEntry.CircLine): + currentiter = treestore.append(headeriter, row) + else: + currentiter = treestore.append(None, row) + + cachekey = (local, foreign) + self.cache[cachekey] = currentiter self.valsLock.release() diff --git a/src/starter.py b/src/starter.py index 1b6049a..5518caa 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = False +INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None,

1 0

[arm/master] Return True to keep timeout going.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 9e020cb8e12d682ca74368bda582655bd19957b2 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 17:00:51 2011 +0500 Return True to keep timeout going. --- src/gui/connections/connPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 9df5142..4f89b30 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -59,7 +59,7 @@ class ConnectionPanel(CliConnectionPanel): index = index + 1 if index == len(self._entryLines): - return + return True treestore.clear()

1 0

[arm/master] Use explicit counting to remove dependency on scoping rules.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit f213ff7a9ecefe197faa91b980aa8a67819bdf4b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 16:55:24 2011 +0500 Use explicit counting to remove dependency on scoping rules. --- src/gui/connections/connPanel.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index ad57878..9df5142 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -44,9 +44,11 @@ class ConnectionPanel(CliConnectionPanel): treestore = self.builder.get_object('treestore_conn') # first pass checks whether we have enough entries cached to not update the treeview - for (index, line) in enumerate(self._entryLines): + index = 0 + for line in self._entryLines: local = "%s:%s" % (line.local.ipAddr, line.local.port) foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + cachekey = (local, foreign) if self.cache.has_key(cachekey): timeLabel = "%d s" % (time.time() - line.startTime) @@ -54,7 +56,9 @@ class ConnectionPanel(CliConnectionPanel): else: break - if index == len(self._entryLines) - 1: + index = index + 1 + + if index == len(self._entryLines): return treestore.clear()

1 0

[arm/master] Seperate cache entries for header and circ lines.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 16358dd0ab9c413c989adfe7b35dbae5c4b1abc4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 17:09:49 2011 +0500 Seperate cache entries for header and circ lines. --- src/gui/connections/connPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 4f89b30..29f18b7 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -49,7 +49,7 @@ class ConnectionPanel(CliConnectionPanel): local = "%s:%s" % (line.local.ipAddr, line.local.port) foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) - cachekey = (local, foreign) + cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) if self.cache.has_key(cachekey): timeLabel = "%d s" % (time.time() - line.startTime) treestore.set_value(self.cache[cachekey], 2, timeLabel) @@ -82,7 +82,7 @@ class ConnectionPanel(CliConnectionPanel): else: currentiter = treestore.append(None, row) - cachekey = (local, foreign) + cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) self.cache[cachekey] = currentiter self.valsLock.release()

1 0

[arm/master] Remove debug settings for log panel.
by atagar＠torproject.org 14 Jul '11

14 Jul '11

commit 06821d8b3764e78b930777573088e420cb7cb9e3 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jul 4 16:38:38 2011 +0500 Remove debug settings for log panel. --- src/gui/logPanel.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 4e95db4..20331ad 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -21,7 +21,7 @@ from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", log.WARN: "#AB7814", log.ERR: "#EC131F"} -STARTUP_EVENTS = 'A' +STARTUP_EVENTS = 'N3' REFRESH_RATE = 3 class LogPanel: @@ -96,6 +96,9 @@ class LogPanel: self._lastUpdate = time.time() def register_event(self, event): + if not event.type in self.loggedEvents: + return + self.lock.acquire() try: self.msgLog.appendleft(event)

1 0