tor-commits July 2016

tor-commits@lists.torproject.org

21 participants
1271 discussions

[nyx/master] Format user input and fix scrollbar
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit e8854801ef1f5161917328f36556407c8395e7b0 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 15:44:56 2016 -0700 Format user input and fix scrollbar --- nyx/panel/interpreter.py | 63 +++++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 7865c55..2877501 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -8,8 +8,9 @@ import nyx.curses import re from nyx.curses import BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BOLD, HIGHLIGHT, NORMAL -from nyx import panel, tor_interpreter +from nyx import panel +import stem import stem.connection import stem.interpreter.commands @@ -28,11 +29,23 @@ def ansi_to_output(line, attrs): for attr in ansi_re[0].split(';'): new_attrs.append(ATTRS[attr]) attrs = new_attrs + line = ANSI_RE.sub('', line) return [(line, ) + tuple(attrs)], attrs +def format_input(user_input): + user_input = user_input.split(' ', 1) + cmd = user_input[0].upper() + output = [(PROMPT, GREEN, BOLD), (cmd, GREEN, BOLD)] + + if len(user_input) > 1: + output.append((' ' + user_input[1], CYAN, BOLD)) + + return output + + class InterpreterPanel(panel.Panel): """ Renders the interpreter panel with a prompt providing raw control port @@ -43,6 +56,7 @@ class InterpreterPanel(panel.Panel): panel.Panel.__init__(self, 'interpreter') self._is_input_mode = False + self._last_content_height = 0 self._x_offset = 0 self._scroller = nyx.curses.Scroller() self.controller = stem.connection.connect( @@ -54,8 +68,8 @@ class InterpreterPanel(panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - is_changed = self._scroller.handle_key(key, len(PROMPT_LINE), page_height) + page_height = self.get_preferred_size()[0] - 1 + is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: self.redraw(True) @@ -72,14 +86,17 @@ class InterpreterPanel(panel.Panel): if not user_input: is_done = True - response = self.interpreter.run_command(user_input) - color = None - if response: - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, [(PROMPT, GREEN, BOLD), (user_input)]) - attrs = [] - for line in response.split('\n'): - line, attrs = ansi_to_output(line, attrs) - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) + try: + response = self.interpreter.run_command(user_input) + color = None + if response: + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) + attrs = [] + for line in response.split('\n'): + line, attrs = ansi_to_output(line, attrs) + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) + except stem.SocketClosed: + is_done = True if is_done: self._is_input_mode = False @@ -91,30 +108,32 @@ class InterpreterPanel(panel.Panel): ) def draw(self, width, height): - scroll = self._scroller.location(len(PROMPT_LINE), height) + scroll = self._scroller.location(self._last_content_height, height) usage_msg = ' (enter \"/help\" for usage or a blank line to stop)' if self._is_input_mode else "" self.addstr(0, 0, 'Control Interpreter%s:' % usage_msg, HIGHLIGHT) - is_scrollbar_visible = len(PROMPT_LINE) > height - 1 + is_scrollbar_visible = self._last_content_height > height - 1 if is_scrollbar_visible: - self.add_scroll_bar(scroll, scroll + height, len(PROMPT_LINE), 1) + self.add_scroll_bar(scroll, scroll + height, self._last_content_height, 1) - self._x_offset, draw_line = 2 if is_scrollbar_visible else 0, 1 - scroll + self._x_offset, y = 2 if is_scrollbar_visible else 0, 1 - scroll for entry in PROMPT_LINE: cursor = self._x_offset for line in entry: - if len(line) == 1: - self.addstr(draw_line, cursor, line[0]) - elif len(line) == 2: - self.addstr(draw_line, cursor, line[0], line[1]) + if len(line) == 2: + self.addstr(y, cursor, line[0], line[1]) elif len(line) == 3: - self.addstr(draw_line, cursor, line[0], line[1], line[2]) - self.addstr(draw_line, cursor, line) + self.addstr(y, cursor, line[0], line[1], line[2]) try: cursor += len(line[0]) except: pass - draw_line += 1 + y += 1 + + new_content_height = y + scroll - 1 + if new_content_height != self._last_content_height: + self._last_content_height = new_content_height + self.redraw(True)

1 0

[nyx/master] Added more options to interpreter panel help
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 6853f99a6afc6189b63a3813d488a6d160c4c175 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 19 21:56:46 2016 -0700 Added more options to interpreter panel help --- nyx/tor_interpreter.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/nyx/tor_interpreter.py b/nyx/tor_interpreter.py index 62986ec..7b59a36 100644 --- a/nyx/tor_interpreter.py +++ b/nyx/tor_interpreter.py @@ -5,6 +5,8 @@ from nyx import tor_controller # initial location /write will save to when no path is specified DEFAULT_WRITE_PATH = "/tmp/torInterpretor_output" +MULTILINE_UNIMPLEMENTED_NOTICE = "Multi-line control options like this are not yet implemented." + GENERAL_HELP = """Interpretor commands include: /help - provides information for interpretor and tor commands/config options /info - general information for a relay @@ -222,6 +224,36 @@ class ControlInterpreter: for line in description.split("\n"): output_entry.append([(" " + line, BLUE, )]) + + if arg == "SIGNAL": + # lists descriptions for all of the signals + for signal, description in SIGNAL_DESCRIPTIONS: + output_entry.append([("%-15s" % signal, BLUE, BOLD), (" - %s" % description, BLUE, )]) + elif arg == "SETEVENTS": + # lists all of the event types + event_options = tor_controller().get_info("events/names") + if event_options: + event_entries = event_options.split() + + # displays four columns of 20 characters + for i in range(0, len(event_entries), 4): + line_entries = event_entries[i : i+4] + + line_content = "" + for entry in line_entries: + line_content += "%-20s" % entry + + output_entry.append([(line_content, BLUE, )]) + elif arg == "USEFEATURE": + # lists the feature options + feature_options = tor_controller().get_info("features/names") + if feature_options: + output_entry.append([(feature_options, BLUE, )]) + elif arg in ("LOADCONF", "POSTDESCRIPTOR"): + # gives a warning that this option isn't yet implemented + output_entry.append([(MULTILINE_UNIMPLEMENTED_NOTICE, RED, BOLD)]) + else: + output_entry.append([("No help information available for '%s'..." % arg, RED, BOLD)]) else: # provides the GENERAL_HELP with everything bolded except descriptions for line in GENERAL_HELP.split("\n"): @@ -251,7 +283,7 @@ class ControlInterpreter: else: cmd, arg = user_input, "" if cmd.startswith("/"): - input_entry.append((cmd, MAGENTA, BOLD)) + input_entry.append((user_input, MAGENTA, BOLD)) if cmd == "/quit": raise InterpreterClosed() elif cmd == "/help": self.do_help(arg, output_entry) else:

1 0

[nyx/master] Identify non-recognizable commands
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 99a019efde46e89368f11cf744f3dc4d82a0927d Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 26 12:35:32 2016 -0700 Identify non-recognizable commands --- nyx/panel/interpreter.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 0937808..f6cd1c2 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -8,6 +8,7 @@ import nyx.controller import nyx.curses import re +from mock import patch from nyx.curses import BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BOLD, HIGHLIGHT, NORMAL from nyx import panel @@ -96,17 +97,20 @@ class InterpreterPanel(panel.Panel): if not user_input: is_done = True - - try: - response = self.interpreter.run_command(user_input) - if response: - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) - attrs = [] - for line in response.split('\n'): - line, attrs = ansi_to_output(line, attrs) - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) - except stem.SocketClosed: - is_done = True + else: + try: + with patch('stem.interpreter.commands.code.InteractiveConsole.push') as console_push: + response = self.interpreter.run_command(user_input) + if console_push.called: + response = '\x1b[31;1m\'' + user_input + '\' isn\'t a recognized command\r\n' + if response: + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) + attrs = [] + for line in response.split('\n'): + line, attrs = ansi_to_output(line, attrs) + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) + except stem.SocketClosed: + is_done = True if is_done: self._is_input_mode = False

1 0

[nyx/master] Added tab completion
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 6017f4148bda6f8c5cb53373656afddce3f16c6b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jul 2 10:43:58 2016 -0700 Added tab completion --- nyx/curses.py | 31 +++++++++++++++++++++++++++++-- nyx/panel/interpreter.py | 4 +++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 21b7a42..48f015e 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -86,6 +86,7 @@ import collections import curses import curses.ascii import curses.textpad +import os import threading import stem.util.conf @@ -244,7 +245,7 @@ def key_input(input_timeout = None): return KeyInput(CURSES_SCREEN.getch()) -def str_input(x, y, initial_text = '', backlog=None): +def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): """ Provides a text field where the user can input a string, blocking until they've done so and returning the result. If the user presses escape then @@ -316,6 +317,30 @@ def str_input(x, y, initial_text = '', backlog=None): return handle_key(textbox, key) + def handle_tab_completion(textbox, key): + if key == 9: + current_contents = textbox.gather().strip() + matches = tab_completion(current_contents) + new_input = None + + if len(matches) == 1: + new_input = matches[0] + elif len(matches) > 1: + common_prefix = os.path.commonprefix(matches) + if common_prefix != current_contents: + new_input = common_prefix + + if new_input: + y, _ = textbox.win.getyx() + _, max_x = textbox.win.getmaxyx() + textbox.win.clear() + textbox.win.addstr(y, 0, new_input[:max_x - 1]) + textbox.win.move(y, min(len(new_input), max_x - 1)) + + return None + + return handle_history_key(textbox, key) + with CURSES_LOCK: if HALT_ACTIVITY: return None @@ -332,7 +357,9 @@ def str_input(x, y, initial_text = '', backlog=None): curses_subwindow.addstr(0, 0, initial_text[:width - 1]) textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) - if backlog is not None: + if tab_completion is not None: + user_input = textbox.edit(lambda key: handle_tab_completion(textbox, key)).strip() + elif backlog is not None: user_input = textbox.edit(lambda key: handle_history_key(textbox, key)).strip() else: user_input = textbox.edit(lambda key: handle_key(textbox, key)).strip() diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 8a48b34..e9e004c 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -17,6 +17,7 @@ from nyx import panel import stem import stem.connection +import stem.interpreter.autocomplete import stem.interpreter.commands @@ -79,6 +80,7 @@ class InterpreterPanel(panel.Panel): control_socket = '/var/run/tor/control', password_prompt = True, ) + self.autocompleter = stem.interpreter.autocomplete.Autocompleter(self.controller) self.interpreter = stem.interpreter.commands.ControlInterpretor(self.controller) def key_handlers(self): @@ -96,7 +98,7 @@ class InterpreterPanel(panel.Panel): self.redraw(True) _scroll(nyx.curses.KeyInput(curses.KEY_END)) page_height = self.get_preferred_size()[0] - 1 - user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(PROMPT_LINE[-page_height:]), '', list(reversed(self._backlog))) + user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(PROMPT_LINE[-page_height:]), '', list(reversed(self._backlog)), self.autocompleter.matches) user_input, is_done = user_input.strip(), False if not user_input:

1 0

[nyx/master] Updated str_input functions
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 25173a934a2b431150fdb3c43d704a794c213a4b Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Thu Jul 14 07:44:13 2016 -0700 Updated str_input functions --- nyx/curses.py | 146 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 75 insertions(+), 71 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 48f015e..b4c34f2 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -149,6 +149,8 @@ SPECIAL_KEYS = { Dimensions = collections.namedtuple('Dimensions', ['width', 'height']) +HISTORY_DICT = {'selection_index': -1, 'custom_input': ''} + def conf_handler(key, value): if key == 'features.colorOverride': @@ -245,101 +247,103 @@ def key_input(input_timeout = None): return KeyInput(CURSES_SCREEN.getch()) -def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): - """ - Provides a text field where the user can input a string, blocking until - they've done so and returning the result. If the user presses escape then - this terminates and provides back **None**. +def str_input_handle_key(textbox, key): + y, x = textbox.win.getyx() - This blanks any content within the space that the input field is rendered - (otherwise stray characters would be interpreted as part of the initial - input). + if key == 27: + return curses.ascii.BEL # user pressed esc + elif key == curses.KEY_HOME: + textbox.win.move(y, 0) + elif key in (curses.KEY_END, curses.KEY_RIGHT): + msg_length = len(textbox.gather()) + textbox.win.move(y, x) # reverts cursor movement during gather call - :param int x: horizontal location - :param int y: vertical location - :param str initial_text: initial input of the field + if key == curses.KEY_END and msg_length > 0 and x < msg_length - 1: + textbox.win.move(y, msg_length - 1) # if we're in the content then move to the end + elif key == curses.KEY_RIGHT and x < msg_length - 1: + textbox.win.move(y, x + 1) # only move cursor if there's content after it + elif key == 410: + # if we're resizing the display during text entry then cancel it + # (otherwise the input field is filled with nonprintable characters) - :returns: **str** with the user input or **None** if the prompt is caneled - """ + return curses.ascii.BEL + else: + return key + + +def str_input_handle_history_key(textbox, key, backlog): + global HISTORY_DICT + if key in (curses.KEY_UP, curses.KEY_DOWN): + offset = 1 if key == curses.KEY_UP else -1 + new_selection = HISTORY_DICT['selection_index'] + offset - def handle_key(textbox, key): - y, x = textbox.win.getyx() + new_selection = max(-1, new_selection) + new_selection = min(len(backlog) - 1, new_selection) - if key == 27: - return curses.ascii.BEL # user pressed esc - elif key == curses.KEY_HOME: - textbox.win.move(y, 0) - elif key in (curses.KEY_END, curses.KEY_RIGHT): - msg_length = len(textbox.gather()) - textbox.win.move(y, x) # reverts cursor movement during gather call + if HISTORY_DICT['selection_index'] == new_selection: + return None - if key == curses.KEY_END and msg_length > 0 and x < msg_length - 1: - textbox.win.move(y, msg_length - 1) # if we're in the content then move to the end - elif key == curses.KEY_RIGHT and x < msg_length - 1: - textbox.win.move(y, x + 1) # only move cursor if there's content after it - elif key == 410: - # if we're resizing the display during text entry then cancel it - # (otherwise the input field is filled with nonprintable characters) + if HISTORY_DICT['selection_index'] == -1: + HISTORY_DICT['custom_input'] = textbox.gather().strip() - return curses.ascii.BEL + if new_selection == -1: + new_input = HISTORY_DICT['custom_input'] else: - return key + new_input = backlog[new_selection] - history_dict = {'selection_index': -1, 'custom_input': ''} + y, _ = textbox.win.getyx() + _, max_x = textbox.win.getmaxyx() + textbox.win.clear() + textbox.win.addstr(y, 0, new_input[:max_x - 1]) + textbox.win.move(y, min(len(new_input), max_x - 1)) - def handle_history_key(textbox, key): - if key in (curses.KEY_UP, curses.KEY_DOWN): - offset = 1 if key == curses.KEY_UP else -1 - new_selection = history_dict['selection_index'] + offset + HISTORY_DICT['selection_index'] = new_selection + return None - new_selection = max(-1, new_selection) - new_selection = min(len(backlog) - 1, new_selection) + return str_input_handle_key(textbox, key) - if history_dict['selection_index'] == new_selection: - return None - if history_dict['selection_index'] == -1: - history_dict['custom_input'] = textbox.gather().strip() +def str_input_handle_tab_completion(textbox, key, backlog, tab_completion): + if key == 9: + current_contents = textbox.gather().strip() + matches = tab_completion(current_contents) + new_input = None - if new_selection == -1: - new_input = history_dict['custom_input'] - else: - new_input = backlog[new_selection] + if len(matches) == 1: + new_input = matches[0] + elif len(matches) > 1: + common_prefix = os.path.commonprefix(matches) + if common_prefix != current_contents: + new_input = common_prefix + if new_input: y, _ = textbox.win.getyx() _, max_x = textbox.win.getmaxyx() textbox.win.clear() textbox.win.addstr(y, 0, new_input[:max_x - 1]) textbox.win.move(y, min(len(new_input), max_x - 1)) - history_dict['selection_index'] = new_selection - return None + return None - return handle_key(textbox, key) + return str_input_handle_history_key(textbox, key, backlog) - def handle_tab_completion(textbox, key): - if key == 9: - current_contents = textbox.gather().strip() - matches = tab_completion(current_contents) - new_input = None - if len(matches) == 1: - new_input = matches[0] - elif len(matches) > 1: - common_prefix = os.path.commonprefix(matches) - if common_prefix != current_contents: - new_input = common_prefix +def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): + """ + Provides a text field where the user can input a string, blocking until + they've done so and returning the result. If the user presses escape then + this terminates and provides back **None**. - if new_input: - y, _ = textbox.win.getyx() - _, max_x = textbox.win.getmaxyx() - textbox.win.clear() - textbox.win.addstr(y, 0, new_input[:max_x - 1]) - textbox.win.move(y, min(len(new_input), max_x - 1)) + This blanks any content within the space that the input field is rendered + (otherwise stray characters would be interpreted as part of the initial + input). - return None + :param int x: horizontal location + :param int y: vertical location + :param str initial_text: initial input of the field - return handle_history_key(textbox, key) + :returns: **str** with the user input or **None** if the prompt is caneled + """ with CURSES_LOCK: if HALT_ACTIVITY: @@ -358,11 +362,11 @@ def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) if tab_completion is not None: - user_input = textbox.edit(lambda key: handle_tab_completion(textbox, key)).strip() + user_input = textbox.edit(lambda key: str_input_handle_tab_completion(textbox, key, backlog, tab_completion)).strip() elif backlog is not None: - user_input = textbox.edit(lambda key: handle_history_key(textbox, key)).strip() + user_input = textbox.edit(lambda key: str_input_handle_history_key(textbox, key, backlog)).strip() else: - user_input = textbox.edit(lambda key: handle_key(textbox, key)).strip() + user_input = textbox.edit(lambda key: str_input_handle_key(textbox, key)).strip() try: curses.curs_set(0) # hide cursor

1 0

[nyx/master] Added scrollbar
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 15f1e043c8c758db55e4b6bab1f1f4f25fd6a30f Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 15:32:01 2016 -0700 Added scrollbar --- nyx/panel/interpreter.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index bc5da76..7865c55 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -43,6 +43,8 @@ class InterpreterPanel(panel.Panel): panel.Panel.__init__(self, 'interpreter') self._is_input_mode = False + self._x_offset = 0 + self._scroller = nyx.curses.Scroller() self.controller = stem.connection.connect( control_port = ('127.0.0.1', 'default'), control_socket = '/var/run/tor/control', @@ -51,12 +53,20 @@ class InterpreterPanel(panel.Panel): self.interpreter = stem.interpreter.commands.ControlInterpretor(self.controller) def key_handlers(self): + def _scroll(key): + page_height = self.get_preferred_size()[0] + is_changed = self._scroller.handle_key(key, len(PROMPT_LINE), page_height) + + if is_changed: + self.redraw(True) + def _execute_command(): self._is_input_mode = True while self._is_input_mode: self.redraw(True) - user_input = nyx.curses.str_input(len(PROMPT), self.top + len(PROMPT_LINE)) + page_height = self.get_preferred_size()[0] - 1 + user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(PROMPT_LINE[-page_height:])) user_input, is_done = user_input.strip(), False if not user_input: @@ -77,16 +87,22 @@ class InterpreterPanel(panel.Panel): return ( nyx.panel.KeyHandler('enter', 'execute a command', _execute_command, key_func = lambda key: key.is_selection()), + nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), ) def draw(self, width, height): + scroll = self._scroller.location(len(PROMPT_LINE), height) + usage_msg = ' (enter \"/help\" for usage or a blank line to stop)' if self._is_input_mode else "" self.addstr(0, 0, 'Control Interpreter%s:' % usage_msg, HIGHLIGHT) - x_offset = 0 - draw_line = 1 + is_scrollbar_visible = len(PROMPT_LINE) > height - 1 + if is_scrollbar_visible: + self.add_scroll_bar(scroll, scroll + height, len(PROMPT_LINE), 1) + + self._x_offset, draw_line = 2 if is_scrollbar_visible else 0, 1 - scroll for entry in PROMPT_LINE: - cursor = x_offset + cursor = self._x_offset for line in entry: if len(line) == 1:

1 0

[nyx/master] Added tests
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit f8171aa62dbf940fd1e3a24279a1c5e3fd8a3fb5 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jul 10 20:57:30 2016 -0700 Added tests --- nyx/panel/interpreter.py | 10 +++---- test/panel/interpreter.py | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 5 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 88affb2..9839e90 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -23,7 +23,6 @@ import stem.interpreter.commands USAGE_INFO = 'to use this panel press enter' PROMPT = '>>> ' -PROMPT_LINE = [[(PROMPT, GREEN, BOLD), (USAGE_INFO, CYAN, BOLD)]] ANSI_RE = re.compile('\\x1b\[([0-9;]*)m') ATTRS = {'0': NORMAL, '1': BOLD, '30': BLACK, '31': RED, '32': GREEN, '33': YELLOW, '34': BLUE, '35': MAGENTA, '36': CYAN} BACKLOG_LIMIT = 100 @@ -82,6 +81,7 @@ class InterpreterPanel(panel.Panel): ) self.autocompleter = stem.interpreter.autocomplete.Autocompleter(self.controller) self.interpreter = stem.interpreter.commands.ControlInterpretor(self.controller) + self.prompt_line = [[(PROMPT, GREEN, BOLD), (USAGE_INFO, CYAN, BOLD)]] def key_handlers(self): def _scroll(key): @@ -98,7 +98,7 @@ class InterpreterPanel(panel.Panel): self.redraw(True) _scroll(nyx.curses.KeyInput(curses.KEY_END)) page_height = self.get_preferred_size()[0] - 1 - user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(PROMPT_LINE[-page_height:]), '', list(reversed(self._backlog)), self.autocompleter.matches) + user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(self.prompt_line[-page_height:]), '', list(reversed(self._backlog)), self.autocompleter.matches) user_input, is_done = user_input.strip(), False if not user_input: @@ -126,11 +126,11 @@ class InterpreterPanel(panel.Panel): response = '\x1b[31;1m' + new_stderr.getvalue() sys.stderr = old_stderr if response: - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) + self.prompt_line.insert(len(self.prompt_line) - 1, format_input(user_input)) attrs = [] for line in response.split('\n'): line, attrs = ansi_to_output(line, attrs) - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) + self.prompt_line.insert(len(self.prompt_line) - 1, line) except stem.SocketClosed: is_done = True @@ -151,7 +151,7 @@ class InterpreterPanel(panel.Panel): subwindow.scrollbar(1, scroll, self._last_content_height - 1) y = 1 - scroll - for entry in PROMPT_LINE: + for entry in self.prompt_line: cursor = self._x_offset for line in entry: diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index 054aeff..a3ddd5e 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -4,7 +4,27 @@ Unit tests for nyx.panel.interpreter. import unittest +import nyx.curses import nyx.panel.interpreter +import test + +EXPECTED_PANEL = """ +Control Interpreter: +>>> to use this panel press enter +""".strip() + +EXPECTED_PANEL_INPUT_MODE = """ +Control Interpreter (enter "/help" for usage or a blank line to stop): +>>> to use this panel press enter +""".strip() + +EXPECTED_MULTILINE_PANEL = """ +Control Interpreter: +>>> GETINFO version +250-version=0.2.4.27 (git-412e3f7dc9c6c01a) +""".strip() + +EXPECTED_SCROLLBAR_PANEL = ' |>>> to use this panel press enter' class TestInterpreter(unittest.TestCase): @@ -16,3 +36,57 @@ class TestInterpreter(unittest.TestCase): self.assertEqual('Green', output_line[0][1]) self.assertEqual('Bold', output_line[0][2]) self.assertEqual(['Green', 'Bold'], attrs) + + def test_format_input(self): + user_input = 'getinfo' + output = nyx.panel.interpreter.format_input(user_input) + self.assertEqual(2, len(output)) + self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) + self.assertEqual(('getinfo ', 'Green', 'Bold'), output[1]) + + user_input = 'getinfo version' + output = nyx.panel.interpreter.format_input(user_input) + self.assertEqual(3, len(output)) + self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) + self.assertEqual(('getinfo ', 'Green', 'Bold'), output[1]) + self.assertEqual(('version', 'Cyan', 'Bold'), output[2]) + + user_input = '/help' + output = nyx.panel.interpreter.format_input(user_input) + self.assertEqual(2, len(output)) + self.assertEqual(('>>> ', 'Green', 'Bold'), output[0]) + self.assertEqual(('/help', 'Magenta', 'Bold'), output[1]) + + def test_panel_name(self): + panel = nyx.panel.interpreter.InterpreterPanel() + self.assertEqual(panel.get_name(), 'interpreter') + + def test_rendering_panel(self): + panel = nyx.panel.interpreter.InterpreterPanel() + self.assertEqual(EXPECTED_PANEL, test.render(panel.draw).content) + + panel._is_input_mode = True + self.assertEqual(EXPECTED_PANEL_INPUT_MODE, test.render(panel.draw).content) + + def test_rendering_multiline_panel(self): + panel = nyx.panel.interpreter.InterpreterPanel() + panel.prompt_line = [[('>>> ', 'Green', 'Bold'), ('GETINFO', 'Green', 'Bold'), (' version', 'Cyan')]] + panel.prompt_line.append([('250-version=0.2.4.27 (git-412e3f7dc9c6c01a)', 'Blue')]) + self.assertEqual(EXPECTED_MULTILINE_PANEL, test.render(panel.draw).content) + + def test_scrollbar(self): + panel = nyx.panel.interpreter.InterpreterPanel() + self.assertIsInstance(panel._scroller, nyx.curses.Scroller) + + height = panel.get_preferred_size()[0] + panel._last_content_height = height + output_lines = test.render(panel.draw).content.split('\n') + self.assertEqual(height, len(output_lines)) + self.assertEqual(EXPECTED_SCROLLBAR_PANEL, output_lines[1]) + + def test_key_handlers(self): + panel = nyx.panel.interpreter.InterpreterPanel() + output = panel.key_handlers() + self.assertEqual(2, len(output)) + self.assertEqual('enter', output[0].key) + self.assertEqual('arrows', output[1].key)

1 0

[nyx/master] Added help options to interpreter panel
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 49a58b9dff0f1cf53b743c400d18bd3dbbe70184 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 19 21:27:36 2016 -0700 Added help options to interpreter panel --- nyx/panel/interpreter.py | 10 +- nyx/tor_interpreter.py | 286 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 263 insertions(+), 33 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 2e3ec0d..0c5d8c6 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -7,8 +7,7 @@ import nyx.controller import nyx.curses from nyx.curses import GREEN, CYAN, BOLD, HIGHLIGHT -from nyx.tor_interpreter import handle_query, InterpreterClosed -from nyx import panel +from nyx import panel, tor_interpreter USAGE_INFO = "to use this panel press enter" @@ -25,6 +24,7 @@ class InterpreterPanel(panel.Panel): panel.Panel.__init__(self, 'interpreter') self._is_input_mode = False + self.interpreter = tor_interpreter.ControlInterpreter() def key_handlers(self): def _execute_command(): @@ -39,12 +39,12 @@ class InterpreterPanel(panel.Panel): is_done = True else: try: - input_entry, output_entry = handle_query(user_input) + input_entry, output_entry = self.interpreter.handle_query(user_input) input_entry.insert(0, (PROMPT, GREEN, BOLD)) PROMPT_LINE.insert(len(PROMPT_LINE) - 1, input_entry) for line in output_entry: - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, [line]) - except InterpreterClosed: + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) + except tor_interpreter.InterpreterClosed: is_done = True if is_done: diff --git a/nyx/tor_interpreter.py b/nyx/tor_interpreter.py index bf94403..62986ec 100644 --- a/nyx/tor_interpreter.py +++ b/nyx/tor_interpreter.py @@ -1,43 +1,273 @@ -from nyx.curses import GREEN, CYAN, RED, MAGENTA, BOLD, HIGHLIGHT +from nyx.curses import GREEN, CYAN, RED, MAGENTA, BLUE, BOLD, HIGHLIGHT from nyx import tor_controller -def handle_query(user_input): +# initial location /write will save to when no path is specified +DEFAULT_WRITE_PATH = "/tmp/torInterpretor_output" + +GENERAL_HELP = """Interpretor commands include: + /help - provides information for interpretor and tor commands/config options + /info - general information for a relay + /find - searches backlog for lines with the given regex + /events - prints events that we've received + /write - saves backlog to a given location + /quit - shuts down the interpretor + +Tor commands include: + GETINFO - queries information from tor + GETCONF, SETCONF, RESETCONF - show or edit a configuration option + SIGNAL - issues control signal to the process (for resetting, stopping, etc) + SETEVENTS - configures the events tor will notify us of + + USEFEATURE - enables custom behavior for the controller + SAVECONF - writes tor's current configuration to our torrc + LOADCONF - loads the given input like it was part of our torrc + MAPADDRESS - replaces requests for one address with another + POSTDESCRIPTOR - adds a relay descriptor to our cache + EXTENDCIRCUIT - create or extend a tor circuit + SETCIRCUITPURPOSE - configures the purpose associated with a circuit + CLOSECIRCUIT - closes the given circuit + ATTACHSTREAM - associates an application's stream with a tor circuit + REDIRECTSTREAM - sets a stream's destination + CLOSESTREAM - closes the given stream + RESOLVE - issues an asynchronous dns or rdns request over tor + TAKEOWNERSHIP - instructs tor to quit when this control connection is closed + PROTOCOLINFO - queries version and controller authentication information + QUIT - disconnect the control connection + +For more information use '/help [OPTION]'.""" + +HELP_HELP = """Provides usage information for the given interpretor, tor command, or tor +configuration option. + +Example: + /help info # provides a description of the '/info' option + /help GETINFO # usage information for tor's GETINFO controller option + /help ExitPolicy # description of tor's ExitPolicy configuration option""" + +HELP_WRITE = """Writes the interpretor's backlog to the given path. If no location is +specified then this saves to the last path specified (initially '%s').""" % DEFAULT_WRITE_PATH + +HELP_EVENTS = """Provides events that we've received belonging to the given event types. If +no types are specified then this provides all the messages that we've +received.""" + +HELP_INFO = """Provides general information for a relay that's currently in the consensus. +If no relay is specified then this provides information on ourselves.""" + +HELP_FIND = """Searches the backlog for lines matching a given regular expression pattern. +Results are deduplicated and the matching portions bolded.""" + +HELP_QUIT = """Terminates the interpretor.""" + +HELP_GETINFO = """Queries the tor process for information. Options are... +""" + +HELP_GETCONF = """Provides the current value for a given configuration value. Options include... +""" + +HELP_SETCONF = """Sets the given configuration parameters. Values can be quoted or non-quoted +strings, and reverts the option to 0 or NULL if not provided. + +Examples: + * Sets a contact address and resets our family to NULL + SETCONF MyFamily ContactInfo=foo(a)bar.com + + * Sets an exit policy that only includes port 80/443 + SETCONF ExitPolicy=\"accept *:80, accept *:443, reject *:*\"""" + +HELP_RESETCONF = """Reverts the given configuration options to their default values. If a value +is provided then this behaves in the same way as SETCONF. + +Examples: + * Returns both of our accounting parameters to their defaults + RESETCONF AccountingMax AccountingStart + + * Uses the default exit policy and sets our nickname to be 'Goomba' + RESETCONF ExitPolicy Nickname=Goomba""" + +HELP_SIGNAL = """Issues a signal that tells the tor process to reload its torrc, dump its +stats, halt, etc. +""" + +SIGNAL_DESCRIPTIONS = ( + ("RELOAD / HUP", "reload our torrc"), + ("SHUTDOWN / INT", "gracefully shut down, waiting 30 seconds if we're a relay"), + ("DUMP / USR1", "logs information about open connections and circuits"), + ("DEBUG / USR2", "makes us log at the DEBUG runlevel"), + ("HALT / TERM", "immediately shut down"), + ("CLEARDNSCACHE", "clears any cached DNS results"), + ("NEWNYM", "clears the DNS cache and uses new circuits for future connections") +) + +HELP_SETEVENTS = """Sets the events that we will receive. This turns off any events that aren't +listed so sending 'SETEVENTS' without any values will turn off all event reporting. + +For Tor versions between 0.1.1.9 and 0.2.2.1 adding 'EXTENDED' causes some +events to give us additional information. After version 0.2.2.1 this is +always on. + +Events include... +""" + +HELP_USEFEATURE = """Customizes the behavior of the control port. Options include... +""" + +HELP_SAVECONF = """Writes Tor's current configuration to its torrc.""" + +HELP_LOADCONF = """Reads the given text like it belonged to our torrc. + +Example: + +LOADCONF + # sets our exit policy to just accept ports 80 and 443 + ExitPolicy accept *:80 + ExitPolicy accept *:443 + ExitPolicy reject *:* + .""" + +HELP_MAPADDRESS = """Replaces future requests for one address with another. + +Example: + MAPADDRESS 0.0.0.0=torproject.org 1.2.3.4=tor.freehaven.net""" + +HELP_POSTDESCRIPTOR = """Simulates getting a new relay descriptor.""" + +HELP_EXTENDCIRCUIT = """Extends the given circuit or create a new one if the CircuitID is zero. The +PATH is a comma separated list of fingerprints. If it isn't set then this +uses Tor's normal path selection.""" + +HELP_SETCIRCUITPURPOSE = """Sets the purpose attribute for a circuit.""" + +HELP_CLOSECIRCUIT = """Closes the given circuit. If "IfUnused" is included then this only closes +the circuit if it isn't currently being used.""" + +HELP_ATTACHSTREAM = """Attaches a stream with the given built circuit (tor picks one on its own if +CircuitID is zero). If HopNum is given then this hop is used to exit the +circuit, otherwise the last relay is used.""" + +HELP_REDIRECTSTREAM = """Sets the destination for a given stream. This can only be done after a +stream is created but before it's attached to a circuit.""" + +HELP_CLOSESTREAM = """Closes the given stream, the reason being an integer matching a reason as +per section 6.3 of the tor-spec.""" + +HELP_RESOLVE = """Performs IPv4 DNS resolution over tor, doing a reverse lookup instead if +"mode=reverse" is included. This request is processed in the background and +results in a ADDRMAP event with the response.""" + +HELP_TAKEOWNERSHIP = """Instructs Tor to gracefully shut down when this control connection is closed.""" + +HELP_PROTOCOLINFO = """Provides bootstrapping information that a controller might need when first +starting, like Tor's version and controller authentication. This can be done +before authenticating to the control port.""" + +HELP_OPTIONS = { + "HELP": ("/help [OPTION]", HELP_HELP), + "WRITE": ("/write [PATH]", HELP_WRITE), + "EVENTS": ("/events [types]", HELP_EVENTS), + "INFO": ("/info [relay fingerprint, nickname, or IP address]", HELP_INFO), + "FIND": ("/find PATTERN", HELP_FIND), + "QUIT": ("/quit", HELP_QUIT), + "GETINFO": ("GETINFO OPTION", HELP_GETINFO), + "GETCONF": ("GETCONF OPTION", HELP_GETCONF), + "SETCONF": ("SETCONF PARAM[=VALUE]", HELP_SETCONF), + "RESETCONF": ("RESETCONF PARAM[=VALUE]", HELP_RESETCONF), + "SIGNAL": ("SIGNAL SIG", HELP_SIGNAL), + "SETEVENTS": ("SETEVENTS [EXTENDED] [EVENTS]", HELP_SETEVENTS), + "USEFEATURE": ("USEFEATURE OPTION", HELP_USEFEATURE), + "SAVECONF": ("SAVECONF", HELP_SAVECONF), + "LOADCONF": ("LOADCONF...", HELP_LOADCONF), + "MAPADDRESS": ("MAPADDRESS SOURCE_ADDR=DESTINATION_ADDR", HELP_MAPADDRESS), + "POSTDESCRIPTOR": ("POSTDESCRIPTOR [purpose=general/controller/bridge] [cache=yes/no]...", HELP_POSTDESCRIPTOR), + "EXTENDCIRCUIT": ("EXTENDCIRCUIT CircuitID [PATH] [purpose=general/controller]", HELP_EXTENDCIRCUIT), + "SETCIRCUITPURPOSE": ("SETCIRCUITPURPOSE CircuitID purpose=general/controller", HELP_SETCIRCUITPURPOSE), + "CLOSECIRCUIT": ("CLOSECIRCUIT CircuitID [IfUnused]", HELP_CLOSECIRCUIT), + "ATTACHSTREAM": ("ATTACHSTREAM StreamID CircuitID [HOP=HopNum]", HELP_ATTACHSTREAM), + "REDIRECTSTREAM": ("REDIRECTSTREAM StreamID Address [Port]", HELP_REDIRECTSTREAM), + "CLOSESTREAM": ("CLOSESTREAM StreamID Reason [Flag]", HELP_CLOSESTREAM), + "RESOLVE": ("RESOLVE [mode=reverse] address", HELP_RESOLVE), + "TAKEOWNERSHIP": ("TAKEOWNERSHIP", HELP_TAKEOWNERSHIP), + "PROTOCOLINFO": ("PROTOCOLINFO [ProtocolVersion]", HELP_PROTOCOLINFO), +} + +class ControlInterpreter: """ - Processes the given input. Requests starting with a '/' are special - commands to the interpretor, and anything else is sent to the control port. - This returns an input/output tuple, each entry being a list of lines, each - line having a list of (msg, format) tuples for the content to be displayed. - This raises a InterpretorClosed if the interpretor should be shut down. - - Arguments: - user_input - user input to be processed + Interpretor that handles queries to the control port, providing usability + imporvements like irc style help optoins. This tracks input and responses. """ - user_input = user_input.strip() + def do_help(self, arg, output_entry): + """ + Performs the '/help' operation, giving usage information for the given + argument or a general summary if there wasn't one. + """ - input_entry, output_entry = [], [] + arg = arg.upper() - if " " in user_input: cmd, arg = user_input.split(" ", 1) - else: cmd, arg = user_input, "" + # If there's multiple arguments then just take the first. This is + # particularly likely if they're trying to query a full command (for + # instance "/help GETINFO version") + arg = arg.split(" ")[0] + + # strip slash if someone enters an interpretor command (ex. "/help /help") + if arg.startswith("/"): arg = arg[1:] - if cmd.startswith("/"): - input_entry.append((cmd, MAGENTA, BOLD)) - if cmd == "/quit": raise InterpreterClosed() - else: - output_entry.append(("Not yet implemented...", RED, BOLD)) - else: - cmd = cmd.upper() - input_entry.append((cmd + " ", GREEN, BOLD)) if arg: - input_entry.append((arg, CYAN, BOLD)) + if arg in HELP_OPTIONS: + # Provides information for the tor or interpretor argument. This bolds + # the usage information and indents the description after it. + usage, description = HELP_OPTIONS[arg] + + output_entry.append([(usage, BLUE, BOLD)]) + + for line in description.split("\n"): + output_entry.append([(" " + line, BLUE, )]) + else: + # provides the GENERAL_HELP with everything bolded except descriptions + for line in GENERAL_HELP.split("\n"): + cmd_start = line.find(" - ") + if cmd_start != -1: + output_entry.append([(line[:cmd_start], BLUE, BOLD), (line[cmd_start:], BLUE, )]) + else: + output_entry.append([(line, BLUE, BOLD)]) + + def handle_query(self, user_input): + """ + Processes the given input. Requests starting with a '/' are special + commands to the interpretor, and anything else is sent to the control port. + This returns an input/output tuple, each entry being a list of lines, each + line having a list of (msg, format) tuples for the content to be displayed. + This raises a InterpretorClosed if the interpretor should be shut down. + + Arguments: + user_input - user input to be processed + """ + + user_input = user_input.strip() + + input_entry, output_entry = [], [] + + if " " in user_input: cmd, arg = user_input.split(" ", 1) + else: cmd, arg = user_input, "" + + if cmd.startswith("/"): + input_entry.append((cmd, MAGENTA, BOLD)) + if cmd == "/quit": raise InterpreterClosed() + elif cmd == "/help": self.do_help(arg, output_entry) + else: + output_entry.append([("Not yet implemented...", RED, BOLD)]) + else: + cmd = cmd.upper() + input_entry.append((cmd + " ", GREEN, BOLD)) + if arg: + input_entry.append((arg, CYAN, BOLD)) - if cmd == "GETINFO": - resp = tor_controller().get_info(arg) - for line in resp.split('\n'): - output_entry.append((line, CYAN,)) + if cmd == "GETINFO": + resp = tor_controller().get_info(arg) + for line in resp.split('\n'): + output_entry.append([(line, CYAN,)]) - return input_entry, output_entry + return input_entry, output_entry class InterpreterClosed(Exception):

1 0

[nyx/master] Console error and added backlog
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 0ba6a57e1e9eba3e819ed5f1566b985a5c9d4111 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Wed Jun 29 22:29:28 2016 -0700 Console error and added backlog --- nyx/panel/interpreter.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 882ab01..6b79770 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -3,11 +3,14 @@ Panel providing raw control port access with syntax hilighting, usage information, tab completion, and other usability features. """ +import code import curses import nyx.controller import nyx.curses import re +import sys +from cStringIO import StringIO from mock import patch from nyx.curses import BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BOLD, HIGHLIGHT, NORMAL from nyx import panel @@ -22,6 +25,7 @@ PROMPT = '>>> ' PROMPT_LINE = [[(PROMPT, GREEN, BOLD), (USAGE_INFO, CYAN, BOLD)]] ANSI_RE = re.compile('\\x1b\[([0-9;]*)m') ATTRS = {'0': NORMAL, '1': BOLD, '30': BLACK, '31': RED, '32': GREEN, '33': YELLOW, '34': BLUE, '35': MAGENTA, '36': CYAN} +BACKLOG_LIMIT = 100 def ansi_to_output(line, attrs): @@ -49,7 +53,6 @@ def format_input(user_input): if cmd.startswith('/'): output.append((user_input, MAGENTA, BOLD)) else: - cmd = cmd.upper() output.append((cmd + ' ', GREEN, BOLD)) if arg: output.append((arg, CYAN, BOLD)) @@ -70,6 +73,7 @@ class InterpreterPanel(panel.Panel): self._last_content_height = 0 self._x_offset = 0 self._scroller = nyx.curses.Scroller() + self._backlog = [] self.controller = stem.connection.connect( control_port = ('127.0.0.1', 'default'), control_socket = '/var/run/tor/control', @@ -98,11 +102,27 @@ class InterpreterPanel(panel.Panel): if not user_input: is_done = True else: + self._backlog.append(user_input) + backlog_crop = len(self._backlog) - BACKLOG_LIMIT + if backlog_crop > 0: + raise Exception(self._backlog) + self._backlog = self._backlog[backlog_crop:] + try: + console_called = False with patch('stem.interpreter.commands.code.InteractiveConsole.push') as console_push: response = self.interpreter.run_command(user_input) if console_push.called: - response = '\x1b[31;1m\'' + user_input + '\' isn\'t a recognized command\n' + console_called = True + + if console_called: + old_stderr = sys.stderr + sys.stderr = new_stderr = StringIO() + interactive_console = code.InteractiveConsole() + interactive_console.push(user_input) + sys.stderr = old_stderr + response = '\x1b[31;1m' + new_stderr.getvalue() + sys.stderr = old_stderr if response: PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) attrs = []

1 0

[nyx/master] Updated code to support recent commits
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 18435c44b17cb9b4f008ac5307998dc0bd900fa8 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue Jul 5 23:50:55 2016 -0700 Updated code to support recent commits --- nyx/panel/__init__.py | 1 + nyx/panel/interpreter.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index ec13aaf..decb276 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -37,6 +37,7 @@ __all__ = [ 'connection', 'graph', 'header', + 'interpreter', 'log', 'torrc', ] diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index e9e004c..88affb2 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -143,12 +143,12 @@ class InterpreterPanel(panel.Panel): nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), ) - def draw(self, width, height): - scroll = self._scroller.location(self._last_content_height, height) + def draw(self, subwindow): + scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) - if self._last_content_height > height - 1: + if self._last_content_height > subwindow.height - 1: self._x_offset = 2 - self.add_scroll_bar(scroll, scroll + height, self._last_content_height, 1) + subwindow.scrollbar(1, scroll, self._last_content_height - 1) y = 1 - scroll for entry in PROMPT_LINE: @@ -156,9 +156,9 @@ class InterpreterPanel(panel.Panel): for line in entry: if len(line) == 2: - self.addstr(y, cursor, line[0], line[1]) + subwindow.addstr(cursor, y, line[0], line[1]) elif len(line) == 3: - self.addstr(y, cursor, line[0], line[1], line[2]) + subwindow.addstr(cursor, y, line[0], line[1], line[2]) try: cursor += len(line[0]) except: @@ -166,11 +166,11 @@ class InterpreterPanel(panel.Panel): y += 1 - self.addstr(0, 0, ' ' * width) + subwindow.addstr(0, 0, ' ' * subwindow.width) usage_msg = ' (enter \"/help\" for usage or a blank line to stop)' if self._is_input_mode else "" - self.addstr(0, 0, 'Control Interpreter%s:' % usage_msg, HIGHLIGHT) + subwindow.addstr(0, 0, 'Control Interpreter%s:' % usage_msg, HIGHLIGHT) - new_content_height = y + scroll + new_content_height = y + scroll - 1 if new_content_height != self._last_content_height: self._last_content_height = new_content_height self.redraw(True)

1 0

← Newer
1
2
3
4
5
6
7
...
128
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2016