- tor-commits - lists.torproject.org

[arm/release] Connections panel cleanup.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 68160bc14ee145c3ad736b2a0c33c6dc40ee1829 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 21 04:09:16 2011 +0500 Connections panel cleanup. The older method relied on changing __class__ attributes of CLI entries in order to add get_listing_row() methods to them. Changing __class__ directly is a bad practice, hence GUI entries now *wrap* CLI entries instead of inherting them. Summary: * Each CLI entry instance is mapped via cache key to a GUI entry instance. * The GUI entry instance is stored inside the treestore rows. * After every timeout, the entry lines returned by the CLI conn panel are mapped to GUI instances (using cache, if applicable) and the resulting GUI entry line is searched in treestore. If one isn't found, the whole treestore is cleared and refreshed. The whole treestore refreshing still doesn't sound very nice. Since if a circuit is expanded by clicking the drop-down, a new connection taking place would close the expander. One possible approach of addressing the refresh would be to: * Add new entries to treestore when they aren't found in the latter * Delete old entries from treestore when they aren't found in CLI panel This should theoretically produce 1-1 mapping between CLI panel's entryLines and the treestore. --- src/gui/arm.xml | 30 +++++++------ src/gui/connections/circEntry.py | 31 ++++++-------- src/gui/connections/connEntry.py | 42 +++++++++---------- src/gui/connections/connPanel.py | 87 +++++++++++++++++++++++++------------- 4 files changed, 107 insertions(+), 83 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 6c206fd..3b28423 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -12,20 +12,6 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkTreeStore" id="treestore_conn"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="liststore_log"> <columns>  @@ -54,6 +40,22 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkTreeStore" id="treestore_conn"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="GObject"/> + </columns> + </object> <object class="GtkWindow" id="window_main"> <property name="title" translatable="yes">garm</property> <property name="default_width">640</property> diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index abbb631..04d3208 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -4,38 +4,33 @@ Connection panel entries for client circuits. import time -from cli.connections import circEntry, entries +from cli.connections import entries from gui.connections import connEntry from util import gtkTools, uiTools -class CircEntry(circEntry.CircEntry): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self - -class CircHeaderLine(circEntry.CircHeaderLine, connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self +class CircHeaderLine(connEntry.ConnectionLine): + def __init__(self, cliLine): + connEntry.ConnectionLine.__init__(self, cliLine) def get_listing_row(self, listingType): row = connEntry.ConnectionLine.get_listing_row(self, listingType) theme = gtkTools.Theme() - return row[:-1] + (theme.colors['active'],) + return row[:-2] + (theme.colors['active'], self) + +class CircLine(connEntry.ConnectionLine): + def __init__(self, cliLine): + connEntry.ConnectionLine.__init__(self, cliLine) -class CircLine(circEntry.CircLine, connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self + self.parentIter = None def get_listing_row(self, listingType): dst, etc = "", "" if listingType == entries.ListingType.IP_ADDRESS: - dst = self.getDestinationLabel(100, includeLocale=True) - etc = self.foreign.getNickname() + dst = self.cliLine.getDestinationLabel(100, includeLocale=True) + etc = self.cliLine.foreign.getNickname() theme = gtkTools.Theme() - return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.cliLine.placementLabel, self.cliLine.getType(), theme.colors['insensitive'], self) diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index f8bcc84..6f4baed 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -5,36 +5,34 @@ Connection panel entries related to actual connections to or from the system import time -from cli.connections import connEntry, entries +import gobject + +from cli.connections import entries from cli.connections.connEntry import Category, CONFIG from util import gtkTools, torTools, uiTools -class ConnectionEntry(connEntry.ConnectionEntry): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self +class ConnectionLine(gobject.GObject): + def __init__(self, cliLine): + gobject.GObject.__init__(self) -class ConnectionLine(connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self + self.cliLine = cliLine def get_listing_row(self, listingType): conn = torTools.getConn() - myType = self.getType() - dstAddress = self.getDestinationLabel(26, includeLocale = True) - localPort = ":%s" % self.local.getPort() if self.includePort else "" + myType = self.cliLine.getType() + dstAddress = self.cliLine.getDestinationLabel(26, includeLocale = True) + localPort = ":%s" % self.cliLine.local.getPort() if self.cliLine.includePort else "" src, dst, etc = "", "", "" if listingType == entries.ListingType.IP_ADDRESS: - myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) - addrDiffer = myExternalIpAddr != self.local.getIpAddr() + myExternalIpAddr = conn.getInfo("address", self.cliLine.local.getIpAddr()) + addrDiffer = myExternalIpAddr != self.cliLine.local.getIpAddr() isExpansionType = not myType in (Category.SOCKS, Category.HIDDEN, Category.CONTROL) if isExpansionType: srcAddress = myExternalIpAddr + localPort - else: srcAddress = self.local.getIpAddr() + localPort + else: srcAddress = self.cliLine.local.getIpAddr() + localPort if myType in (Category.SOCKS, Category.CONTROL): src = dstAddress @@ -43,19 +41,19 @@ class ConnectionLine(connEntry.ConnectionLine): src = srcAddress dst = dstAddress - if addrDiffer and isExpansionType and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: - internalAddress = self.local.getIpAddr() + localPort + if addrDiffer and isExpansionType and self.cliLine.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: + internalAddress = self.cliLine.local.getIpAddr() + localPort if myType == Category.INBOUND: (src, dst) = (src, internalAddress) else: (src, dst) = (internalAddress, src) - etc = self.getEtcContent(100, listingType) + etc = self.cliLine.getEtcContent(100, listingType) else: - src = "%s:%s" % (self.local.ipAddr, self.local.port) - dst = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + src = "%s:%s" % (self.cliLine.local.ipAddr, self.cliLine.local.port) + dst = "%s:%s" % (self.cliLine.foreign.ipAddr, self.cliLine.foreign.port) - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) + timeLabel = uiTools.getTimeLabel(time.time() - self.cliLine.startTime) theme = gtkTools.Theme() - return (src, dst, timeLabel, self.getType(), theme.colors['insensitive']) + return (src, dst, timeLabel, self.cliLine.getType(), theme.colors['insensitive'], self) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 4ab0ed8..55669f9 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -17,37 +17,48 @@ from gui.connections import circEntry, connEntry from util import connections, sysTools, uiTools, torTools from TorCtl import TorCtl -REFRESH_RATE = 3 - -def convert_to_gui(instance): - cliToGuiMap = [ (cliCircEntry.CircEntry, circEntry.CircEntry), - (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), +class GuiConverter: + cliToGuiMap = [ (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), (cliCircEntry.CircLine, circEntry.CircLine), - (cliConnEntry.ConnectionEntry, connEntry.ConnectionEntry), (cliConnEntry.ConnectionLine, connEntry.ConnectionLine)] - for (cliClass, guiClass) in cliToGuiMap: - if isinstance(instance, cliClass): - guiClass.convert_to_gui(instance) - break + def __init__(self): + self._cache = {} + + def __call__(self, cliInstance): + cacheKey = self._calculate_cache_key(cliInstance) + + if self._cache.has_key(cacheKey): + return self._cache[cacheKey] + + line = None + + for (cliClass, guiClass) in GuiConverter.cliToGuiMap: + if isinstance(cliInstance, cliClass): + line = guiClass(cliInstance) + self._cache[cacheKey] = line + break + + return line -def calculate_cache_key(entryLine): - local = (entryLine.local.ipAddr, entryLine.local.port) - foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) + def _calculate_cache_key(self, entryLine): + local = (entryLine.local.ipAddr, entryLine.local.port) + foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) - return (entryLine.__class__, local, foreign) + return (entryLine.__class__, local, foreign) + +convert_to_gui = GuiConverter() class ConnectionPanel(CliConnectionPanel): def __init__(self, builder): CliConnectionPanel.__init__(self, None) self.builder = builder - self.cache = {} conn = torTools.getConn() torPid = conn.getMyPid() - torCmdName = sysTools.getProcessName(torPid, "tor") - connections.getResolver(torCmdName, torPid, "tor") + torCmdName = sysTools.getProcessName(torPid, 'tor') + connections.getResolver(torCmdName, torPid, 'tor') gobject.idle_add(self._fill_entries) gobject.timeout_add(3000, self._timeout_fill_entries) @@ -70,14 +81,15 @@ class ConnectionPanel(CliConnectionPanel): # first pass checks whether we have enough entries cached to not update the treeview index = 0 - for line in self._entryLines: - convert_to_gui(line) - cacheKey = calculate_cache_key(line) + for cliLine in self._entryLines: + line = convert_to_gui(cliLine) + + treeIter = self._treestore_get_iter(line) - if self.cache.has_key(cacheKey): + if treeIter: if not isinstance(line, circEntry.CircLine): - timeLabel = "%d s" % (time.time() - line.startTime) - treeStore.set_value(self.cache[cacheKey], 2, timeLabel) + timeLabel = "%d s" % (time.time() - line.cliLine.startTime) + treeStore.set_value(treeIter, 2, timeLabel) else: break @@ -91,10 +103,10 @@ class ConnectionPanel(CliConnectionPanel): treeStore.clear() headerIter = None - for line in self._entryLines: - convert_to_gui(line) + for cliLine in self._entryLines: + line = convert_to_gui(cliLine) - if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): + if isinstance(line, connEntry.ConnectionLine) and line.cliLine.isUnresolvedApp(): self._resolveApps() row = line.get_listing_row(self._listingType) @@ -107,8 +119,25 @@ class ConnectionPanel(CliConnectionPanel): else: currentIter = treeStore.append(None, row) - cacheKey = calculate_cache_key(line) - self.cache[cacheKey] = currentIter - self.valsLock.release() + def _treestore_get_iter(self, line): + def match_func(model, treeIter, data): + column, key = data + value = model.get_value(treeIter, column) + return value == key + + def search(model, treeIter, func, data): + while treeIter: + if func(model, treeIter, data): + return treeIter + result = search(model, model.iter_children(treeIter), func, data) + if result: return result + treeIter = model.iter_next(treeIter) + return None + + treeStore = self.builder.get_object('treestore_conn') + matchIter = search(treeStore, treeStore.iter_children(None), match_func, (5, line)) + + return matchIter +

1 0

[arm/release] Initial commit for config panel.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 86944555219eaa43bc7d14aa87082ed831877997 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 20 17:04:57 2011 +0500 Initial commit for config panel. List values and show desc in the text view. --- src/gui/arm.xml | 155 ++++++++++++++++++++++++++++++++++++------------ src/gui/configPanel.py | 59 ++++++++++++++++++ src/gui/controller.py | 3 +- 3 files changed, 178 insertions(+), 39 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 2b9ad95..6c206fd 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -26,56 +26,32 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore_config"> + <object class="GtkListStore" id="liststore_log"> <columns> -  +  + <column type="gulong"/> +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/>  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">BandwidthRate</col> - <col id="1" translatable="yes">5242880</col> - <col id="2" translatable="yes">Average bandwidth usage limit</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">BandwidthBurst</col> - <col id="1" translatable="yes">10485760</col> - <col id="2" translatable="yes">Maximum bandwidth usage limit</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">RelayBandwidthBurst</col> - <col id="1" translatable="yes">0 B</col> - <col id="2" translatable="yes">Maximum bandwidth usage limit for relaying</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">ControlPort</col> - <col id="1" translatable="yes">9051</col> - <col id="2" translatable="yes">Port providing access to tor controllers (arm, vidalia, etc)</col> - <col id="3" translatable="yes">#368918</col> - </row> - </data> </object> - <object class="GtkListStore" id="liststore_log"> + <object class="GtkListStore" id="liststore_config"> <columns> -  - <column type="gulong"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gchararray"/> </columns> </object> <object class="GtkWindow" id="window_main"> @@ -410,6 +386,106 @@ </packing> </child> <child> + <object class="GtkVPaned" id="vpaned_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_config_desc"> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTextView" id="textview_config_desc"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer_config_desc</property> + </object> + </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="treeview_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_config</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_option"> + <property name="title">Option</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_option"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_value"> + <property name="title">Value</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_summary"> + <property name="title">Description</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_summary"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_config"> + <property name="visible">True</property> + <property name="label" translatable="yes">Configuration</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> <object class="GtkScrolledWindow" id="scrolledwindow_general"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -451,7 +527,7 @@ </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child type="tab"> @@ -460,7 +536,7 @@ <property name="label" translatable="yes">General</property> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> <property name="tab_fill">False</property> </packing> </child> @@ -1264,4 +1340,7 @@ Damian Johnson <atagar1(a)gmail.com></property> <property name="stock_id">gtk-about</property> <signal name="activate" handler="on_action_about_activate"/> </object> + <object class="GtkTextBuffer" id="textbuffer_config_desc"> + <property name="text" translatable="yes">Select a configuration option to see its description.</property> + </object> </interface> diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py new file mode 100644 index 0000000..4001058 --- /dev/null +++ b/src/gui/configPanel.py @@ -0,0 +1,59 @@ +""" +Configuration panel. +""" + +import random +import sys +import time + +import gobject +import gtk + +from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) +from util import connections, gtkTools, sysTools, torTools, uiTools +from TorCtl import TorCtl + +class ConfigPanel(CliConfigPanel): + def __init__(self, builder): + CliConfigPanel.__init__(self, None, State.TOR) + + self.builder = builder + + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) + + def pack_widgets(self): + treeView = self.builder.get_object('treeview_config') + treeView.connect('cursor-changed', self.on_treeview_config_cursor_changed) + + def _timeout_fill_entries(self): + self._fill_entries() + + return True + + def _fill_entries(self): + self.valsLock.acquire() + + listStore = self.builder.get_object('liststore_config') + listStore.clear() + + for entry in self._getConfigOptions(): + option = entry.get(Field.OPTION) + value = entry.get(Field.VALUE) + summary = entry.get(Field.SUMMARY) + desc = entry.get(Field.DESCRIPTION) + row = (option, value, summary, '#368918', desc) + listStore.append(row) + + self.valsLock.release() + + def on_treeview_config_cursor_changed(self, widget, data=None): + treeSelection = widget.get_selection() + + (model, iter) = treeSelection.get_selected() + desc = model.get_value(iter, 4) + + textBuffer = self.builder.get_object('textbuffer_config_desc') + textBuffer.set_text(desc) + print desc + diff --git a/src/gui/controller.py b/src/gui/controller.py index 19b9513..52bb2c6 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import gtk from connections import connPanel from gui.graphing import bandwidthStats -from gui import generalPanel, logPanel +from gui import configPanel, generalPanel, logPanel from util import log, torTools gobject.threads_init() @@ -29,6 +29,7 @@ class GuiController: panelClasses = (logPanel.LogPanel, bandwidthStats.BandwidthStats, connPanel.ConnectionPanel, + configPanel.ConfigPanel, generalPanel.GeneralPanel) self.panels = {}

1 0

[arm/release] Decouple list wrapper class for use by other panels.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 2079780c2c6b90022dda02fac36059476f69eec5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 22 04:08:31 2011 +0500 Decouple list wrapper class for use by other panels. --- src/gui/configPanel.py | 40 +--------------------------------- src/util/gtkTools.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 38 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index ff8ec86..46f9aa7 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,36 +13,8 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -class ConfContents(object): - def __init__(self, container, model): - self.container = [] - self.model = model - - for entry in container: - self.append(entry) - - def append(self, entry): - self.container.append(entry) - gobject.idle_add(self.__model_append, entry) - - def __str__(self): - return str(self.container) - - def __repr__(self): - return str(self.container) - - def __getitem__(self, key): - return self.container[key] - - def __setitem__(self, key, entry): - self.container[key] = entry - - gobject.idle_add(self.__model_set, key, entry) - - def __len__(self): - return len(self.container) - - def __create_row_from_entry(self, entry): +class ConfContents(gtkTools.ListWrapper): + def _create_row_from_entry(self, entry): option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -51,14 +23,6 @@ class ConfContents(object): return row - def __model_append(self, entry): - row = self.__create_row_from_entry(entry) - self.model.append(row) - - def __model_set(self, key, entry): - row = self.__create_row_from_entry(entry) - self.model[key] = row - class ConfigPanel(CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 083fb5d..2d00621 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -2,6 +2,7 @@ Helper module for getting Gtk+ theme colors. """ +import gobject import gtk COLOR_MAP = { @@ -19,3 +20,56 @@ class Theme: for (key, (prop, state)) in COLOR_MAP.items(): self.colors[key] = getattr(widget.style, prop)[state] +class ListWrapper(object): + def __init__(self, container, model): + self.container = [] + self.model = model + + for entry in container: + self.append(entry) + + def append(self, entry): + self.container.append(entry) + gobject.idle_add(self.__model_append, entry) + + def __str__(self): + return str(self.container) + + def __repr__(self): + return str(self.container) + + def __len__(self): + return len(self.container) + + def __iadd__(self, other): + for entry in other: + self.append(entry) + + def __delitem__(self, key): + del self.container[key] + + gobject.idle_add(self.__model_del, key) + + def __getitem__(self, key): + return self.container[key] + + def __setitem__(self, key, entry): + self.container[key] = entry + + gobject.idle_add(self.__model_set, key, entry) + + def __model_append(self, entry): + row = self._create_row_from_entry(entry) + self.model.append(row) + + def __model_del(self, key): + treeIter = self.model.get_iter(key) + self.model.remove(treeIter) + + def __model_set(self, key, entry): + row = self._create_row_from_entry(entry) + self.model[key] = row + + def _create_row_from_entry(self, entry): + raise NotImplementedError("Subclass must implement abstract method") +

1 0

[arm/release] Renamed graphStats to graphPanel for consistency (with cli).
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 2192eab911b7b521b790a5c444c17422f1714d59 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 04:17:17 2011 +0500 Renamed graphStats to graphPanel for consistency (with cli). --- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 6 +- src/gui/graphing/graphPanel.py | 142 ++++++++++++++++++++++++++++++++++++ src/gui/graphing/graphStats.py | 142 ------------------------------------ 4 files changed, 146 insertions(+), 146 deletions(-) diff --git a/src/gui/graphing/__init__.py b/src/gui/graphing/__init__.py index acc8645..06d08ea 100644 --- a/src/gui/graphing/__init__.py +++ b/src/gui/graphing/__init__.py @@ -2,5 +2,5 @@ Graphs. """ -__all__ = ["graphStats", "bandwidthStats"] +__all__ = ["graphPanel", "bandwidthStats"] diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 04dfda8..f4aa490 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -9,12 +9,12 @@ import gtk from TorCtl import TorCtl from starter import CONFIG -from gui.graphing import graphStats +from gui.graphing import graphPanel from util import uiTools, torTools -class BandwidthStats(graphStats.GraphStats): +class BandwidthStats(graphPanel.GraphPanel): def __init__(self, builder): - graphStats.GraphStats.__init__(self, builder) + graphPanel.GraphPanel.__init__(self, builder) conn = torTools.getConn() if not conn.isAlive(): diff --git a/src/gui/graphing/graphPanel.py b/src/gui/graphing/graphPanel.py new file mode 100644 index 0000000..16370b4 --- /dev/null +++ b/src/gui/graphing/graphPanel.py @@ -0,0 +1,142 @@ +""" +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 gtkTools, uiTools, torTools + +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + +GRAPH_INTERVAL = 30 + +class GraphPanel(TorCtl.PostEventListener): + def __init__(self, builder): + TorCtl.PostEventListener.__init__(self) + + self.builder = builder + + self.graphs = { 'primary' : None, 'secondary' : None } + self.data = { + 'primary' : deque([0.0] * GRAPH_INTERVAL), + 'secondary' : deque([0.0] * GRAPH_INTERVAL)} + + self.total = {'primary': 0.0, 'secondary' : 0.0} + self.ticks = {'primary': 0, 'secondary' : 0} + + def pack_widgets(self): + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + gobject.timeout_add(1000, self.draw_graph, 'primary') + gobject.timeout_add(1000, self.draw_graph, 'secondary') + gobject.timeout_add(1000, self.update_labels, 'primary') + gobject.timeout_add(1000, self.update_labels, 'secondary') + + def _pack_graph_widget(self, name): + graph = CaGraph() + graph.set_size_request(200, 200) + + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + yaxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + 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.5) } + + 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) + + self.graphs[name] = graph + + return graph + + def get_graph_data(self, name): + packed_data = [] + + for (index, value) in enumerate(self.data[name]): + packed_data.append((index, value)) + + return packed_data + + def is_graph_data_zero(self, name): + data = self.data[name] + return len(data) == map(int, data).count(0) + + def draw_graph(self, name): + graph = self.graphs[name] + data = self.get_graph_data(name) + + graph.seriess[0].data = data + if not self.is_graph_data_zero(name): + + for (index, axis) in enumerate(graph.axiss): + if axis.type != 'xaxis': + graph.auto_set_yrange(index) + + graph.queue_draw() + + return True + + def update_labels(self, name): + avg = 0 + + try: + avg = self.total[name] / float(self.ticks[name]) + except ZeroDivisionError: + pass + + msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), + uiTools.getSizeLabel(self.total[name], 2)) + label = self.builder.get_object('label_graph_%s_bottom' % name) + label.set_text(msg) + + return True + + def update_header(self, name, msg): + label = self.builder.get_object('label_graph_%s_top' % name) + label.set_text(msg) + + def _processEvent(self, primary, secondary): + values = {'primary' : primary, 'secondary' : secondary} + + for name in ('primary', 'secondary'): + # right shift and store kbytes in left-most location + self.data[name].rotate(1) + self.data[name][0] = values[name] / 1024 + + self.total[name] = self.total[name] + values[name] + + if values[name] > 0: + self.ticks[name] = self.ticks[name] + 1 + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py deleted file mode 100644 index c7d24bb..0000000 --- a/src/gui/graphing/graphStats.py +++ /dev/null @@ -1,142 +0,0 @@ -""" -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 gtkTools, uiTools, torTools - -from cagraph.ca_graph import CaGraph -from cagraph.axis.xaxis import CaGraphXAxis -from cagraph.axis.yaxis import CaGraphYAxis -from cagraph.ca_graph_grid import CaGraphGrid -from cagraph.series.area import CaGraphSeriesArea - -GRAPH_INTERVAL = 30 - -class GraphStats(TorCtl.PostEventListener): - def __init__(self, builder): - TorCtl.PostEventListener.__init__(self) - - self.builder = builder - - self.graphs = { 'primary' : None, 'secondary' : None } - self.data = { - 'primary' : deque([0.0] * GRAPH_INTERVAL), - 'secondary' : deque([0.0] * GRAPH_INTERVAL)} - - self.total = {'primary': 0.0, 'secondary' : 0.0} - self.ticks = {'primary': 0, 'secondary' : 0} - - def pack_widgets(self): - self._pack_graph_widget('primary') - self._pack_graph_widget('secondary') - - gobject.timeout_add(1000, self.draw_graph, 'primary') - gobject.timeout_add(1000, self.draw_graph, 'secondary') - gobject.timeout_add(1000, self.update_labels, 'primary') - gobject.timeout_add(1000, self.update_labels, 'secondary') - - def _pack_graph_widget(self, name): - graph = CaGraph() - graph.set_size_request(200, 200) - - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - yaxis.axis_style.label_color = (0, 0, 0) - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - 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.5) } - - 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) - - self.graphs[name] = graph - - return graph - - def get_graph_data(self, name): - packed_data = [] - - for (index, value) in enumerate(self.data[name]): - packed_data.append((index, value)) - - return packed_data - - def is_graph_data_zero(self, name): - data = self.data[name] - return len(data) == map(int, data).count(0) - - def draw_graph(self, name): - graph = self.graphs[name] - data = self.get_graph_data(name) - - graph.seriess[0].data = data - if not self.is_graph_data_zero(name): - - for (index, axis) in enumerate(graph.axiss): - if axis.type != 'xaxis': - graph.auto_set_yrange(index) - - graph.queue_draw() - - return True - - def update_labels(self, name): - avg = 0 - - try: - avg = self.total[name] / float(self.ticks[name]) - except ZeroDivisionError: - pass - - msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), - uiTools.getSizeLabel(self.total[name], 2)) - label = self.builder.get_object('label_graph_%s_bottom' % name) - label.set_text(msg) - - return True - - def update_header(self, name, msg): - label = self.builder.get_object('label_graph_%s_top' % name) - label.set_text(msg) - - def _processEvent(self, primary, secondary): - values = {'primary' : primary, 'secondary' : secondary} - - for name in ('primary', 'secondary'): - # right shift and store kbytes in left-most location - self.data[name].rotate(1) - self.data[name][0] = values[name] / 1024 - - self.total[name] = self.total[name] + values[name] - - if values[name] > 0: - self.ticks[name] = self.ticks[name] + 1 -

1 0

[arm/release] Use dict of panels to reduce statement duplication.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit d6fae9bf53f39279f56b968ee8a71de15a129ada Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 05:05:56 2011 +0500 Use dict of panels to reduce statement duplication. --- src/gui/arm.xml | 2 +- src/gui/controller.py | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 56c9620..56112c9 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -79,7 +79,7 @@ </columns> </object> <object class="GtkWindow" id="window_main"> - <property name="title" translatable="yes">arm</property> + <property name="title" translatable="yes">garm</property> <property name="default_width">640</property> <property name="default_height">480</property> <signal name="delete_event" handler="on_window_main_delete_event"/> diff --git a/src/gui/controller.py b/src/gui/controller.py index e6ffcbd..7172aa7 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -19,17 +19,15 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - self.logPanel = logPanel.LogPanel(self.builder) - self.logPanel.pack_widgets() - - self.bwStats = bandwidthStats.BandwidthStats(self.builder) - self.bwStats.pack_widgets() - - self.connPanel = connPanel.ConnectionPanel(self.builder) - self.connPanel.pack_widgets() - - self.generalPanel = generalPanel.GeneralPanel(self.builder) - self.generalPanel.pack_widgets() + self.panels = { + logPanel.LogPanel : None, + bandwidthStats.BandwidthStats : None, + connPanel.ConnectionPanel : None, + generalPanel.GeneralPanel : None } + + for panel in self.panels.keys(): + self.panels[panel] = panel(self.builder) + self.panels[panel].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/release] Minor formatting changes.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 14497c4ce277b370056b8fed59db45e3d175309f Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 04:57:43 2011 +0500 Minor formatting changes. For consistency, use camelCase for all variables and underscores for method names. Use PEP 8 guidelines for specifying imports. --- src/gui/connections/circEntry.py | 12 ++-- src/gui/connections/connEntry.py | 10 ++-- src/gui/connections/connPanel.py | 40 ++++++++-------- src/gui/controller.py | 13 ++--- src/gui/generalPanel.py | 25 +++++----- src/gui/graphing/bandwidthStats.py | 8 ++-- src/gui/graphing/graphPanel.py | 90 ++++++++++++++++++----------------- src/gui/logPanel.py | 26 +++++----- src/starter.py | 2 +- 9 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index deb720a..abbb631 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -10,25 +10,25 @@ from util import gtkTools, uiTools class CircEntry(circEntry.CircEntry): @classmethod - def convertToGui(self, instance): + def convert_to_gui(self, instance): instance.__class__ = self class CircHeaderLine(circEntry.CircHeaderLine, connEntry.ConnectionLine): @classmethod - def convertToGui(self, instance): + def convert_to_gui(self, instance): instance.__class__ = self - def getListingRow(self, listingType): - row = connEntry.ConnectionLine.getListingRow(self, listingType) + def get_listing_row(self, listingType): + row = connEntry.ConnectionLine.get_listing_row(self, listingType) theme = gtkTools.Theme() return row[:-1] + (theme.colors['active'],) class CircLine(circEntry.CircLine, connEntry.ConnectionLine): @classmethod - def convertToGui(self, instance): + def convert_to_gui(self, instance): instance.__class__ = self - def getListingRow(self, listingType): + def get_listing_row(self, listingType): dst, etc = "", "" if listingType == entries.ListingType.IP_ADDRESS: diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index e7e666b..f8bcc84 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -6,20 +6,20 @@ Connection panel entries related to actual connections to or from the system import time from cli.connections import connEntry, entries -from cli.connections.connEntry import CONFIG, Category -from util import gtkTools, uiTools, torTools +from cli.connections.connEntry import Category, CONFIG +from util import gtkTools, torTools, uiTools class ConnectionEntry(connEntry.ConnectionEntry): @classmethod - def convertToGui(self, instance): + def convert_to_gui(self, instance): instance.__class__ = self class ConnectionLine(connEntry.ConnectionLine): @classmethod - def convertToGui(self, instance): + def convert_to_gui(self, instance): instance.__class__ = self - def getListingRow(self, listingType): + def get_listing_row(self, listingType): conn = torTools.getConn() myType = self.getType() dstAddress = self.getDestinationLabel(26, includeLocale = True) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index af9bf06..4ab0ed8 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -14,12 +14,12 @@ import gtk from cli.connections import (circEntry as cliCircEntry, connEntry as cliConnEntry) from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel from gui.connections import circEntry, connEntry -from TorCtl import TorCtl from util import connections, sysTools, uiTools, torTools +from TorCtl import TorCtl REFRESH_RATE = 3 -def convertToGui(instance): +def convert_to_gui(instance): cliToGuiMap = [ (cliCircEntry.CircEntry, circEntry.CircEntry), (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), (cliCircEntry.CircLine, circEntry.CircLine), @@ -28,10 +28,10 @@ def convertToGui(instance): for (cliClass, guiClass) in cliToGuiMap: if isinstance(instance, cliClass): - guiClass.convertToGui(instance) + guiClass.convert_to_gui(instance) break -def calculateCacheKey(entryLine): +def calculate_cache_key(entryLine): local = (entryLine.local.ipAddr, entryLine.local.port) foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) @@ -53,7 +53,7 @@ class ConnectionPanel(CliConnectionPanel): gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): - pass + self.start() def _timeout_fill_entries(self): self._fill_entries() @@ -66,18 +66,18 @@ class ConnectionPanel(CliConnectionPanel): label = self.builder.get_object('label_conn_top') label.set_text(self._title) - treestore = self.builder.get_object('treestore_conn') + treeStore = self.builder.get_object('treestore_conn') # first pass checks whether we have enough entries cached to not update the treeview index = 0 for line in self._entryLines: - convertToGui(line) - cacheKey = calculateCacheKey(line) + convert_to_gui(line) + cacheKey = calculate_cache_key(line) if self.cache.has_key(cacheKey): if not isinstance(line, circEntry.CircLine): timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cacheKey], 2, timeLabel) + treeStore.set_value(self.cache[cacheKey], 2, timeLabel) else: break @@ -87,28 +87,28 @@ class ConnectionPanel(CliConnectionPanel): self.valsLock.release() return True - # one of the entries was not found in cache, clear and repopulate the treestore - treestore.clear() - headeriter = None + # one of the entries was not found in cache, clear and repopulate the treeStore + treeStore.clear() + headerIter = None for line in self._entryLines: - convertToGui(line) + convert_to_gui(line) if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): self._resolveApps() - row = line.getListingRow(self._listingType) + row = line.get_listing_row(self._listingType) if isinstance(line, circEntry.CircHeaderLine): - currentiter = treestore.append(None, row) - headeriter = currentiter + currentIter = treeStore.append(None, row) + headerIter = currentIter elif isinstance(line, circEntry.CircLine): - currentiter = treestore.append(headeriter, row) + currentIter = treeStore.append(headerIter, row) else: - currentiter = treestore.append(None, row) + currentIter = treeStore.append(None, row) - cacheKey = calculateCacheKey(line) - self.cache[cacheKey] = currentiter + cacheKey = calculate_cache_key(line) + self.cache[cacheKey] = currentIter self.valsLock.release() diff --git a/src/gui/controller.py b/src/gui/controller.py index 5736def..e6ffcbd 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,13 +1,13 @@ -import gobject -import gtk - import thread import time -from util import log, torTools +import gobject +import gtk + from connections import connPanel -from gui import logPanel, generalPanel from gui.graphing import bandwidthStats +from gui import generalPanel, logPanel +from util import log, torTools gobject.threads_init() @@ -27,7 +27,6 @@ class GuiController: self.connPanel = connPanel.ConnectionPanel(self.builder) self.connPanel.pack_widgets() - self.connPanel.start() self.generalPanel = generalPanel.GeneralPanel(self.builder) self.generalPanel.pack_widgets() @@ -52,7 +51,7 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() -def startGui(): +def start_gui(): controller = GuiController() controller.run() diff --git a/src/gui/generalPanel.py b/src/gui/generalPanel.py index 1f72b49..be84d65 100644 --- a/src/gui/generalPanel.py +++ b/src/gui/generalPanel.py @@ -12,8 +12,8 @@ import gobject import gtk from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -from util import connections, sysTools, gtkTools, uiTools, torTools class GeneralPanel(CliHeaderPanel): def __init__(self, builder): @@ -27,7 +27,7 @@ class GeneralPanel(CliHeaderPanel): gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): - pass + return def _timeout_fill_entries(self): self._fill_entries() @@ -37,22 +37,22 @@ class GeneralPanel(CliHeaderPanel): def _fill_entries(self): self.valsLock.acquire() - liststore = self.builder.get_object('liststore_general') + listStore = self.builder.get_object('liststore_general') theme = gtkTools.Theme() - liststore.clear() + 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) + 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 (<span foreground=\"%s\">%s</span>)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) includeControlPort = True key = "Relaying" @@ -77,7 +77,7 @@ class GeneralPanel(CliHeaderPanel): value = "%s%s" % ("Tor Disconnected", statusTimeLabel) includeControlPort = False row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) key = "Control Port" if includeControlPort: @@ -88,8 +88,7 @@ class GeneralPanel(CliHeaderPanel): authColor = "red" if authType == "open" else "green" value = "%s (<span foreground=\"%s\">%s</span>)" % (self.vals['tor/controlPort'], authColor, authType) row = (key, value, theme.colors['active']) - liststore.append(row) - + listStore.append(row) if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) else: memoryLabel = "0" @@ -104,22 +103,22 @@ class GeneralPanel(CliHeaderPanel): key = "CPU" value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) key = "Memory" value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) key = "PID" value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) key = "Uptime" value = uptimeLabel row = (key, value, theme.colors['active']) - liststore.append(row) + listStore.append(row) self.valsLock.release() diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index f4aa490..672b98e 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -7,10 +7,10 @@ import sys import gobject import gtk -from TorCtl import TorCtl -from starter import CONFIG from gui.graphing import graphPanel -from util import uiTools, torTools +from starter import CONFIG +from util import torTools, uiTools +from TorCtl import TorCtl class BandwidthStats(graphPanel.GraphPanel): def __init__(self, builder): @@ -51,7 +51,7 @@ class BandwidthStats(graphPanel.GraphPanel): label.set_text(msg) def bandwidth_event(self, event): - self._processEvent(event.read, event.written) + self._process_event(event.read, event.written) msg = 'Download: %s/s' % uiTools.getSizeLabel(event.read, 2, isBytes=False) self.update_header('primary', msg) diff --git a/src/gui/graphing/graphPanel.py b/src/gui/graphing/graphPanel.py index 16370b4..b25180e 100644 --- a/src/gui/graphing/graphPanel.py +++ b/src/gui/graphing/graphPanel.py @@ -10,13 +10,13 @@ from collections import deque import gobject import gtk +from util import gtkTools, torTools, uiTools from TorCtl import TorCtl -from util import gtkTools, uiTools, torTools -from cagraph.ca_graph import CaGraph from cagraph.axis.xaxis import CaGraphXAxis from cagraph.axis.yaxis import CaGraphYAxis from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.ca_graph import CaGraph from cagraph.series.area import CaGraphSeriesArea GRAPH_INTERVAL = 30 @@ -27,7 +27,9 @@ class GraphPanel(TorCtl.PostEventListener): self.builder = builder - self.graphs = { 'primary' : None, 'secondary' : None } + self.graphs = { + 'primary' : None, + 'secondary' : None } self.data = { 'primary' : deque([0.0] * GRAPH_INTERVAL), 'secondary' : deque([0.0] * GRAPH_INTERVAL)} @@ -44,50 +46,13 @@ class GraphPanel(TorCtl.PostEventListener): gobject.timeout_add(1000, self.update_labels, 'primary') gobject.timeout_add(1000, self.update_labels, 'secondary') - def _pack_graph_widget(self, name): - graph = CaGraph() - graph.set_size_request(200, 200) - - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - yaxis.axis_style.label_color = (0, 0, 0) - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - 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.5) } - - 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) - - self.graphs[name] = graph - - return graph - def get_graph_data(self, name): - packed_data = [] + packedData = [] for (index, value) in enumerate(self.data[name]): - packed_data.append((index, value)) + packedData.append((index, value)) - return packed_data + return packedData def is_graph_data_zero(self, name): data = self.data[name] @@ -127,7 +92,44 @@ class GraphPanel(TorCtl.PostEventListener): label = self.builder.get_object('label_graph_%s_top' % name) label.set_text(msg) - def _processEvent(self, primary, secondary): + def _pack_graph_widget(self, name): + graph = CaGraph() + graph.set_size_request(200, 200) + + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xAxis = CaGraphXAxis(graph) + yAxis = CaGraphYAxis(graph) + + xAxis.min = 0 + xAxis.max = GRAPH_INTERVAL - 1 + xAxis.axis_style.draw_labels = False + yAxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xAxis) + graph.axiss.append(yAxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + 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.5) } + + 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) + + self.graphs[name] = graph + + return graph + + def _process_event(self, primary, secondary): values = {'primary' : primary, 'secondary' : secondary} for name in ('primary', 'secondary'): diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 192eb8d..7714dcd 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -12,12 +12,11 @@ from threading import RLock import gobject import gtk -from TorCtl import TorCtl -from util import log, gtkTools, uiTools, torTools - from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, LogEntry, TorEventObserver, DEFAULT_CONFIG) +from util import gtkTools, log, torTools, uiTools +from TorCtl import TorCtl RUNLEVEL_EVENT_COLOR = {log.DEBUG: 'insensitive', log.INFO: 'normal', log.NOTICE: 'normal', log.WARN: 'active', log.ERR: 'active'} @@ -73,17 +72,17 @@ class LogPanel: gobject.idle_add(self.fill_log) def pack_widgets(self): - liststore = self.builder.get_object('liststore_log') + listStore = self.builder.get_object('liststore_log') - liststore.set_sort_func(1, self._compare_rows) - liststore.set_sort_column_id(1, gtk.SORT_DESCENDING) + listStore.set_sort_func(1, self._compare_rows) + listStore.set_sort_column_id(1, gtk.SORT_DESCENDING) def fill_log(self): if time.time() - self._lastUpdate < REFRESH_RATE: return - liststore = self.builder.get_object('liststore_log') - liststore.clear() + listStore = self.builder.get_object('liststore_log') + listStore.clear() self.lock.acquire() try: @@ -91,7 +90,7 @@ class LogPanel: timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) - liststore.append(row) + listStore.append(row) finally: self.lock.release() @@ -106,6 +105,7 @@ class LogPanel: self.msgLog.appendleft(event) finally: self.lock.release() + gobject.idle_add(self.fill_log) def _register_arm_event(self, level, msg, eventTime): @@ -118,9 +118,9 @@ class LogPanel: 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): - timestamp_raw1 = treemodel.get(iter1, 0) - timestamp_raw2 = treemodel.get(iter2, 0) + def _compare_rows(self, treeModel, iter1, iter2, data=None): + timestampRaw1 = treeModel.get(iter1, 0) + timestampRaw2 = treeModel.get(iter2, 0) - return cmp(timestamp_raw1, timestamp_raw2) + return cmp(timestampRaw1, timestampRaw2) diff --git a/src/starter.py b/src/starter.py index 01acf24..6ff78b1 100644 --- a/src/starter.py +++ b/src/starter.py @@ -442,7 +442,7 @@ if __name__ == '__main__': if launchGui == True: import gui.controller - gui.controller.startGui() + gui.controller.start_gui() else: cli.controller.startTorMonitor(time.time() - initTime)

1 0

[arm/release] Minor post-release cleanup
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e9a02ddc72a06d4290cb1f5b08de5da88c07a2dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 17 00:45:00 2011 -0700 Minor post-release cleanup --- ChangeLog | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1b776..5692ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -7/16/11 - version 1.4.3 +7/16/11 - version 1.4.3 (6cf4836) This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX. * added: relay setup wizard for autogenerating a torrc configuration diff --git a/src/version.py b/src/version.py index d135944..a1c26cf 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.3_dev' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.4_dev' +LAST_MODIFIED = "July 17, 2011"

1 0

[tor/master] Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO
by arma＠torproject.org 25 Sep '11

25 Sep '11

commit 5835acc6f910e2bb1e3908802717eeff4122a9b8 Author: Tom Lowenthal <me(a)tomlowenthal.com> Date: Sat Sep 24 15:34:32 2011 -0700 Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO --- src/or/circuitbuild.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c6be46d..888023d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1381,7 +1381,7 @@ circuit_build_times_set_timeout_worker(circuit_build_times_t *cbt) cbt->close_ms = MAX(cbt->close_ms, circuit_build_times_initial_timeout()); if (cbt->timeout_ms > max_time) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Circuit build timeout of %dms is beyond the maximum build " "time we have ever observed. Capping it to %dms.", (int)cbt->timeout_ms, max_time); @@ -1429,7 +1429,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) timeout_rate = circuit_build_times_timeout_rate(cbt); if (prev_timeout > tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we don't need to " "wait so long for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.", @@ -1440,7 +1440,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt) cbt->timeout_ms, cbt->close_ms, cbt->Xm, cbt->alpha, timeout_rate); } else if (prev_timeout < tor_lround(cbt->timeout_ms/1000)) { - log_notice(LD_CIRC, + log_info(LD_CIRC, "Based on %d circuit times, it looks like we need to wait " "longer for circuits to finish. We will now assume a " "circuit is too slow to use after waiting %ld seconds.",

1 0

[tor/master] Add a changes file for Tom Lowenthal's patch for #4063
by arma＠torproject.org 25 Sep '11

25 Sep '11

commit ccceefe13674119768436bd1b9e3c4bf04ffc5ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 24 22:15:13 2011 -0400 Add a changes file for Tom Lowenthal's patch for #4063 --- changes/ticket-4063 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/ticket-4063 b/changes/ticket-4063 new file mode 100644 index 0000000..6a985b8 --- /dev/null +++ b/changes/ticket-4063 @@ -0,0 +1,6 @@ + o Minor bugfixes (usability): + - Downgrade log messages about circuit timeout calibration from + "notice" to "info": they don't require or suggest any human + intervention. Patch from Tom Lowenthal. Fixes bug 4063; + bugfix on 0.2.2.14-alpha. +

1 0

[tor/master] trivial whitespace changes, take two
by arma＠torproject.org 25 Sep '11

25 Sep '11

commit 1c2e4d13366aee5f0107696e4d621b924a6f39a6 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 24 22:46:21 2011 -0400 trivial whitespace changes, take two --- src/or/connection_edge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0663787..6a69609 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -843,7 +843,7 @@ addressmap_clear_excluded_trackexithosts(or_options_t *options) continue; /* malformed. */ dot = target + len - 6; /* dot now points to just before .exit */ while (dot > target && *dot != '.') - dot--; + dot--; if (*dot == '.') dot++; nodename = tor_strndup(dot, len-5-(dot-target));; ri = router_get_by_nickname(nodename, 0);

1 0