September 2016 - tor-commits - lists.torproject.org

[nyx/master] Rewrite controller module
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit 25458f3b15b598820ff9a90a85fd295449df7dc8 Merge: ca2a385 85e41b3 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 23:13:17 2016 -0700 Rewrite controller module Finishing the overhaul fo the last bit of our legacy codebase! This replaces our controller module with a simpler Interface class. nyx/__init__.py | 348 +++++++++++++++++++++++++++++++++++++- nyx/controller.py | 423 ----------------------------------------------- nyx/curses.py | 9 +- nyx/menu.py | 31 ++-- nyx/panel/__init__.py | 33 ++-- nyx/panel/config.py | 11 +- nyx/panel/connection.py | 14 +- nyx/panel/graph.py | 31 ++-- nyx/panel/header.py | 23 +-- nyx/panel/interpreter.py | 1 - nyx/panel/log.py | 24 ++- nyx/popups.py | 10 +- nyx/settings/strings.cfg | 4 + nyx/starter.py | 23 ++- nyxrc.sample | 5 - test/__init__.py | 2 +- test/panel/header.py | 18 +- test/popups.py | 6 +- 18 files changed, 475 insertions(+), 541 deletions(-)

1 0

[nyx/master] Finish merging controller module
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit 85e41b3581371d9119dc678ce5e7f939453f45ba Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 23:06:38 2016 -0700 Finish merging controller module Moving the draw loop, making a handful of minor improvements in the process. This lets us finally drop the controller module. --- nyx/__init__.py | 85 ++++++++++++++++++++++++++++++++--- nyx/controller.py | 114 ----------------------------------------------- nyx/menu.py | 2 +- nyx/popups.py | 2 +- nyx/settings/strings.cfg | 4 ++ nyx/starter.py | 15 ++++++- test/__init__.py | 2 +- 7 files changed, 99 insertions(+), 125 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index 33da167..69ede9b 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -36,7 +36,9 @@ import distutils.spawn import os import sys import threading +import time +import stem import stem.connection import stem.control import stem.util.conf @@ -62,14 +64,23 @@ __all__ = [ 'tracker', ] + +def conf_handler(key, value): + if key == 'features.redrawRate': + return max(1, value) + + CONFIG = stem.util.conf.config_dict('nyx', { + 'features.confirmQuit': True, 'features.panels.show.graph': True, 'features.panels.show.log': True, 'features.panels.show.connection': True, 'features.panels.show.config': True, 'features.panels.show.torrc': True, 'features.panels.show.interpreter': True, -}) + 'features.redrawRate': 5, + 'start_time': 0, +}, conf_handler) NYX_INTERFACE = None TOR_CONTROLLER = None @@ -94,7 +105,6 @@ except IOError as exc: def main(): try: - import nyx.starter nyx.starter.main() except ImportError as exc: if exc.message == 'No module named stem': @@ -119,6 +129,55 @@ def main(): sys.exit(1) +def draw_loop(): + interface = nyx_interface() + next_key = None # use this as the next user input + + stem.util.log.info(msg('startup_time', start_time = time.time() - CONFIG['start_time'])) + + while not interface._quit: + interface.redraw() + + with nyx.curses.raw_screen() as stdscr: + stdscr.refresh() + + if next_key: + key, next_key = next_key, None + else: + key = nyx.curses.key_input(CONFIG['features.redrawRate']) + + if key.match('right'): + interface.set_page((interface.get_page() + 1) % interface.page_count()) + elif key.match('left'): + interface.set_page((interface.get_page() - 1) % interface.page_count()) + elif key.match('p'): + interface.set_paused(not interface.is_paused()) + elif key.match('m'): + nyx.menu.show_menu() + elif key.match('q'): + if CONFIG['features.confirmQuit']: + confirmation_key = show_message(msg('confirm_quit'), nyx.curses.BOLD, max_wait = 30) + + if not confirmation_key.match('q'): + continue + + break + elif key.match('x'): + confirmation_key = show_message(msg('confirm_reload'), nyx.curses.BOLD, max_wait = 30) + + if confirmation_key.match('x'): + try: + tor_controller().signal(stem.Signal.RELOAD) + except stem.ControllerError as exc: + stem.util.log.error('Error detected when reloading tor: %s' % exc.strerror) + elif key.match('h'): + next_key = nyx.popups.show_help() + else: + for panel in interface.page_panels(): + for keybinding in panel.key_handlers(): + keybinding.handle(key) + + def nyx_interface(): """ Singleton controller for our interface. @@ -308,7 +367,11 @@ class Interface(object): if CONFIG['features.panels.show.interpreter']: self._page_panels.append([nyx.panel.interpreter.InterpreterPanel()]) + visible_panels = self.page_panels() + for panel in self: + panel.set_visible(panel in visible_panels) + if isinstance(panel, nyx.panel.DaemonPanel): panel.start() @@ -337,6 +400,11 @@ class Interface(object): self._page = page_number self.header_panel().redraw() + visible_panels = self.page_panels() + + for panel in self: + panel.set_visible(panel in visible_panels) + def page_count(self): """ Provides the number of pages the interface has. @@ -365,7 +433,8 @@ class Interface(object): :returns: **list** of panels on that page """ - return list(self._page_panels[self._page if page_number is None else page_number]) + page_number = self._page if page_number is None else page_number + return [self._header_panel] + self._page_panels[page_number] def is_paused(self): """ @@ -409,7 +478,7 @@ class Interface(object): occupied = 0 - for panel in [self.header_panel()] + self.page_panels(): + for panel in self.page_panels(): panel.redraw(force = force, top = occupied) occupied += panel.get_height() @@ -430,10 +499,10 @@ class Interface(object): def halt_panels(): daemons = [panel for panel in self if isinstance(panel, nyx.panel.DaemonPanel)] - for panel in daemons(): + for panel in daemons: panel.stop() - for panel in daemons(): + for panel in daemons: panel.join() halt_thread = threading.Thread(target = halt_panels) @@ -448,6 +517,8 @@ class Interface(object): yield panel +import nyx.curses +import nyx.menu import nyx.panel import nyx.panel.config import nyx.panel.connection @@ -456,3 +527,5 @@ import nyx.panel.header import nyx.panel.interpreter import nyx.panel.log import nyx.panel.torrc +import nyx.popups +import nyx.starter diff --git a/nyx/controller.py b/nyx/controller.py deleted file mode 100644 index 76fa549..0000000 --- a/nyx/controller.py +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 2009-2016, Damian Johnson and The Tor Project -# See LICENSE for licensing information - -""" -Main interface loop for nyx, periodically redrawing the screen and issuing -user input to the proper panels. -""" - -import time - -import nyx.curses -import nyx.menu -import nyx.popups - -import nyx.panel - -import stem - -from stem.util import conf, log - -from nyx.curses import BOLD -from nyx import nyx_interface, tor_controller, show_message - - -def conf_handler(key, value): - if key == 'features.redrawRate': - return max(1, value) - - -CONFIG = conf.config_dict('nyx', { - 'features.redrawRate': 5, - 'features.confirmQuit': True, - 'start_time': 0, -}, conf_handler) - - -def start_nyx(): - """ - Main draw loop context. - """ - - # provides notice about any unused config keys - - for key in sorted(conf.get_config('nyx').unused_keys()): - if not key.startswith('msg.') and not key.startswith('dedup.'): - log.notice('Unused configuration entry: %s' % key) - - interface = nyx_interface() - - # logs the initialization time - - log.info('nyx started (initialization took %0.3f seconds)' % (time.time() - CONFIG['start_time'])) - - # main draw loop - - override_key = None # uses this rather than waiting on user input - - while not interface._quit: - display_panels = [interface.header_panel()] + interface.page_panels() - - # sets panel visability - - for panel in interface: - panel.set_visible(panel in display_panels) - - interface.redraw() - - with nyx.curses.raw_screen() as stdscr: - stdscr.refresh() - - # wait for user keyboard input until timeout, unless an override was set - - if override_key: - key, override_key = override_key, None - else: - key = nyx.curses.key_input(CONFIG['features.redrawRate']) - - if key.match('right'): - interface.set_page((interface.get_page() + 1) % interface.page_count()) - elif key.match('left'): - interface.set_page((interface.get_page() - 1) % interface.page_count()) - elif key.match('p'): - interface.set_paused(not interface.is_paused()) - elif key.match('m'): - nyx.menu.show_menu() - elif key.match('q'): - # provides prompt to confirm that nyx should exit - - if CONFIG['features.confirmQuit']: - msg = 'Are you sure (q again to confirm)?' - confirmation_key = show_message(msg, BOLD, max_wait = 30) - quit_confirmed = confirmation_key.match('q') - else: - quit_confirmed = True - - if quit_confirmed: - break - elif key.match('x'): - # provides prompt to confirm that nyx should issue a sighup - - msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" - confirmation_key = show_message(msg, BOLD, max_wait = 30) - - if confirmation_key.match('x'): - try: - tor_controller().signal(stem.Signal.RELOAD) - except stem.ControllerError as exc: - log.error('Error detected when reloading tor: %s' % exc.strerror) - elif key.match('h'): - override_key = nyx.popups.show_help() - else: - for panel in display_panels: - for keybinding in panel.key_handlers(): - keybinding.handle(key) diff --git a/nyx/menu.py b/nyx/menu.py index 83b8479..9aa5797 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -269,7 +269,7 @@ def _view_menu(): page_group = RadioGroup(interface.set_page, interface.get_page()) for i in range(interface.page_count()): - page_panels = interface.page_panels(page_number = i) + page_panels = interface.page_panels(page_number = i)[1:] label = ' / '.join([type(panel).__name__.replace('Panel', '') for panel in page_panels]) view_menu.add(RadioMenuItem(label, page_group, i)) diff --git a/nyx/popups.py b/nyx/popups.py index e2f0205..0a05a2f 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -59,7 +59,7 @@ def show_help(): interface = nyx_interface() handlers = [] - for panel in reversed(interface.page_panels()): + for panel in reversed(interface.page_panels()[1:]): handlers += [handler for handler in panel.key_handlers() if handler.description] def _render(subwindow): diff --git a/nyx/settings/strings.cfg b/nyx/settings/strings.cfg index 9179519..0f24529 100644 --- a/nyx/settings/strings.cfg +++ b/nyx/settings/strings.cfg @@ -14,6 +14,10 @@ msg.wrap {text} +msg.startup_time nyx started (initialization took {start_time} seconds) +msg.confirm_quit Are you sure (q again to confirm)? +msg.confirm_reload This will reset Tor's internal state. Are you sure (x again to confirm)? + msg.config.unable_to_read_file Failed to load configuration (using defaults): "{error}" msg.config.nothing_loaded No nyxrc loaded, using defaults. You can customize nyx by placing a configuration file at {path} (see the nyxrc.sample for its options). diff --git a/nyx/starter.py b/nyx/starter.py index 7ff37b2..dbb6d8c 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -16,7 +16,6 @@ import time import nyx import nyx.arguments -import nyx.controller import nyx.curses import nyx.tracker @@ -78,6 +77,7 @@ def main(config): _warn_if_root(controller) _warn_if_unable_to_get_pid(controller) + _warn_about_unused_config_keys() _setup_freebsd_chroot(controller) _use_english_subcommands() _use_no_esc_delay() @@ -85,7 +85,7 @@ def main(config): _set_process_name() try: - nyx.curses.start(nyx.controller.start_nyx, acs_support = config.get('features.acsSupport', True), transparent_background = True, cursor = False) + nyx.curses.start(nyx.draw_loop, acs_support = config.get('features.acsSupport', True), transparent_background = True, cursor = False) except UnboundLocalError as exc: if os.environ['TERM'] != 'xterm': print(msg('setup.unknown_term', term = os.environ['TERM'])) @@ -190,6 +190,17 @@ def _warn_if_unable_to_get_pid(controller): @uses_settings +def _warn_about_unused_config_keys(config): + """ + Provides a notice if the user's nyxrc has any entries that are unused. + """ + + for key in sorted(config.unused_keys()): + if not key.startswith('msg.') and not key.startswith('dedup.'): + log.notice('Unused configuration entry: %s' % key) + + +@uses_settings def _setup_freebsd_chroot(controller, config): """ If we're running under FreeBSD then check the system for a chroot path. diff --git a/test/__init__.py b/test/__init__.py index ebb0793..6e534e1 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -83,7 +83,7 @@ def render(func, *args, **kwargs): attr = {} def draw_func(): - nyx.curses.disable_acs() + nyx.curses._disable_acs() nyx.curses.CURSES_SCREEN.erase() start_time = time.time()

1 0

[nyx/master] Drop daemon_panels() method
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit ed0fcdc3a1d8e8b489bc22420bcf7cc004a7097e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 19:00:50 2016 -0700 Drop daemon_panels() method This is only used internally so just doing the isinstance() checks where we need 'em. --- nyx/__init__.py | 20 ++++++++------------ nyx/controller.py | 7 +------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index db78bd4..33da167 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -23,7 +23,6 @@ Tor curses monitoring application. | |- header_panel - provides the header panel |- page_panels - provides panels on a page - |- daemon_panels - provides daemon panels | |- is_paused - checks if the interface is paused |- set_paused - sets paused state @@ -309,6 +308,10 @@ class Interface(object): if CONFIG['features.panels.show.interpreter']: self._page_panels.append([nyx.panel.interpreter.InterpreterPanel()]) + for panel in self: + if isinstance(panel, nyx.panel.DaemonPanel): + panel.start() + def get_page(self): """ Provides the page we're showing. @@ -364,15 +367,6 @@ class Interface(object): return list(self._page_panels[self._page if page_number is None else page_number]) - def daemon_panels(self): - """ - Provides panels that are daemons. - - :returns: **list** of DaemonPanel in the interface - """ - - return [panel for panel in self if isinstance(panel, nyx.panel.DaemonPanel)] - def is_paused(self): """ Checks if the interface is configured to be paused. @@ -434,10 +428,12 @@ class Interface(object): """ def halt_panels(): - for panel in self.daemon_panels(): + daemons = [panel for panel in self if isinstance(panel, nyx.panel.DaemonPanel)] + + for panel in daemons(): panel.stop() - for panel in self.daemon_panels(): + for panel in daemons(): panel.join() halt_thread = threading.Thread(target = halt_panels) diff --git a/nyx/controller.py b/nyx/controller.py index 980f44c..d304527 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -40,8 +40,6 @@ def start_nyx(): Main draw loop context. """ - interface = nyx_interface() - if not CONFIG['features.acsSupport']: nyx.curses.disable_acs() @@ -51,10 +49,7 @@ def start_nyx(): if not key.startswith('msg.') and not key.startswith('dedup.'): log.notice('Unused configuration entry: %s' % key) - # tells daemon panels to start - - for panel in interface.daemon_panels(): - panel.start() + interface = nyx_interface() # logs the initialization time

1 0

[nyx/master] Move show_message() and input_prompt()
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit 3a2cf0e242d2ed7d8b88f04571aa471bdb1ceed7 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 13:12:58 2016 -0700 Move show_message() and input_prompt() Last controller module functions with the exception of the starter. --- nyx/__init__.py | 32 ++++++++++++++++++++++++++++++++ nyx/controller.py | 26 +------------------------- nyx/menu.py | 7 +++---- nyx/panel/config.py | 11 +++++------ nyx/panel/graph.py | 7 +++---- nyx/panel/header.py | 5 ++--- nyx/panel/interpreter.py | 1 - nyx/panel/log.py | 13 ++++++------- 8 files changed, 52 insertions(+), 50 deletions(-) diff --git a/nyx/__init__.py b/nyx/__init__.py index a22e9f3..db78bd4 100644 --- a/nyx/__init__.py +++ b/nyx/__init__.py @@ -9,6 +9,8 @@ Tor curses monitoring application. nyx_interface - nyx interface singleton tor_controller - tor connection singleton + show_message - shows a message to the user + input_prompt - prompts the user for text input init_controller - initializes our connection to tor expand_path - expands path with respect to our chroot join - joins a series of strings up to a set length @@ -141,6 +143,36 @@ def tor_controller(): return TOR_CONTROLLER +def show_message(message = None, *attr, **kwargs): + """ + Shows a message in our header. + + :param str message: message to be shown + """ + + return nyx_interface().header_panel().show_message(message, *attr, **kwargs) + + +def input_prompt(msg, initial_value = ''): + """ + Prompts the user for input. + + :param str message: prompt for user input + :param str initial_value: initial value of the prompt + + :returns: **str** with the user input, this is **None** if the prompt is + canceled + """ + + header_panel = nyx_interface().header_panel() + + header_panel.show_message(msg) + user_input = nyx.curses.str_input(len(msg), header_panel.get_height() - 1, initial_value) + header_panel.show_message() + + return user_input + + def init_controller(*args, **kwargs): """ Sets the Controller used by nyx. This is a passthrough for Stem's diff --git a/nyx/controller.py b/nyx/controller.py index 85cf1fe..980f44c 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -19,7 +19,7 @@ import stem from stem.util import conf, log from nyx.curses import BOLD -from nyx import nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, show_message def conf_handler(key, value): @@ -35,30 +35,6 @@ CONFIG = conf.config_dict('nyx', { }, conf_handler) -def show_message(message = None, *attr, **kwargs): - return nyx_interface().header_panel().show_message(message, *attr, **kwargs) - - -def input_prompt(msg, initial_value = ''): - """ - Prompts the user for input. - - :param str message: prompt for user input - :param str initial_value: initial value of the prompt - - :returns: **str** with the user input, this is **None** if the prompt is - canceled - """ - - header_panel = nyx_interface().header_panel() - - header_panel.show_message(msg) - user_input = nyx.curses.str_input(len(msg), header_panel.get_height() - 1, initial_value) - header_panel.show_message() - - return user_input - - def start_nyx(): """ Main draw loop context. diff --git a/nyx/menu.py b/nyx/menu.py index 4d5f61c..83b8479 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -7,13 +7,12 @@ Menu for controlling nyx. import functools -import nyx.controller import nyx.curses import nyx.popups import stem -from nyx import nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, show_message from nyx.curses import RED, WHITE, NORMAL, BOLD, UNDERLINE from stem.util import str_tools @@ -205,7 +204,7 @@ def show_menu(): cursor = MenuCursor(menu.children[0].children[0]) with nyx.curses.CURSES_LOCK: - nyx.controller.show_message('Press m or esc to close the menu.', BOLD) + show_message('Press m or esc to close the menu.', BOLD) while not cursor.is_done: selection_x = _draw_top_menubar(menu, cursor.selection) @@ -213,7 +212,7 @@ def show_menu(): cursor.handle_key(nyx.curses.key_input()) nyx_interface().redraw() - nyx.controller.show_message() + show_message() def _make_menu(): diff --git a/nyx/panel/config.py b/nyx/panel/config.py index d67afae..42271e2 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -9,7 +9,6 @@ and the resulting configuration files saved. import curses import os -import nyx.controller import nyx.curses import nyx.panel import nyx.popups @@ -20,7 +19,7 @@ import stem.util.connection from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu -from nyx import DATA_DIR, tor_controller +from nyx import DATA_DIR, tor_controller, input_prompt, show_message from stem.util import conf, enum, log, str_tools @@ -194,9 +193,9 @@ class ConfigPanel(nyx.panel.Panel): if nyx.popups.confirm_save_torrc(torrc): try: controller.save_conf() - nyx.controller.show_message('Saved configuration to %s' % controller.get_info('config-file', '<unknown>'), HIGHLIGHT, max_wait = 2) + show_message('Saved configuration to %s' % controller.get_info('config-file', '<unknown>'), HIGHLIGHT, max_wait = 2) except IOError as exc: - nyx.controller.show_message('Unable to save configuration (%s)' % exc.strerror, HIGHLIGHT, max_wait = 2) + show_message('Unable to save configuration (%s)' % exc.strerror, HIGHLIGHT, max_wait = 2) self.redraw() @@ -211,7 +210,7 @@ class ConfigPanel(nyx.panel.Panel): def _edit_selected_value(): selected = self._scroller.selection(self._get_config_options()) initial_value = selected.value() if selected.is_set() else '' - new_value = nyx.controller.input_prompt('%s Value (esc to cancel): ' % selected.name, initial_value) + new_value = input_prompt('%s Value (esc to cancel): ' % selected.name, initial_value) if new_value != initial_value: try: @@ -228,7 +227,7 @@ class ConfigPanel(nyx.panel.Panel): tor_controller().set_conf(selected.name, new_value) self.redraw() except Exception as exc: - nyx.controller.show_message('%s (press any key)' % exc, HIGHLIGHT, max_wait = 30) + show_message('%s (press any key)' % exc, HIGHLIGHT, max_wait = 30) def _toggle_show_all(): self._show_all = not self._show_all diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 5266e3f..9c76673 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -18,13 +18,12 @@ import copy import functools import time -import nyx.controller import nyx.curses import nyx.panel import nyx.popups import nyx.tracker -from nyx import join, msg, nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, msg, join, show_message from nyx.curses import RED, GREEN, CYAN, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup from stem.control import EventType, Listener @@ -475,7 +474,7 @@ class GraphPanel(nyx.panel.Panel): with nyx.curses.CURSES_LOCK: try: while True: - nyx.controller.show_message('press the down/up to resize the graph, and enter when done', BOLD) + show_message('press the down/up to resize the graph, and enter when done', BOLD) key = nyx.curses.key_input() if key.match('down'): @@ -496,7 +495,7 @@ class GraphPanel(nyx.panel.Panel): nyx_interface().redraw() finally: - nyx.controller.show_message() + show_message() def set_paused(self, is_pause): if is_pause: diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 06ffb90..394ef7b 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -16,14 +16,13 @@ import stem.util.proc import stem.util.str_tools import stem.util.system -import nyx.controller import nyx.curses import nyx.panel import nyx.popups import nyx.tracker from stem.util import conf, log -from nyx import msg, nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, msg, input_prompt from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, BOLD, HIGHLIGHT @@ -132,7 +131,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): try: controller.reconnect(chroot_path = CONFIG['tor.chroot']) except stem.connection.MissingPassword: - password = nyx.controller.input_prompt('Controller Password: ') + password = input_prompt('Controller Password: ') if password: controller.authenticate(password) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 4c63027..679cc30 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -7,7 +7,6 @@ information, tab completion, and other usability features. """ import curses -import nyx.controller import nyx.curses import nyx.panel diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 2cc41c7..468d133 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -14,13 +14,12 @@ import time import stem.response.events import nyx.arguments -import nyx.controller import nyx.curses import nyx.panel import nyx.popups import nyx.log -from nyx import join, nyx_interface, tor_controller +from nyx import nyx_interface, tor_controller, join, input_prompt, show_message from nyx.curses import GREEN, YELLOW, WHITE, NORMAL, BOLD, HIGHLIGHT from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup from stem.util import conf, log @@ -118,7 +117,7 @@ class LogPanel(nyx.panel.DaemonPanel): Prompts the user to add a new regex filter. """ - regex_input = nyx.controller.input_prompt('Regular expression: ') + regex_input = input_prompt('Regular expression: ') if regex_input: self._filter.select(regex_input) @@ -139,14 +138,14 @@ class LogPanel(nyx.panel.DaemonPanel): Lets user enter a path to take a snapshot, canceling if left blank. """ - path_input = nyx.controller.input_prompt('Path to save log snapshot: ') + path_input = input_prompt('Path to save log snapshot: ') if path_input: try: self.save_snapshot(path_input) - nyx.controller.show_message('Saved: %s' % path_input, HIGHLIGHT, max_wait = 2) + show_message('Saved: %s' % path_input, HIGHLIGHT, max_wait = 2) except IOError as exc: - nyx.controller.show_message('Unable to save snapshot: %s' % exc, HIGHLIGHT, max_wait = 2) + show_message('Unable to save snapshot: %s' % exc, HIGHLIGHT, max_wait = 2) def _clear(self): """ @@ -220,7 +219,7 @@ class LogPanel(nyx.panel.DaemonPanel): def _clear_log(): msg = 'This will clear the log. Are you sure (c again to confirm)?' - key_press = nyx.controller.show_message(msg, BOLD, max_wait = 30) + key_press = show_message(msg, BOLD, max_wait = 30) if key_press.match('c'): self._clear()

1 0

[nyx/master] Move ACS support into curses.start()
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit 9264b37174c80ee2c8bd3bd412ea290cef45e91b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 20:45:34 2016 -0700 Move ACS support into curses.start() Our start method accepts flags for other curses features. ACS would be a perfect fit, and lets us make one of our functions private. --- nyx/controller.py | 4 ---- nyx/curses.py | 9 ++++++--- nyx/starter.py | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index d304527..76fa549 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -28,7 +28,6 @@ def conf_handler(key, value): CONFIG = conf.config_dict('nyx', { - 'features.acsSupport': True, 'features.redrawRate': 5, 'features.confirmQuit': True, 'start_time': 0, @@ -40,9 +39,6 @@ def start_nyx(): Main draw loop context. """ - if not CONFIG['features.acsSupport']: - nyx.curses.disable_acs() - # provides notice about any unused config keys for key in sorted(conf.get_config('nyx').unused_keys()): diff --git a/nyx/curses.py b/nyx/curses.py index d6176f9..1717067 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -25,7 +25,6 @@ if we want Windows support in the future too. get_color_override - provides color we override requests with set_color_override - sets color we override requests with - disable_acs - renders replacements for ACS characters is_wide_characters_supported - checks if curses supports wide character draw - renders subwindow that can be drawn into @@ -181,11 +180,12 @@ CONFIG = stem.util.conf.config_dict('nyx', { }, conf_handler) -def start(function, transparent_background = False, cursor = True): +def start(function, acs_support = True, transparent_background = False, cursor = True): """ Starts a curses interface, delegating to the given function. :param funtion: function to invoke when curses starts + :param bool acs_support: uses wide characters for pipes :param bool transparent_background: allows background transparency :param bool cursor: makes cursor visible """ @@ -195,6 +195,9 @@ def start(function, transparent_background = False, cursor = True): CURSES_SCREEN = stdscr + if not acs_support: + _disable_acs() + if transparent_background: try: curses.use_default_colors() @@ -608,7 +611,7 @@ def _color_attr(): return COLOR_ATTR -def disable_acs(): +def _disable_acs(): """ Replaces ACS characters used for showing borders. This can be preferable if curses is `unable to render them diff --git a/nyx/starter.py b/nyx/starter.py index 0126c3c..7ff37b2 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -85,7 +85,7 @@ def main(config): _set_process_name() try: - nyx.curses.start(nyx.controller.start_nyx, transparent_background = True, cursor = False) + nyx.curses.start(nyx.controller.start_nyx, acs_support = config.get('features.acsSupport', True), transparent_background = True, cursor = False) except UnboundLocalError as exc: if os.environ['TERM'] != 'xterm': print(msg('setup.unknown_term', term = os.environ['TERM']))

1 0

[stem/master] Add OnionView and OnionCircuits to examples
by atagar＠torproject.org 16 Sep '16

16 Sep '16

commit c5db73f7dde3c9b490c90c16e171ea17c601ecd4 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Sep 15 22:17:43 2016 -0700 Add OnionView and OnionCircuits to examples Interesting! Two GTK interfaces for circuit information that were new to me... https://lists.torproject.org/pipermail/tor-dev/2016-September/011414.html --- docs/tutorials/double_double_toil_and_trouble.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index af4f7b4..72b6ab5 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -75,7 +75,9 @@ Applications `OnionPerf <https://github.com/robgjansen/onionperf>`_ Measures onion service performance over time using customizable client behavior models. `OnioNS <https://github.com/Jesse-V/OnioNS-client>`_ Distributed DNS for hidden services. `OnionShare <https://github.com/micahflee/onionshare>`_ Hidden service based file sharing application. -`Syboa <https://gitorious.org/syboa/syboa>`_ GTK Tor interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. +`OnionView <https://github.com/skyguy/onionview>`_ GTK interface for viewing circuit information. +`OnionCircuits <https://git-tails.immerda.ch/onioncircuits/>`_ GTK interface for viewing circuit information. +`Syboa <https://gitorious.org/syboa/syboa>`_ GTK interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. `hs-health <https://gitlab.com/hs-health/hs-health>`_ Experiment to measure churn and reachability of hidden services. `trnnr <https://github.com/NullHypothesis/trnnr>`_ Python implementation of tor's nearest neighbour ranking. `TorTP <https://github.com/vinc3nt/stem-tortp>`_ Configures iptables to torify all traffic.

1 0

[translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed
by translation＠torproject.org 16 Sep '16

16 Sep '16

commit 449ff6ef8f0704d95162d1fe734e20115aeef333 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 16 01:48:18 2016 +0000 Update translations for tor-messenger-privproperties_completed --- vi/priv.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/vi/priv.properties b/vi/priv.properties index 2d9ba23..aafb864 100644 --- a/vi/priv.properties +++ b/vi/priv.properties @@ -1 +1,2 @@ priv.account=Đang tạo khoá cá nhân cho %S (%S) ... +priv.failed=Việc tạo khóa đã thất bại: %S

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 16 Sep '16

16 Sep '16

commit b63ae0d99e74e1adb305c1528d4cf8b3d90932c5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 16 01:47:58 2016 +0000 Update translations for tor-messenger-ircproperties --- vi/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/irc.properties b/vi/irc.properties index 551b14a..5bb5c8e 100644 --- a/vi/irc.properties +++ b/vi/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=An error occurred while sending your last message. Pleas error.channelForward=You may not join %1$S, and were automatically redirected to %2$S. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' không phải một chế độ người dùng hợp lệ ở máy chủ này. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 16 Sep '16

16 Sep '16

commit c8226b956ece5865bd591678d86c2dfdc9e70c0c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 16 01:16:52 2016 +0000 Update translations for torbutton-torbuttonproperties --- vi/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/torbutton.properties b/vi/torbutton.properties index 34169dc..56b04e9 100644 --- a/vi/torbutton.properties +++ b/vi/torbutton.properties @@ -48,4 +48,4 @@ profileProblemTitle=%S Profile Problem profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Việc di chuyển hồ sơ %S hiện tại của bạn đã thất bại.\nNhững cài đặt mới sẽ được sử dụng.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 16 Sep '16

16 Sep '16

commit 349c159ec698339d190d33847d4c7a700975fb4e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 16 01:16:07 2016 +0000 Update translations for tor-launcher-properties --- vi/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi/torlauncher.properties b/vi/torlauncher.properties index 12de864..2122f97 100644 --- a/vi/torlauncher.properties +++ b/vi/torlauncher.properties @@ -37,7 +37,7 @@ torlauncher.quit_win=Thoát torlauncher.done=Hoàn thành torlauncher.forAssistance=Để được trợ giúp, liên hệ %S -torlauncher.forAssistance2=For assistance, visit %S +torlauncher.forAssistance2=Nếu cần sự giúp đỡ, ghé qua %S torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.

1 0