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

[arm/packaging] Adding tarball dependencies for autofetching
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 5442c4365d43bc706ec4e903644c54a56c633df3 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 09:55:48 2011 -0700 Adding tarball dependencies for autofetching The autofetched library dependencies weren't having their signatures checked, making this a very stupid vulnerability when on an untrusted network (that said, in practice you'd need to check arm's integrity for this fix to be meaningful which isn't possible when it's coming from git). However, this is probably better than nothing. Suggested by Sebastian and rransom --- deps/cagraph-1.2.tar.gz | Bin 0 -> 22600 bytes deps/fetch.sh | 29 +++++++++++++++++++++++++++++ deps/torctl.tar.gz | Bin 0 -> 64261 bytes 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/deps/cagraph-1.2.tar.gz b/deps/cagraph-1.2.tar.gz new file mode 100644 index 0000000..9ebc16e Binary files /dev/null and b/deps/cagraph-1.2.tar.gz differ diff --git a/deps/fetch.sh b/deps/fetch.sh new file mode 100755 index 0000000..03ae800 --- /dev/null +++ b/deps/fetch.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# This fetches copies of arm's library dependencies. They're relatively static +# and provided with the tarball to avoid complicating the install process. +# +# TorCtl (https://gitweb.torproject.org/pytorctl.git) +# 6/10/11 - be583e53b2bccf09a7126c5271f9af5682447903b6ac92cf1cf78ca5b35273ed +# +# cagraph (https://code.google.com/p/cagraph/) +# 6/10/11 - a6928f07adb8f8d4b0076e01c0ec264e1acaaa6db21376c854fa827c9b04e3f3 + +# removes old archives if they exist +[ -f "torctl.tar.gz" ] && rm -f "torctl.tar.gz" +[ -f "cagraph-1.2.tar.gz" ] && rm -f "cagraph-1.2.tar.gz" + +# retrieves torctl +# note: This checksum changes with each fetch (maybe a timestamp's included?) +git clone --quiet git://git.torproject.org/pytorctl.git +cd pytorctl +git archive --format=tar --prefix=TorCtl/ master | gzip > ../torctl.tar.gz +cd .. +rm -rf pytorctl + +# retrieves cagraph +wget --quiet http://cagraph.googlecode.com/files/cagraph-1.2.tar.gz + +echo "Sha256 Checksums:" +sha256sum torctl.tar.gz +sha256sum cagraph-1.2.tar.gz + diff --git a/deps/torctl.tar.gz b/deps/torctl.tar.gz new file mode 100644 index 0000000..d45820b Binary files /dev/null and b/deps/torctl.tar.gz differ

1 0

[arm/master] Adding source flag to disable gui while in beta
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 155c58fe5ddb1734b4b5a46b0a7906cbf01677d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 08:36:54 2011 -0700 Adding source flag to disable gui while in beta Source flag disables the --gui argument (and by extention prevents the gui from being run). This isn't perfect in that the gui prereqs are checked despite this flag when we have the gui arg, but this is both a temporary hack and not a terribly big concern. --- src/starter.py | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/starter.py b/src/starter.py index edb8bb2..d2ac910 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,6 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil +INCLUDE_GUI = False LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, @@ -50,8 +51,13 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -OPT = "gi:c:dbe:vh" -OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +if INCLUDE_GUI: + OPT = "gi:c:dbe:vh" + OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +else: + OPT = "i:c:dbe:vh" + OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] + HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. @@ -71,6 +77,11 @@ arm -b -i 1643 hide connection data, attaching to control port 1643 arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events """ % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING) +# icky and temporary hack to remove the gui help option if it's unavailbe +if not INCLUDE_GUI: + helpComp = HELP_MSG.split("\n") + HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:]) + # filename used for cached tor config descriptions CONFIG_DESC_FILENAME = "torConfigDesc.txt" @@ -239,7 +250,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gui"): launchGui = True + elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/master] fix: checking cli or gui prereqs based on args
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 0c6fcdfaca98fede097d970fa42a3406e63bb334 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 10 08:34:28 2011 -0700 fix: checking cli or gui prereqs based on args This only checks for curses dependencies if running the cli and gtk dependencies when running the gui. This isn't quite an ideal solution since it duplicates the gui args in prereq.py but not the end of the world. --- arm | 2 +- src/prereq.py | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/arm b/arm index de0b248..a6dba93 100755 --- a/arm +++ b/arm @@ -5,7 +5,7 @@ else arm_base=$( dirname "$0" )/src/ fi -python "${arm_base}prereq.py" +python "${arm_base}prereq.py" $* if [ $? = 0 ]; then exec python -W ignore::DeprecationWarning "${arm_base}starter.py" $* diff --git a/src/prereq.py b/src/prereq.py index 506a4b0..93d9de3 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -133,7 +133,11 @@ def installCagraph(): # of errors. shutil.rmtree(tmpDir, ignore_errors=True) -if __name__ == '__main__': +def allPrereq(): + """ + Requrements for both the cli and gui versions of arm. + """ + majorVersion = sys.version_info[0] minorVersion = sys.version_info[1] @@ -144,17 +148,42 @@ if __name__ == '__main__': print("arm requires python version 2.5 or greater\n") sys.exit(1) + if not isTorCtlAvailable(): + isInstalled = promptTorCtlInstall() + if not isInstalled: sys.exit(1) + +def cliPrereq(): + """ + Requirements for the cli arm interface. + """ + + allPrereq() + try: import curses except ImportError: print("arm requires curses - try installing the python-curses package\n") sys.exit(1) - - if not isTorCtlAvailable(): - isInstalled = promptTorCtlInstall() - if not isInstalled: sys.exit(1) +def guiPrereq(): + """ + Requirements for the gui arm interface. + """ + + allPrereq() + + try: + import gtk + except ImportError: + print("arm requires gtk - try installing the python-gtk2 package\n") + sys.exit(1) + if not isCagraphAvailable(): isInstalled = promptCagraphInstall() if not isInstalled: sys.exit(1) +if __name__ == '__main__': + isGui = "-g" in sys.argv or "--gui" in sys.argv + if isGui: guiPrereq() + else: cliPrereq() +

1 0

[arm/master] Added gui as expanded option.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 9e59ed0df5168c801a72bf25c5986de9256a5b85 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 8 20:44:52 2011 +0500 Added gui as expanded option. --- src/starter.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/starter.py b/src/starter.py index a94020f..edb8bb2 100644 --- a/src/starter.py +++ b/src/starter.py @@ -51,7 +51,7 @@ CONFIG = {"startup.controlPassword": None, "log.savingDebugLog": util.log.NOTICE} OPT = "gi:c:dbe:vh" -OPT_EXPANDED = ["gtk", "interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays.

1 0

[arm/master] Fixed file mode.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit d4a7db902d187810b3ce2b3ba247dbd2760eeeef Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 5 21:13:49 2011 +0500 Fixed file mode. --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py old mode 100755 new mode 100644

1 0

[arm/master] Use --gui as the long argument.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 83512a5501cd3c76935287e7140ef6a3b5fa7f01 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 8 20:42:40 2011 +0500 Use --gui as the long argument. --- src/starter.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/starter.py b/src/starter.py index 9d7f17c..a94020f 100644 --- a/src/starter.py +++ b/src/starter.py @@ -55,7 +55,7 @@ OPT_EXPANDED = ["gtk", "interface=", "config=", "debug", "blind", "event=", "ver HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. - -g, --gtk launch the Gtk+ interface + -g, --gui launch the Gtk+ interface -i, --interface [ADDRESS:]PORT change control interface from %s:%i -c, --config CONFIG_PATH loaded configuration options, CONFIG_PATH defaults to: %s @@ -239,7 +239,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gtk"): launchGui = True + elif opt in ("-g", "--gui"): launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/master] Fixed comments referring to cagraph.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 681b169abf18334fc0aeb4ecea2f9bd50f43da2e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 8 20:43:42 2011 +0500 Fixed comments referring to cagraph. --- src/prereq.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index 2e26161..506a4b0 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -68,7 +68,7 @@ def promptCagraphInstall(): # if user says no then terminate if not userInput.lower() in ("y", "yes"): return False - # attempt to install TorCtl, printing the issue if unsuccessful + # attempt to install cagraph, printing the issue if unsuccessful try: installCagraph() @@ -122,10 +122,10 @@ def installCagraph(): exitStatus = os.system("wget -P %s %s" % (tmpDir, CAGRAPH_TARBALL_URL)) if exitStatus: raise IOError("Unable to fetch cagraph from %s. Is wget installed?" % CAGRAPH_TARBALL_URL) - # the destination for TorCtl will be our directory + # the destination for cagraph will be our directory ourDir = os.path.dirname(os.path.realpath(__file__)) - # exports TorCtl to our location + # exports cagraph to our location exitStatus = os.system("(cd %s && tar --strip-components=1 -xzf %s %s/cagraph)" % (ourDir, tmpFilename, CAGRAPH_TARBALL_ROOT)) if exitStatus: raise IOError("Unable to extract cagraph to %s" % ourDir)

1 0

[arm/master] Remove cell renderer packing from the controller.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit eedc9eeb8941d189ed9f684400cac1630bcc5c0e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jun 8 20:41:27 2011 +0500 Remove cell renderer packing from the controller. GtkBuilder's internal support for connecting tree models and views is used to clean up the program. --- src/gui/arm.xml | 119 +++++++++++++++++++++++++++++++++---------------- src/gui/controller.py | 25 ---------- 2 files changed, 80 insertions(+), 64 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 49ffc89..85f60d3 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -4,13 +4,11 @@  <object class="GtkListStore" id="liststore_sticky"> <columns> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  - <column type="gchararray"/> -  +  <column type="gchararray"/> </columns> <data> @@ -18,71 +16,60 @@ <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> - <col id="3" translatable="yes">white</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> - <col id="3" 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> - <col id="3" translatable="yes">white</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> - <col id="3" translatable="yes">white</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> - <col id="3" translatable="yes">white</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> - <col id="3" translatable="yes">white</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> - <col id="3" translatable="yes">white</col> </row> <row> <col id="0" translatable="yes">PID</col> <col id="1" translatable="yes">3980</col> <col id="2" translatable="yes">black</col> - <col id="3" translatable="yes">white</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> - <col id="3" translatable="yes">white</col> </row> </data> </object> <object class="GtkListStore" id="liststore_conn"> <columns> -  - <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> </columns> <data> @@ -92,7 +79,6 @@ <col id="2" translatable="yes">10.7m</col> <col id="3" translatable="yes">CLIENT</col> <col id="4" translatable="yes">blue</col> - <col id="5" translatable="yes">white</col> </row> <row> <col id="0" translatable="yes">115.167.31.237:44940</col> @@ -100,7 +86,6 @@ <col id="2" translatable="yes">28.3m</col> <col id="3" translatable="yes">CLIENT</col> <col id="4" translatable="yes">blue</col> - <col id="5" translatable="yes">white</col> </row> <row> <col id="0" translatable="yes">127.0.0.1:9051</col> @@ -108,21 +93,18 @@ <col id="2" translatable="yes">30.0m</col> <col id="3" translatable="yes">CONTROL</col> <col id="4" translatable="yes">red</col> - <col id="5" translatable="yes">white</col> </row> </data> </object> <object class="GtkListStore" id="liststore_config"> <columns> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  - <column type="gchararray"/> -  +  <column type="gchararray"/> </columns> <data> @@ -131,28 +113,24 @@ <col id="1" translatable="yes">5242880</col> <col id="2" translatable="yes">Average bandwidth usage limit</col> <col id="3" translatable="yes">#368918</col> - <col id="4" translatable="yes">white</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> - <col id="4" translatable="yes">white</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> - <col id="4" translatable="yes">white</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> - <col id="4" translatable="yes">white</col> </row> </data> </object> @@ -344,7 +322,7 @@ </packing> </child> <child> - <object class="GtkCurve" id="curve_graph_a"> + <object class="GtkVBox" id="placeholder_graph_a"> <property name="visible">True</property> </object> <packing> @@ -383,7 +361,7 @@ </packing> </child> <child> - <object class="GtkCurve" id="curve_graph_b"> + <object class="GtkVBox" id="placeholder_graph_b"> <property name="visible">True</property> </object> <packing> @@ -446,21 +424,49 @@ <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_origin"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> </object> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_dest"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_dest"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_time"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_time"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> </object> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_alive"> + <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_type"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_conn_type"/> + <attributes> + <attribute name="foreground">4</attribute> + <attribute name="markup">3</attribute> + </attributes> + </child> </object> </child> </object> @@ -517,18 +523,39 @@ each direction. (Default: 0) </span></property> <property name="headers_visible">False</property> <property name="search_column">0</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_name"> + <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">0</attribute> + </attributes> + </child> </object> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="markup">2</attribute> + </attributes> + </child> </object> </child> </object> @@ -573,13 +600,26 @@ each direction. (Default: 0) </span></property> <property name="headers_clickable">False</property> <property name="search_column">0</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_name"> + <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> + <attributes> + <attribute name="markup">0</attribute> + </attributes> + </child> </object> </child> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> <property name="title">column</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> + <attributes> + <attribute name="foreground">2</attribute> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> </child> </object> @@ -605,6 +645,7 @@ each direction. (Default: 0) </span></property> <object class="GtkTextView" id="textview_log"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="buffer">textbuffer_log</property> </object> </child> </object> diff --git a/src/gui/controller.py b/src/gui/controller.py index a4f34a0..0e444d3 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -8,15 +8,11 @@ class GuiController: self.builder = gtk.Builder() self.builder.add_from_file(filename) self.builder.connect_signals(self) - self._pack_formatted_cells_into_cols() def run(self): window = self.builder.get_object('window_main') - textview = self.builder.get_object('textview_log') textbuffer = self.builder.get_object('textbuffer_log') - textview.set_buffer(textbuffer) - conn = torTools.getConn() torPid = conn.getMyPid() textbuffer.set_text("Tor pid: %s" % torPid) @@ -27,27 +23,6 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() - def _pack_formatted_cells_into_cols(self): - self._pack_formatted_cell_into_col(treeview='treeview_sticky', col=0, markup=0) - self._pack_formatted_cell_into_col(treeview='treeview_sticky', col=1, markup=1, foreground=2) - self._pack_formatted_cell_into_col(treeview='treeview_conn', col=0, markup=0, foreground=4) - self._pack_formatted_cell_into_col(treeview='treeview_conn', col=1, markup=1, foreground=4) - self._pack_formatted_cell_into_col(treeview='treeview_conn', col=2, markup=2, foreground=4) - self._pack_formatted_cell_into_col(treeview='treeview_conn', col=3, markup=3, foreground=4) - self._pack_formatted_cell_into_col(treeview='treeview_config', col=0, markup=0, foreground=3) - self._pack_formatted_cell_into_col(treeview='treeview_config', col=1, markup=1, foreground=3) - self._pack_formatted_cell_into_col(treeview='treeview_config', col=2, markup=2, foreground=3) - - def _pack_formatted_cell_into_col(self, treeview, col, markup, foreground=-1, background=-1): - col = self.builder.get_object(treeview).get_column(col) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', markup) - if foreground != -1: - col.add_attribute(cell, 'foreground', foreground) - if background != -1: - col.add_attribute(cell, 'background', background) - def startGui(): controller = GuiController() controller.run()

1 0

[arm/master] Remove repetitive cell packing inside cols.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit 76ef47882a19484c498e60954f6f5310d140416d Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 5 21:53:23 2011 +0500 Remove repetitive cell packing inside cols. --- src/gui/controller.py | 75 ++++++++++++++---------------------------------- 1 files changed, 22 insertions(+), 53 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 2f54933..a4f34a0 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -8,63 +8,11 @@ class GuiController: self.builder = gtk.Builder() self.builder.add_from_file(filename) self.builder.connect_signals(self) + self._pack_formatted_cells_into_cols() def run(self): window = self.builder.get_object('window_main') - col = self.builder.get_object('treeview_sticky').get_column(0) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'text', 0) - - col = self.builder.get_object('treeview_sticky').get_column(1) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 1) - col.add_attribute(cell, 'foreground', 2) - - col = self.builder.get_object('treeview_conn').get_column(0) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 0) - col.add_attribute(cell, 'foreground', 4) - - col = self.builder.get_object('treeview_conn').get_column(1) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 1) - col.add_attribute(cell, 'foreground', 4) - - col = self.builder.get_object('treeview_conn').get_column(2) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 2) - col.add_attribute(cell, 'foreground', 4) - - col = self.builder.get_object('treeview_conn').get_column(3) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 3) - col.add_attribute(cell, 'foreground', 4) - - col = self.builder.get_object('treeview_config').get_column(0) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 0) - col.add_attribute(cell, 'foreground', 3) - - col = self.builder.get_object('treeview_config').get_column(1) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 1) - col.add_attribute(cell, 'foreground', 3) - - col = self.builder.get_object('treeview_config').get_column(2) - cell = gtk.CellRendererText() - col.pack_start(cell) - col.add_attribute(cell, 'markup', 2) - col.add_attribute(cell, 'foreground', 3) - textview = self.builder.get_object('textview_log') textbuffer = self.builder.get_object('textbuffer_log') textview.set_buffer(textbuffer) @@ -79,6 +27,27 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() + def _pack_formatted_cells_into_cols(self): + self._pack_formatted_cell_into_col(treeview='treeview_sticky', col=0, markup=0) + self._pack_formatted_cell_into_col(treeview='treeview_sticky', col=1, markup=1, foreground=2) + self._pack_formatted_cell_into_col(treeview='treeview_conn', col=0, markup=0, foreground=4) + self._pack_formatted_cell_into_col(treeview='treeview_conn', col=1, markup=1, foreground=4) + self._pack_formatted_cell_into_col(treeview='treeview_conn', col=2, markup=2, foreground=4) + self._pack_formatted_cell_into_col(treeview='treeview_conn', col=3, markup=3, foreground=4) + self._pack_formatted_cell_into_col(treeview='treeview_config', col=0, markup=0, foreground=3) + self._pack_formatted_cell_into_col(treeview='treeview_config', col=1, markup=1, foreground=3) + self._pack_formatted_cell_into_col(treeview='treeview_config', col=2, markup=2, foreground=3) + + def _pack_formatted_cell_into_col(self, treeview, col, markup, foreground=-1, background=-1): + col = self.builder.get_object(treeview).get_column(col) + cell = gtk.CellRendererText() + col.pack_start(cell) + col.add_attribute(cell, 'markup', markup) + if foreground != -1: + col.add_attribute(cell, 'foreground', foreground) + if background != -1: + col.add_attribute(cell, 'background', background) + def startGui(): controller = GuiController() controller.run()

1 0

[arm/master] Add cagraph as a prereq.
by atagar＠torproject.org 10 Jun '11

10 Jun '11

commit bffe945d864799ef8f83f60911740958aa0c7572 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jun 7 15:31:36 2011 +0500 Add cagraph as a prereq. --- src/prereq.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 66 insertions(+), 0 deletions(-) diff --git a/src/prereq.py b/src/prereq.py index 4bda913..2e26161 100644 --- a/src/prereq.py +++ b/src/prereq.py @@ -8,6 +8,9 @@ import shutil import tempfile TORCTL_REPO = "git://git.torproject.org/pytorctl.git" +CAGRAPH_TARBALL_URL = "http://cagraph.googlecode.com/files/cagraph-1.2.tar.gz" +CAGRAPH_TARBALL_NAME = "cagraph-1.2.tar.gz" +CAGRAPH_TARBALL_ROOT = "cagraph-1.2" def isTorCtlAvailable(): """ @@ -20,6 +23,16 @@ def isTorCtlAvailable(): except ImportError: return False +def isCagraphAvailable(): + """ + True if cagraph is already available on the platform, false otherwise. + """ + try: + import cagraph + return True + except ImportError: + return False + def promptTorCtlInstall(): """ Asks the user to install TorCtl. This returns True if it was installed and @@ -44,6 +57,30 @@ def promptTorCtlInstall(): print exc return False +def promptCagraphInstall(): + """ + Asks the user to install cagraph. This returns True if it was installed and + False otherwise (if it was either declined or failed to be fetched). + """ + + userInput = raw_input("Arm requires cagraph to run, but it's unavailable. Would you like to install it? (y/n): ") + + # if user says no then terminate + if not userInput.lower() in ("y", "yes"): return False + + # attempt to install TorCtl, printing the issue if unsuccessful + try: + installCagraph() + + if not isCagraphAvailable(): + raise IOError("Unable to install cagraph, sorry") + + print "cagraph successfully installed" + return True + except IOError, exc: + print exc + return False + def installTorCtl(): """ Checks out the current git head release for TorCtl and bundles it with arm. @@ -71,6 +108,31 @@ def installTorCtl(): # of errors. shutil.rmtree(tmpFilename, ignore_errors=True) +def installCagraph(): + """ + Downloads and extracts the cagraph tarball. + This raises an IOError if unsuccessful. + """ + + if isCagraphAvailable(): return + + tmpDir = tempfile.mkdtemp() + tmpFilename = os.path.join(tmpDir, CAGRAPH_TARBALL_NAME) + + exitStatus = os.system("wget -P %s %s" % (tmpDir, CAGRAPH_TARBALL_URL)) + if exitStatus: raise IOError("Unable to fetch cagraph from %s. Is wget installed?" % CAGRAPH_TARBALL_URL) + + # the destination for TorCtl will be our directory + ourDir = os.path.dirname(os.path.realpath(__file__)) + + # exports TorCtl to our location + exitStatus = os.system("(cd %s && tar --strip-components=1 -xzf %s %s/cagraph)" % (ourDir, tmpFilename, CAGRAPH_TARBALL_ROOT)) + if exitStatus: raise IOError("Unable to extract cagraph to %s" % ourDir) + + # Clean up the temporary contents. This isn't vital so quietly fails in case + # of errors. + shutil.rmtree(tmpDir, ignore_errors=True) + if __name__ == '__main__': majorVersion = sys.version_info[0] minorVersion = sys.version_info[1] @@ -92,3 +154,7 @@ if __name__ == '__main__': isInstalled = promptTorCtlInstall() if not isInstalled: sys.exit(1) + if not isCagraphAvailable(): + isInstalled = promptCagraphInstall() + if not isInstalled: sys.exit(1) +

1 0