- tor-commits - lists.torproject.org

[torouter/master] Add user name and password to config file
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 423d7556b1af6159bc3a1d6219bcd0ec704dce7f Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:21:48 2011 +0200 Add user name and password to config file --- packages/torouter-web/README | 1 + packages/torouter-web/config.py | 1 + packages/torouter-web/tui/utils/session.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/README b/packages/torouter-web/README index 7a8c0fa..60e1eeb 100644 --- a/packages/torouter-web/README +++ b/packages/torouter-web/README @@ -10,3 +10,4 @@ To start the web server run: python runui.py - Arturo Filasto' <hellais(a)torproject.org> + diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 9411bb7..aff1f8b 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -8,4 +8,5 @@ cache = False globals = {} +authinfo = ("test", "test") diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/tui/utils/session.py index 375b6bc..61c04cd 100644 --- a/packages/torouter-web/tui/utils/session.py +++ b/packages/torouter-web/tui/utils/session.py @@ -1,4 +1,5 @@ import web +import config # The main session class @@ -15,7 +16,7 @@ def is_logged(): return web.config._session.login def check_login(data): - if (data.user == "test") and (data.password == "test"): + if (data.user == config.authinfo[0]) and (data.password == config.authinfo[1]): web.config._session.login = 1 return 0 return 1

1 0

[torouter/master] Add some comments
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit db774cfe565e40a7ce4def89c130f69540493bf1 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:25:24 2011 +0200 Add some comments --- packages/torouter-web/config.py | 1 + packages/torouter-web/runui.py | 2 ++ packages/torouter-web/view.py | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index aff1f8b..765c3df 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -8,5 +8,6 @@ cache = False globals = {} +# Add your own (username, password) pair authinfo = ("test", "test") diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 9b33d7a..030bf91 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -10,6 +10,7 @@ from tui.utils import session from view import render +# This is the main structure of URLs urls = ( '/', 'tui.controllers.main.index', # '/config/(tor|router)', 'tui.controllers.main.config', @@ -26,6 +27,7 @@ urls = ( if __name__ == "__main__": app = web.application(urls, globals()) + # Add session management to the app session.add_session_to_app(app) app.internalerror = web.debugerror app.run() diff --git a/packages/torouter-web/view.py b/packages/torouter-web/view.py index 639415a..f4c9b39 100644 --- a/packages/torouter-web/view.py +++ b/packages/torouter-web/view.py @@ -5,6 +5,7 @@ t_globals = dict( datestr=web.datestr, ) +# create the render object render = web.template.render('tui/views', cache=config.cache, globals=t_globals) render._keywords['globals']['render'] = render

1 0

[torouter/master] Move styling to static/ folder
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 6d6eb966bc080325c3fdfd0320df794cdf523ea8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:34:26 2011 +0200 Move styling to static/ folder --- packages/torouter-web/config.pyc | Bin 255 -> 308 bytes packages/torouter-web/runui.pyc | Bin 1390 -> 1390 bytes packages/torouter-web/static/main.css | 29 +++++++++++++++++++ packages/torouter-web/tui/controllers/main.pyc | Bin 1196 -> 1196 bytes packages/torouter-web/tui/controllers/network.pyc | Bin 6373 -> 6373 bytes packages/torouter-web/tui/utils/session.pyc | Bin 1207 -> 1244 bytes packages/torouter-web/tui/views/base.html | 32 +------------------- packages/torouter-web/view.pyc | Bin 411 -> 411 bytes 8 files changed, 31 insertions(+), 30 deletions(-) diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc index 23bf9e9..9ed9f95 100644 Binary files a/packages/torouter-web/config.pyc and b/packages/torouter-web/config.pyc differ diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc index ce57e6c..a564a49 100644 Binary files a/packages/torouter-web/runui.pyc and b/packages/torouter-web/runui.pyc differ diff --git a/packages/torouter-web/static/main.css b/packages/torouter-web/static/main.css new file mode 100644 index 0000000..41cb47f --- /dev/null +++ b/packages/torouter-web/static/main.css @@ -0,0 +1,29 @@ + +/* Clear all */ +body { margin: 0;border: 0;padding: 0; } + +div.wrapper { + width: 800px; + margin: 0 auto; +} + +div.footer { + background-color: #CCC; + color: white; +} + +div.header { + color: white; +} + +div.header ul { + list-style: none; + height: 20px; +} + +div.header ul li { + float: left; + padding: 5px 10px; +} + + diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc index 6fb29f0..93200bc 100644 Binary files a/packages/torouter-web/tui/controllers/main.pyc and b/packages/torouter-web/tui/controllers/main.pyc differ diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc index ba6e816..0a0db6d 100644 Binary files a/packages/torouter-web/tui/controllers/network.pyc and b/packages/torouter-web/tui/controllers/network.pyc differ diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc index 2084493..e825de5 100644 Binary files a/packages/torouter-web/tui/utils/session.pyc and b/packages/torouter-web/tui/utils/session.pyc differ diff --git a/packages/torouter-web/tui/views/base.html b/packages/torouter-web/tui/views/base.html index 47091f8..aca2bf9 100644 --- a/packages/torouter-web/tui/views/base.html +++ b/packages/torouter-web/tui/views/base.html @@ -5,38 +5,10 @@ $def with (page,submenu=None) <html> <head> <title>TUI - Tor Web User Interface</title> - <style type="text/css"> - body { - margin: 0; - border: 0; - padding: 0; - - } - - div.wrapper { - width: 800px; - margin: 0 auto; - } - - div.footer { - background-color: #CCC; - color: white; - } - - div.header { - background-color: #CCC; - color: white; - } - - ul#menu { - list-style: none; - - } - - </style> + <link REL="stylesheet" href="/static/main.css" type="text/css"> </head> <body> -<div id="header"> +<div class="header"> <ul id="menu"> <li><a href="/">Home</a></li> <li><a href="/network">Network</a></li> diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc index 17728c0..3870298 100644 Binary files a/packages/torouter-web/view.pyc and b/packages/torouter-web/view.pyc differ

1 0

[torouter/master] Implement rudimentary session and login management
by hellais＠torproject.org 11 Aug '11

11 Aug '11

commit 30bf29091b7dd5531c5a096e09f3cdb6331b342f Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Aug 11 18:18:34 2011 +0200 Implement rudimentary session and login management --- packages/torouter-web/config.py | 1 - packages/torouter-web/config.pyc | Bin 228 -> 255 bytes packages/torouter-web/runui.py | 3 + packages/torouter-web/runui.pyc | Bin 1271 -> 1390 bytes packages/torouter-web/tui/__init__.pyc | Bin 142 -> 169 bytes packages/torouter-web/tui/controllers/__init__.pyc | Bin 154 -> 181 bytes packages/torouter-web/tui/controllers/main.py | 11 ++++- packages/torouter-web/tui/controllers/main.pyc | Bin 855 -> 1196 bytes packages/torouter-web/tui/controllers/network.py | 49 +++++++++++++++---- packages/torouter-web/tui/controllers/network.pyc | Bin 5261 -> 6373 bytes packages/torouter-web/tui/controllers/tor.py | 1 + packages/torouter-web/tui/controllers/tor.pyc | Bin 1419 -> 1662 bytes packages/torouter-web/tui/utils/__init__.pyc | Bin 0 -> 175 bytes packages/torouter-web/tui/utils/session.py | 22 +++++++++ packages/torouter-web/tui/utils/session.pyc | Bin 0 -> 1207 bytes packages/torouter-web/tui/views/login.html | 7 +++ packages/torouter-web/view.pyc | Bin 384 -> 411 bytes 17 files changed, 80 insertions(+), 14 deletions(-) diff --git a/packages/torouter-web/config.py b/packages/torouter-web/config.py index 9b8f7a7..9411bb7 100644 --- a/packages/torouter-web/config.py +++ b/packages/torouter-web/config.py @@ -9,4 +9,3 @@ cache = False globals = {} - diff --git a/packages/torouter-web/config.pyc b/packages/torouter-web/config.pyc index 7eb9e48..23bf9e9 100644 Binary files a/packages/torouter-web/config.pyc and b/packages/torouter-web/config.pyc differ diff --git a/packages/torouter-web/runui.py b/packages/torouter-web/runui.py index 5f27e4f..9b33d7a 100644 --- a/packages/torouter-web/runui.py +++ b/packages/torouter-web/runui.py @@ -6,8 +6,10 @@ import web import config import tui.controllers +from tui.utils import session from view import render + urls = ( '/', 'tui.controllers.main.index', # '/config/(tor|router)', 'tui.controllers.main.config', @@ -24,6 +26,7 @@ urls = ( if __name__ == "__main__": app = web.application(urls, globals()) + session.add_session_to_app(app) app.internalerror = web.debugerror app.run() diff --git a/packages/torouter-web/runui.pyc b/packages/torouter-web/runui.pyc index dc829b3..ce57e6c 100644 Binary files a/packages/torouter-web/runui.pyc and b/packages/torouter-web/runui.pyc differ diff --git a/packages/torouter-web/tui/__init__.pyc b/packages/torouter-web/tui/__init__.pyc index df02c3e..912a260 100644 Binary files a/packages/torouter-web/tui/__init__.pyc and b/packages/torouter-web/tui/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/__init__.pyc b/packages/torouter-web/tui/controllers/__init__.pyc index 8568b24..47771bf 100644 Binary files a/packages/torouter-web/tui/controllers/__init__.pyc and b/packages/torouter-web/tui/controllers/__init__.pyc differ diff --git a/packages/torouter-web/tui/controllers/main.py b/packages/torouter-web/tui/controllers/main.py index 2806467..7e1df50 100644 --- a/packages/torouter-web/tui/controllers/main.py +++ b/packages/torouter-web/tui/controllers/main.py @@ -1,14 +1,21 @@ import web import view, config from view import render +from tui.utils import session """ The main page for network configuration """ class index: def GET(self): - return render.base(render.index()) + if session.is_logged() > 0: + return render.base(render.index()) + else: + return render.base(render.login()) def POST(self): - return render.base(render.index()) + if session.check_login(web.input()) == 0: + return render.base(render.index()) + else: + return render.base(render.login()) diff --git a/packages/torouter-web/tui/controllers/main.pyc b/packages/torouter-web/tui/controllers/main.pyc index 8bd620b..6fb29f0 100644 Binary files a/packages/torouter-web/tui/controllers/main.pyc and b/packages/torouter-web/tui/controllers/main.pyc differ diff --git a/packages/torouter-web/tui/controllers/network.py b/packages/torouter-web/tui/controllers/network.py index 33e7f27..7022ca4 100644 --- a/packages/torouter-web/tui/controllers/network.py +++ b/packages/torouter-web/tui/controllers/network.py @@ -1,6 +1,7 @@ import web import view, config from view import render +from tui.utils import session """ This function is used to generate the network @@ -28,20 +29,34 @@ The main page for network configuration """ class main: def GET(self): - return render.base(render.main(),menu(0)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.main(),menu(0)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) """ The firewall configuration page """ class firewall: def GET(self): - return render.base(render.firewall(),menu(1)) + if session.is_logged() > 0: + return render.base(render.main(),menu(0)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.firewall(),menu(1)) + if session.is_logged() > 0: + return render.base(render.firewall(),menu(1)) + else: + return render.base(render.login()) + + """ Wireless network configuration page @@ -78,23 +93,35 @@ class wireless: return True def GET(self): - if self.build_form(): - return render.base(render.wireless(self.form()),menu(2)) + if session.is_logged() > 0: + if self.build_form(): + return render.base(render.wireless(self.form()),menu(2)) + else: + return render.base(render.login()) def POST(self): - self.update_config(None) - print web.input() - return render.base(render.saved(web.input()),menu(2)) + if session.is_logged() > 0: + self.update_config(None) + print web.input() + return render.base(render.saved(web.input()),menu(2)) + else: + return render.base(render.login()) """ Wired network configuration page """ class wired: def GET(self): - return render.base(render.wired(),menu(3)) + if session.is_logged() > 0: + return render.base(render.wired(),menu(3)) + else: + return render.base(render.login()) def POST(self): - return render.base(render.wired(),menu(3)) + if session.is_logged() > 0: + return render.base(render.wired(),menu(3)) + else: + return render.base(render.login()) """ General status page, displays a bit more detail than main diff --git a/packages/torouter-web/tui/controllers/network.pyc b/packages/torouter-web/tui/controllers/network.pyc index 0fa3453..ba6e816 100644 Binary files a/packages/torouter-web/tui/controllers/network.pyc and b/packages/torouter-web/tui/controllers/network.pyc differ diff --git a/packages/torouter-web/tui/controllers/tor.py b/packages/torouter-web/tui/controllers/tor.py index 3b6116f..ca96209 100644 --- a/packages/torouter-web/tui/controllers/tor.py +++ b/packages/torouter-web/tui/controllers/tor.py @@ -1,6 +1,7 @@ import web import view, config from view import render +from tui.utils import session """ The main Tor status page diff --git a/packages/torouter-web/tui/controllers/tor.pyc b/packages/torouter-web/tui/controllers/tor.pyc index 21724c4..0c5e9f5 100644 Binary files a/packages/torouter-web/tui/controllers/tor.pyc and b/packages/torouter-web/tui/controllers/tor.pyc differ diff --git a/packages/torouter-web/tui/utils/__init__.py b/packages/torouter-web/tui/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/packages/torouter-web/tui/utils/__init__.pyc b/packages/torouter-web/tui/utils/__init__.pyc new file mode 100644 index 0000000..3700fb7 Binary files /dev/null and b/packages/torouter-web/tui/utils/__init__.pyc differ diff --git a/packages/torouter-web/tui/utils/session.py b/packages/torouter-web/tui/utils/session.py new file mode 100644 index 0000000..375b6bc --- /dev/null +++ b/packages/torouter-web/tui/utils/session.py @@ -0,0 +1,22 @@ +import web + +# The main session class + +def add_session_to_app(app): + + if web.config.get("_session") is None: + store = web.session.DiskStore('sessions') + session = web.session.Session(app, store, initializer={'login': 0, 'privilege': 0}) + web.config._session = session + else: + session = web.config._session + +def is_logged(): + return web.config._session.login + +def check_login(data): + if (data.user == "test") and (data.password == "test"): + web.config._session.login = 1 + return 0 + return 1 + diff --git a/packages/torouter-web/tui/utils/session.pyc b/packages/torouter-web/tui/utils/session.pyc new file mode 100644 index 0000000..2084493 Binary files /dev/null and b/packages/torouter-web/tui/utils/session.pyc differ diff --git a/packages/torouter-web/tui/views/login.html b/packages/torouter-web/tui/views/login.html new file mode 100644 index 0000000..1377078 --- /dev/null +++ b/packages/torouter-web/tui/views/login.html @@ -0,0 +1,7 @@ +Login is required +<form method="POST" action="/"> + Login: <input type="text" name="user"> + Password: <input type="password" name="password"> + <input type="submit" name="login"> +</form> + diff --git a/packages/torouter-web/view.pyc b/packages/torouter-web/view.pyc index b8a529b..17728c0 100644 Binary files a/packages/torouter-web/view.pyc and b/packages/torouter-web/view.pyc differ

1 0

[arm/master] fix: quitting could cause unclean curses shutdown
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 61273dee395e4ba0969d93b194ab728ffb2fbc7f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 08:49:03 2011 -0700 fix: quitting could cause unclean curses shutdown If the user quit arm while we're processing tor events then there was a rather common timing issue where curses would terminate, then a daemon thread triggered a curses redraw. The result was that the terminal would be screwed up until the user ran 'reset'. This was because the daemon shutdown was outside of the curses wrapper function. Changing the ordering so we shut down daemons before curses, and setting a flag during keyboard interrupts to suppress curses redraws. --- src/cli/controller.py | 11 +++++++++-- src/util/panel.py | 7 +++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 8b87b1d..d2194ca 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -675,9 +675,14 @@ def startTorMonitor(startTime): try: curses.wrapper(drawTorMonitor, startTime) - shutdownDaemons() except KeyboardInterrupt: - # skip printing stack trace in case of keyboard interrupt + # Skip printing stack trace in case of keyboard interrupt. The + # HALT_ACTIVITY attempts to prevent daemons from triggering a curses redraw + # (which would leave the user's terminal in a screwed up state). There is + # still a tiny timing issue here (after the exception but before the flag + # is set) but I've never seen it happen in practice. + + panel.HALT_ACTIVITY = True shutdownDaemons() def drawTorMonitor(stdscr, startTime): @@ -772,4 +777,6 @@ def drawTorMonitor(stdscr, startTime): for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) if isKeystrokeConsumed: break + + shutdownDaemons() diff --git a/src/util/panel.py b/src/util/panel.py index 732610c..8a95479 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -25,6 +25,9 @@ for colorLabel in uiTools.COLOR_LIST: FORMAT_TAGS["<%s>" % colorLabel] = (uiTool CONFIG = {"log.panelRecreated": log.DEBUG} +# prevents curses redraws if set +HALT_ACTIVITY = False + def loadConfig(config): config.update(CONFIG) @@ -375,8 +378,8 @@ class Panel(): abandoned """ - # skipped if not currently visible - if not self.isVisible(): return + # skipped if not currently visible or activity has been halted + if not self.isVisible() or HALT_ACTIVITY: return # if the panel's completely outside its parent then this is a no-op newHeight, newWidth = self.getPreferredSize()

1 0

[arm/master] fix: incorrect path for armrc in man page
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 250c5a76eefe92fc4e3c8b7fbde78b56829b91ff Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 09:03:58 2011 -0700 fix: incorrect path for armrc in man page The path hadn't been updated to reflect that it's in the default arm data directory (~/.arm). Caught by dererk --- src/resources/arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/resources/arm.1 b/src/resources/arm.1 index 7edb5ef..3b8cfd4 100644 --- a/src/resources/arm.1 +++ b/src/resources/arm.1 @@ -62,7 +62,7 @@ provides usage information .SH FILES .TP -\fB~/.armrc\fR +\fB~/.arm/armrc\fR Your personal arm configuration file .TP

1 0

[tor/master] Ignore deprecation warnings on OS X
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 92bea30e28f62ea4c5d335420e2a328ff64598bc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 10 19:22:41 2011 +0200 Ignore deprecation warnings on OS X Starting with Lion, Apple decided to deprecate the system openssl. We can start requiring users to install their own openssl once OS X doesn't ship with it anymore. --- changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug3643 b/changes/bug3643 new file mode 100644 index 0000000..86bd920 --- /dev/null +++ b/changes/bug3643 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Selectively disable deprecation warnings on OS X because Lion started + deprecating the shipped copy of openssl. Fixes bug 3643. + diff --git a/configure.in b/configure.in index aa2233d..4e84298 100644 --- a/configure.in +++ b/configure.in @@ -906,6 +906,15 @@ else enable_gcc_warnings_advisory=no fi +# OS X Lion started deprecating the system openssl. Let's just disable +# all deprecation warnings on OS X. +case "$host_os" in + + darwin*) + CFLAGS="$CFLAGS -Wno-deprecated-declarations" + ;; +esac + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 8c643b51bfa18a82d6424a7b8917f7fbe96feb6e Merge: 5da9f72 92bea30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 11 11:53:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Ignore deprecation warnings on OS X
by nickm＠torproject.org 11 Aug '11

11 Aug '11

commit 92bea30e28f62ea4c5d335420e2a328ff64598bc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Wed Aug 10 19:22:41 2011 +0200 Ignore deprecation warnings on OS X Starting with Lion, Apple decided to deprecate the system openssl. We can start requiring users to install their own openssl once OS X doesn't ship with it anymore. --- changes/bug3643 | 4 ++++ configure.in | 9 +++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/changes/bug3643 b/changes/bug3643 new file mode 100644 index 0000000..86bd920 --- /dev/null +++ b/changes/bug3643 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Selectively disable deprecation warnings on OS X because Lion started + deprecating the shipped copy of openssl. Fixes bug 3643. + diff --git a/configure.in b/configure.in index aa2233d..4e84298 100644 --- a/configure.in +++ b/configure.in @@ -906,6 +906,15 @@ else enable_gcc_warnings_advisory=no fi +# OS X Lion started deprecating the system openssl. Let's just disable +# all deprecation warnings on OS X. +case "$host_os" in + + darwin*) + CFLAGS="$CFLAGS -Wno-deprecated-declarations" + ;; +esac + # Add some more warnings which we use in development but not in the # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xyes; then

1 0

[arm/master] Support TimeInterval confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 051793007724ebbb2532cd8ac5532e2580cf8fd9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 01:05:17 2011 +0500 Support TimeInterval confs. --- src/gui/configPanel.py | 6 +++++ src/util/gtkTools.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 8f09f40..1b57341 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -26,6 +26,10 @@ def input_conf_value_size(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_size(prompt, oldValue) +def input_conf_value_time(option, oldValue): + prompt = "Enter value for %s" % option + return gtkTools.input_time(prompt, oldValue) + def input_conf_value_int(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_int(prompt, oldValue) @@ -127,6 +131,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = input_conf_value_size(configOption, oldValue) + elif configType == 'TimeInterval': + newValue = input_conf_value_time(configOption, oldValue) elif configType == 'Integer': newValue = input_conf_value_int(configOption, oldValue) elif configType == 'String': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index b7cf082..56a5718 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -132,7 +132,6 @@ def input_size(prompt, default=None): comboBox.append_text("GB") comboBox.append_text("TB") comboBox.append_text("PB") - comboBox.set_active(0) hBox.pack_end(comboBox, False, False, 0) @@ -159,6 +158,62 @@ def input_size(prompt, default=None): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None +def input_time(prompt, default=None): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + hBox = gtk.HBox() + + dialog.vbox.pack_end(hBox, True, True, 0) + + spinButton = gtk.SpinButton(None) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 1024) + + hBox.pack_start(spinButton, True, True, 0) + + comboBox = gtk.combo_box_new_text() + + comboBox.append_text("seconds") + comboBox.append_text("minutes") + comboBox.append_text("hours") + comboBox.append_text("days") + + hBox.pack_end(comboBox, False, False, 0) + + if default: + if default[:-1] != 's': + default = default + 's' + + value, units = default.split() + + spinButton.set_value(float(value)) + + model = comboBox.get_model() + modelUnits = [row[0] for row in model] + index = modelUnits.index(units) + comboBox.set_active(index) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + model = comboBox.get_model() + active = comboBox.get_active() + (units,) = model[active] + + dialog.destroy() + + return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None + def input_int(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0