- tor-commits - lists.torproject.org

[arm/release] Support += operations for list-model wrapper.
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 6b4d1e8ff8d7872bb1cb4bf88bf17f31e61fee1e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 24 03:57:47 2011 +0500 Support += operations for list-model wrapper. --- src/gui/configPanel.py | 11 ++++------- src/util/gtkTools.py | 14 +++++++++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index e0fb8dc..a8d7f02 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -32,26 +32,23 @@ class ConfigPanel(object, CliConfigPanel): listStore = self.builder.get_object('liststore_config') self._confImportantContents = ConfContents(self.confImportantContents, listStore) - self.confImportantContents = self.confImportantContents[-5:] + self.confImportantContents += self.confImportantContents[-5:] @property def confImportantContents(self): if hasattr(self, '_confImportantContents'): - return self._confImportantContents + return self._confImportantContents.container else: return [] @confImportantContents.setter def confImportantContents(self, value): if hasattr(self, '_confImportantContents'): - try: - self._confImportantContents.empty() - except AttributeError: - pass + self._confImportantContents.empty() for entry in value: self._confImportantContents.append(entry) else: - self._confImportantContents = value + self._confImportantContents = ConfContents(value) def pack_widgets(self): treeView = self.builder.get_object('treeview_config') diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 5ad321e..b60a829 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -21,7 +21,7 @@ class Theme: self.colors[key] = getattr(widget.style, prop)[state] class ListWrapper(object): - def __init__(self, container, model): + def __init__(self, container, model=None): self.container = [] self.model = model @@ -63,17 +63,29 @@ class ListWrapper(object): gobject.idle_add(self.__model_set, key, entry) def __model_append(self, entry): + if not self.model: + return + row = self._create_row_from_entry(entry) self.model.append(row) def __model_clear(self): + if not self.model: + return + self.model.clear() def __model_del(self, key): + if not self.model: + return + treeIter = self.model.get_iter(key) self.model.remove(treeIter) def __model_set(self, key, entry): + if not self.model: + return + row = self._create_row_from_entry(entry) self.model[key] = row

1 0

[arm/release] Use tuple instead of dict to init panel (for maintaining order).
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit aea32ec50157270b4e7f3835496dd2c358444931 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 16:11:01 2011 +0500 Use tuple instead of dict to init panel (for maintaining order). --- src/gui/controller.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 7172aa7..bf2e0f9 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -19,15 +19,15 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - 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() + panelClasses = (logPanel.LogPanel, + bandwidthStats.BandwidthStats, + connPanel.ConnectionPanel, + generalPanel.GeneralPanel) + self.panels = {} + + for panelClass in panelClasses: + self.panels[panelClass] = panelClass(self.builder) + self.panels[panelClass].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/release] Add authors.
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 82d89ad3fd63c898e8865242f11178483c24f52b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 16:24:24 2011 +0500 Add authors. --- src/gui/arm.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 56112c9..2b9ad95 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -1228,6 +1228,8 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. </property> + <property name="authors">Kamran Riaz Khan <krkhan(a)inspirated.com> +Damian Johnson <atagar1(a)gmail.com></property> <signal name="response" handler="on_aboutdialog_response"/> <child internal-child="vbox"> <object class="GtkVBox" id="aboutdialog_vbox">

1 0

[arm/release] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit c63b7426b89a3be97ba28dff345ef4d60ba78d52 Merge: 82d89ad e9a02dd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 17:15:38 2011 +0500 Merge branch 'master' of git://git.torproject.org/arm ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ install | 2 +- setup.py | 3 +- src/gui/__init__.py | 2 +- src/gui/controller.py | 13 +++++++++-- src/prereq.py | 6 +++- src/util/__init__.py | 2 +- src/util/panel.py | 1 - src/util/torConfig.py | 2 +- src/version.py | 4 +- 10 files changed, 75 insertions(+), 13 deletions(-) diff --cc src/gui/controller.py index bf2e0f9,4979ea1..19b9513 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@@ -13,21 -13,31 +13,28 @@@ gobject.threads_init( class GuiController: def __init__(self): - filename = 'src/gui/arm.xml' - self.builder = gtk.Builder() - self.builder.add_from_file(filename) + + try: + self.builder.add_from_file('src/gui/arm.xml') + except: + # when installed the above path doesn't work (the 'src' prefix doesn't + # exist and whichever path it's working off of doens't seem to exist), + # so using absolute path instead + + self.builder.add_from_file('/usr/share/arm/gui/arm.xml') + 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.connPanel.start() + panelClasses = (logPanel.LogPanel, + bandwidthStats.BandwidthStats, + connPanel.ConnectionPanel, + generalPanel.GeneralPanel) + self.panels = {} - self.generalPanel = generalPanel.GeneralPanel(self.builder) - self.generalPanel.pack_widgets() + for panelClass in panelClasses: + self.panels[panelClass] = panelClass(self.builder) + self.panels[panelClass].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/release] fix: skipping log parsing if misformatted
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit dc04a95a054338957076b6b00d3813c731d61529 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:29:56 2011 -0700 fix: skipping log parsing if misformatted Prepopulating from Tor's log file can cause us to crash if the log file's misformatted. This can happen if either our log path has something other than a Tor log or in edge cases like running out of disk space. Caught by Sjon. --- src/cli/logPanel.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 2e0d038..0b4ab9c 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -284,6 +284,13 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # entries look like: # Jul 15 18:29:48.806 [notice] Parsing GEOIP file. lineComp = line.split() + + # Checks that we have all the components we expect. This could happen if + # we're either not parsing a tor log or in weird edge cases (like being + # out of disk space) + + if len(lineComp) < 4: continue + eventType = lineComp[3][1:-1].upper() if eventType in runlevels:

1 0

[arm/release] fix: avoiding catch-all during controller init
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 7e8427563602a709afdc8a34585d9cbd905d8c87 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:18:23 2011 -0700 fix: avoiding catch-all during controller init Misplaced finally clause is obscuring any exceptions that are raised during arm's initialization. Only doing daemon shutdown for expected issues so unexpected issues are propagated. --- src/cli/controller.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e8b28cc..1554949 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -661,9 +661,10 @@ def startTorMonitor(startTime): try: curses.wrapper(drawTorMonitor, startTime) + shutdownDaemons() except KeyboardInterrupt: - pass # skip printing stack trace in case of keyboard interrupt - finally: shutdownDaemons() + # skip printing stack trace in case of keyboard interrupt + shutdownDaemons() def drawTorMonitor(stdscr, startTime): """

1 0

[arm/release] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit b20560d03191f0d9db63bc092f41b166ed2790bf Merge: c63b742 dc04a95 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 20 15:51:09 2011 +0500 Merge branch 'master' of git://git.torproject.org/arm src/cli/controller.py | 5 +++-- src/cli/logPanel.py | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[arm/release] fix: writing blank torrc without GETINFO option
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit c94f7669daecea8994561e25e7f2c3ed6f44d478 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 20 07:44:23 2011 -0700 fix: writing blank torrc without GETINFO option When "GETINFO config-text" we save a blank torrc rather than providing the user with an error. This option was introduced in Tor 0.2.2.7. Caught by Runa (https://trac.torproject.org/projects/tor/ticket/3614) --- src/util/torConfig.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index e4570ca..557dc09 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -415,6 +415,19 @@ def saveConf(destination = None, contents = None): if not contents: contents = currentConfig else: isSaveconf &= contents == currentConfig + # The "GETINFO config-text" option was introduced in Tor version 0.2.2.7. If + # we're writing custom contents then this is fine, but if we're trying to + # save the current configuration then we need to fail if it's unavailable. + # Otherwise we'd write a blank torrc as per... + # https://trac.torproject.org/projects/tor/ticket/3614 + + if contents == ['']: + # double check that "GETINFO config-text" is unavailable rather than just + # giving an empty result + + if torTools.getConn().getInfo("config-text") == None: + raise IOError("determining the torrc requires Tor version 0.2.2.7") + currentLocation = None try: currentLocation = getConfigLocation()

1 0

[arm/release] Replace "interval updates" by consistent list->model mapping.
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit 2526e7160753d5953df392a8c6fde1197f63e4d9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 22 03:03:25 2011 +0500 Replace "interval updates" by consistent list->model mapping. The CLI config panel stored entries in ConfigPanel.confImportantContents which were regularly polled and exported to GUI treestore. This created problems with selections as the liststore was essentially emptied at each timeout. The new approach is to override ConfigPanel.confImportantContents with a wrapper class which maintains consistency between the Python list and GUI liststore at each append/setitem. --- src/gui/configPanel.py | 72 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 4001058..ff8ec86 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,40 +13,65 @@ 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): + 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) + + 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) self.builder = builder - gobject.idle_add(self._fill_entries) - gobject.timeout_add(3000, self._timeout_fill_entries) + listStore = self.builder.get_object('liststore_config') + self.confImportantContents = ConfContents(self.confImportantContents, listStore) 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() @@ -55,5 +80,4 @@ class ConfigPanel(CliConfigPanel): textBuffer = self.builder.get_object('textbuffer_config_desc') textBuffer.set_text(desc) - print desc

1 0

[arm/release] Python black-magic to connect lists with liststores.
by atagar＠torproject.org 26 Sep '11

26 Sep '11

commit df0e5d0ca45f0c304fab0362ce7327cea0b2df5e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 23 06:20:05 2011 +0500 Python black-magic to connect lists with liststores. The ConfigPanel.confImportantContents is patched via Python property() in such a way that assigning lists to it automatically updates the liststore. The setter/getter is really ugly and hard to read, and serves only the purpose that the CLI portion does not need to be changed at all for this to work. Once library/CLI/GUI is decoupled this obscure piece of dark magic shall be gone for good. --- src/gui/configPanel.py | 25 +++++++++++++++++++++++-- src/util/gtkTools.py | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 46f9aa7..e0fb8dc 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -23,14 +23,35 @@ class ConfContents(gtkTools.ListWrapper): return row -class ConfigPanel(CliConfigPanel): +class ConfigPanel(object, CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) self.builder = builder listStore = self.builder.get_object('liststore_config') - self.confImportantContents = ConfContents(self.confImportantContents, listStore) + self._confImportantContents = ConfContents(self.confImportantContents, listStore) + + self.confImportantContents = self.confImportantContents[-5:] + + @property + def confImportantContents(self): + if hasattr(self, '_confImportantContents'): + return self._confImportantContents + else: + return [] + + @confImportantContents.setter + def confImportantContents(self, value): + if hasattr(self, '_confImportantContents'): + try: + self._confImportantContents.empty() + except AttributeError: + pass + for entry in value: + self._confImportantContents.append(entry) + else: + self._confImportantContents = value def pack_widgets(self): treeView = self.builder.get_object('treeview_config') diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 2d00621..5ad321e 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -32,6 +32,10 @@ class ListWrapper(object): self.container.append(entry) gobject.idle_add(self.__model_append, entry) + def empty(self): + self.container = [] + gobject.idle_add(self.__model_clear) + def __str__(self): return str(self.container) @@ -62,6 +66,9 @@ class ListWrapper(object): row = self._create_row_from_entry(entry) self.model.append(row) + def __model_clear(self): + self.model.clear() + def __model_del(self, key): treeIter = self.model.get_iter(key) self.model.remove(treeIter)

1 0