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

[nyx/master] Clear first line
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 63f39b84c1ddadc31d9235b1350f8f57c0a7caa2 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 23:27:52 2016 -0700 Clear first line --- nyx/panel/interpreter.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 62ece1d..c60b3f8 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -112,9 +112,6 @@ class InterpreterPanel(panel.Panel): def draw(self, width, 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) - if self._last_content_height > height - 1: self._x_offset = 2 self.add_scroll_bar(scroll, scroll + height, self._last_content_height, 1) @@ -135,6 +132,10 @@ class InterpreterPanel(panel.Panel): y += 1 + self.addstr(0, 0, ' ' * 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) + new_content_height = y + scroll if new_content_height != self._last_content_height: self._last_content_height = new_content_height

1 0

[nyx/master] Added history validation in interpreter panel
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit d9bfc5df053567b3e3df55b46c0666a7a7486188 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jul 2 01:34:52 2016 -0700 Added history validation in interpreter panel --- nyx/curses.py | 39 +++++++++++++++++++++++++++++++++++++-- nyx/panel/interpreter.py | 2 +- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 53a2c43..21b7a42 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -244,7 +244,7 @@ def key_input(input_timeout = None): return KeyInput(CURSES_SCREEN.getch()) -def str_input(x, y, initial_text = ''): +def str_input(x, y, initial_text = '', backlog=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 @@ -284,6 +284,38 @@ def str_input(x, y, initial_text = ''): else: return key + history_dict = {'selection_index': -1, 'custom_input': ''} + + 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 + + new_selection = max(-1, new_selection) + new_selection = min(len(backlog) - 1, new_selection) + + if history_dict['selection_index'] == new_selection: + return None + + if history_dict['selection_index'] == -1: + history_dict['custom_input'] = textbox.gather().strip() + + if new_selection == -1: + new_input = history_dict['custom_input'] + else: + new_input = backlog[new_selection] + + 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 handle_key(textbox, key) + with CURSES_LOCK: if HALT_ACTIVITY: return None @@ -300,7 +332,10 @@ def str_input(x, y, initial_text = ''): curses_subwindow.addstr(0, 0, initial_text[:width - 1]) textbox = curses.textpad.Textbox(curses_subwindow, insert_mode = True) - user_input = textbox.edit(lambda key: handle_key(textbox, key)).strip() + if 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() try: curses.curs_set(0) # hide cursor diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 6b79770..8a48b34 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -96,7 +96,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:])) + user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.top + len(PROMPT_LINE[-page_height:]), '', list(reversed(self._backlog))) user_input, is_done = user_input.strip(), False if not user_input:

1 0

[nyx/master] Added function for converting ansi to output
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 18630367ca955e31fcd514a269c3a65e13180ef8 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 12:16:22 2016 -0700 Added function for converting ansi to output --- nyx/panel/interpreter.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 85efb02..bc5da76 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -20,6 +20,19 @@ 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} +def ansi_to_output(line, attrs): + ansi_re = ANSI_RE.findall(line) + new_attrs = [] + + if line.find("\x1b[") == 0 and ansi_re: + 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 + + class InterpreterPanel(panel.Panel): """ Renders the interpreter panel with a prompt providing raw control port @@ -55,14 +68,8 @@ class InterpreterPanel(panel.Panel): PROMPT_LINE.insert(len(PROMPT_LINE) - 1, [(PROMPT, GREEN, BOLD), (user_input)]) attrs = [] for line in response.split('\n'): - new_attrs = [] - ansi_re = ANSI_RE.findall(line) - if line.find("\x1b[") == 0 and ansi_re: - for attr in ansi_re[0].split(';'): - new_attrs.append(ATTRS[attr]) - attrs = new_attrs - line = ANSI_RE.sub('', line) - PROMPT_LINE.insert(len(PROMPT_LINE) - 1, [(line, ) + tuple(attrs)]) + line, attrs = ansi_to_output(line, attrs) + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, line) if is_done: self._is_input_mode = False

1 0

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

31 Jul '16

commit f50763bdb48b61e6a22e63ffa3d9b85523a94007 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jul 17 23:43:01 2016 -0700 Added tests for str_input_handle_* functions --- test/panel/interpreter.py | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index a3ddd5e..5a793ca 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -4,10 +4,14 @@ Unit tests for nyx.panel.interpreter. import unittest +import curses +import curses.ascii import nyx.curses import nyx.panel.interpreter import test +from mock import call, Mock, patch + EXPECTED_PANEL = """ Control Interpreter: >>> to use this panel press enter @@ -90,3 +94,80 @@ class TestInterpreter(unittest.TestCase): self.assertEqual(2, len(output)) self.assertEqual('enter', output[0].key) self.assertEqual('arrows', output[1].key) + + def test_str_input_handle_key(self): + dimensions = (40, 80) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 27)) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.move = Mock() + expected_call = call(dimensions[0], 0) + nyx.curses.str_input_handle_key(textbox, curses.KEY_HOME) + self.assertTrue(textbox.win.move.called) + self.assertEquals(expected_call, textbox.win.move.call_args) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.gather.return_value = 'Sample Text' + textbox.win.move = Mock() + expected_call = call(*dimensions) + nyx.curses.str_input_handle_key(textbox, curses.KEY_RIGHT) + self.assertTrue(textbox.win.move.called) + self.assertEquals(expected_call, textbox.win.move.call_args) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 410)) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + key_pressed = ord('a') + self.assertEqual(key_pressed, nyx.curses.str_input_handle_key(textbox, key_pressed)) + + @patch('nyx.curses.str_input_handle_key') + def test_str_input_handle_history_key(self, mock_str_input_handle_key): + backlog = ['GETINFO version'] + dimensions = (40, 80) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertIsNone(nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, [])) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.getmaxyx.return_value = dimensions + textbox.win.addstr = Mock() + textbox.win.move = Mock() + nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, backlog) + self.assertTrue(textbox.win.clear.called) + expected_addstr_call = call(dimensions[0], 0, backlog[0]) + self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) + expected_move_call = call(dimensions[0], len(backlog[0])) + self.assertEqual(expected_move_call, textbox.win.move.call_args) + + textbox = Mock() + nyx.curses.str_input_handle_history_key(textbox, curses.KEY_LEFT, []) + self.assertTrue(mock_str_input_handle_key.called) + + @patch('nyx.curses.str_input_handle_history_key') + def test_str_input_handle_tab_completion(self, mock_str_input_handle_history_key): + dimensions = (40, 80) + tab_completion_content = 'GETINFO version' + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.getmaxyx.return_value = dimensions + textbox.win.addstr = Mock() + textbox.win.move = Mock() + tab_completion = Mock() + tab_completion.return_value = [tab_completion_content] + nyx.curses.str_input_handle_tab_completion(textbox, 9, [], tab_completion) + self.assertTrue(textbox.win.clear.called) + expected_addstr_call = call(dimensions[0], 0, tab_completion_content) + self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) + expected_move_call = call(dimensions[0], len(tab_completion_content)) + self.assertTrue(expected_move_call, textbox.win.move.call_args)

1 0

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

31 Jul '16

commit 0e2a6445b2252e01acd971f444ccf095f6c40756 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 26 13:33:51 2016 -0700 Added tests for interpreter panel --- nyx/panel/interpreter.py | 2 +- test/panel/__init__.py | 1 + test/panel/interpreter.py | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index f6cd1c2..882ab01 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -102,7 +102,7 @@ class InterpreterPanel(panel.Panel): 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' + response = '\x1b[31;1m\'' + user_input + '\' isn\'t a recognized command\n' if response: PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) attrs = [] diff --git a/test/panel/__init__.py b/test/panel/__init__.py index 579da3f..4faf6e0 100644 --- a/test/panel/__init__.py +++ b/test/panel/__init__.py @@ -5,6 +5,7 @@ Unit tests for nyx's panel modules. __all__ = [ 'header', 'graph', + 'interpreter', 'log', 'connection', 'config', diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py new file mode 100644 index 0000000..054aeff --- /dev/null +++ b/test/panel/interpreter.py @@ -0,0 +1,18 @@ +""" +Unit tests for nyx.panel.interpreter. +""" + +import unittest + +import nyx.panel.interpreter + + +class TestInterpreter(unittest.TestCase): + def test_ansi_to_output(self): + ansi_text = '\x1b[32;1mthis is some sample text' + output_line, attrs = nyx.panel.interpreter.ansi_to_output(ansi_text, []) + + self.assertEqual('this is some sample text', output_line[0][0]) + self.assertEqual('Green', output_line[0][1]) + self.assertEqual('Bold', output_line[0][2]) + self.assertEqual(['Green', 'Bold'], attrs)

1 0

[nyx/master] Moved curses tests to subwindow.py
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 0a9fafa62c2857e781e7ba3598f422ceeb65e61a Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Mon Jul 18 19:27:10 2016 -0700 Moved curses tests to subwindow.py --- nyx/panel/interpreter.py | 10 ++--- test/panel/interpreter.py | 95 +++-------------------------------------------- test/subwindow.py | 83 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 95 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 9839e90..dfd7480 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -67,7 +67,7 @@ class InterpreterPanel(panel.Panel): """ def __init__(self): - panel.Panel.__init__(self, 'interpreter') + panel.Panel.__init__(self) self._is_input_mode = False self._last_content_height = 0 @@ -85,7 +85,7 @@ class InterpreterPanel(panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: @@ -97,8 +97,8 @@ class InterpreterPanel(panel.Panel): while self._is_input_mode: 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(self.prompt_line[-page_height:]), '', list(reversed(self._backlog)), self.autocompleter.matches) + page_height = self.get_height() - 1 + user_input = nyx.curses.str_input(len(PROMPT) + self._x_offset, self.get_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: @@ -143,7 +143,7 @@ class InterpreterPanel(panel.Panel): nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), ) - def draw(self, subwindow): + def _draw(self, subwindow): scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) if self._last_content_height > subwindow.height - 1: diff --git a/test/panel/interpreter.py b/test/panel/interpreter.py index 5a793ca..5383777 100644 --- a/test/panel/interpreter.py +++ b/test/panel/interpreter.py @@ -4,14 +4,10 @@ Unit tests for nyx.panel.interpreter. import unittest -import curses -import curses.ascii import nyx.curses import nyx.panel.interpreter import test -from mock import call, Mock, patch - EXPECTED_PANEL = """ Control Interpreter: >>> to use this panel press enter @@ -61,30 +57,26 @@ class TestInterpreter(unittest.TestCase): 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) + 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) + 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) + 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] + height = panel.get_height() panel._last_content_height = height - output_lines = test.render(panel.draw).content.split('\n') + output_lines = test.render(panel._draw).content.split('\n') self.assertEqual(height, len(output_lines)) self.assertEqual(EXPECTED_SCROLLBAR_PANEL, output_lines[1]) @@ -94,80 +86,3 @@ class TestInterpreter(unittest.TestCase): self.assertEqual(2, len(output)) self.assertEqual('enter', output[0].key) self.assertEqual('arrows', output[1].key) - - def test_str_input_handle_key(self): - dimensions = (40, 80) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 27)) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.win.move = Mock() - expected_call = call(dimensions[0], 0) - nyx.curses.str_input_handle_key(textbox, curses.KEY_HOME) - self.assertTrue(textbox.win.move.called) - self.assertEquals(expected_call, textbox.win.move.call_args) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.gather.return_value = 'Sample Text' - textbox.win.move = Mock() - expected_call = call(*dimensions) - nyx.curses.str_input_handle_key(textbox, curses.KEY_RIGHT) - self.assertTrue(textbox.win.move.called) - self.assertEquals(expected_call, textbox.win.move.call_args) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 410)) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - key_pressed = ord('a') - self.assertEqual(key_pressed, nyx.curses.str_input_handle_key(textbox, key_pressed)) - - @patch('nyx.curses.str_input_handle_key') - def test_str_input_handle_history_key(self, mock_str_input_handle_key): - backlog = ['GETINFO version'] - dimensions = (40, 80) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - self.assertIsNone(nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, [])) - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.win.getmaxyx.return_value = dimensions - textbox.win.addstr = Mock() - textbox.win.move = Mock() - nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, backlog) - self.assertTrue(textbox.win.clear.called) - expected_addstr_call = call(dimensions[0], 0, backlog[0]) - self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) - expected_move_call = call(dimensions[0], len(backlog[0])) - self.assertEqual(expected_move_call, textbox.win.move.call_args) - - textbox = Mock() - nyx.curses.str_input_handle_history_key(textbox, curses.KEY_LEFT, []) - self.assertTrue(mock_str_input_handle_key.called) - - @patch('nyx.curses.str_input_handle_history_key') - def test_str_input_handle_tab_completion(self, mock_str_input_handle_history_key): - dimensions = (40, 80) - tab_completion_content = 'GETINFO version' - - textbox = Mock() - textbox.win.getyx.return_value = dimensions - textbox.win.getmaxyx.return_value = dimensions - textbox.win.addstr = Mock() - textbox.win.move = Mock() - tab_completion = Mock() - tab_completion.return_value = [tab_completion_content] - nyx.curses.str_input_handle_tab_completion(textbox, 9, [], tab_completion) - self.assertTrue(textbox.win.clear.called) - expected_addstr_call = call(dimensions[0], 0, tab_completion_content) - self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) - expected_move_call = call(dimensions[0], len(tab_completion_content)) - self.assertTrue(expected_move_call, textbox.win.move.call_args) diff --git a/test/subwindow.py b/test/subwindow.py index 7f428e2..0f6f6a6 100644 --- a/test/subwindow.py +++ b/test/subwindow.py @@ -5,8 +5,14 @@ Unit tests for nyx.curses. Not entirely sure why this file can't be called import unittest +import curses +import curses.ascii +import nyx.curses +import nyx.panel.interpreter import test +from mock import call, Mock, patch + from test import require_curses EXPECTED_ADDSTR_WRAP = """ @@ -116,3 +122,80 @@ class TestCurses(unittest.TestCase): subwindow.scrollbar(15, 21, 30, fill_char = '*') self.assertEqual(EXPECTED_SCROLLBAR_BOTTOM, test.render(_draw).content.strip()) + + def test_str_input_handle_key(self): + dimensions = (40, 80) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 27)) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.move = Mock() + expected_call = call(dimensions[0], 0) + nyx.curses.str_input_handle_key(textbox, curses.KEY_HOME) + self.assertTrue(textbox.win.move.called) + self.assertEquals(expected_call, textbox.win.move.call_args) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.gather.return_value = 'Sample Text' + textbox.win.move = Mock() + expected_call = call(*dimensions) + nyx.curses.str_input_handle_key(textbox, curses.KEY_RIGHT) + self.assertTrue(textbox.win.move.called) + self.assertEquals(expected_call, textbox.win.move.call_args) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertEqual(curses.ascii.BEL, nyx.curses.str_input_handle_key(textbox, 410)) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + key_pressed = ord('a') + self.assertEqual(key_pressed, nyx.curses.str_input_handle_key(textbox, key_pressed)) + + @patch('nyx.curses.str_input_handle_key') + def test_str_input_handle_history_key(self, mock_str_input_handle_key): + backlog = ['GETINFO version'] + dimensions = (40, 80) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + self.assertIsNone(nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, [])) + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.getmaxyx.return_value = dimensions + textbox.win.addstr = Mock() + textbox.win.move = Mock() + nyx.curses.str_input_handle_history_key(textbox, curses.KEY_UP, backlog) + self.assertTrue(textbox.win.clear.called) + expected_addstr_call = call(dimensions[0], 0, backlog[0]) + self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) + expected_move_call = call(dimensions[0], len(backlog[0])) + self.assertEqual(expected_move_call, textbox.win.move.call_args) + + textbox = Mock() + nyx.curses.str_input_handle_history_key(textbox, curses.KEY_LEFT, []) + self.assertTrue(mock_str_input_handle_key.called) + + @patch('nyx.curses.str_input_handle_history_key') + def test_str_input_handle_tab_completion(self, mock_str_input_handle_history_key): + dimensions = (40, 80) + tab_completion_content = 'GETINFO version' + + textbox = Mock() + textbox.win.getyx.return_value = dimensions + textbox.win.getmaxyx.return_value = dimensions + textbox.win.addstr = Mock() + textbox.win.move = Mock() + tab_completion = Mock() + tab_completion.return_value = [tab_completion_content] + nyx.curses.str_input_handle_tab_completion(textbox, 9, [], tab_completion) + self.assertTrue(textbox.win.clear.called) + expected_addstr_call = call(dimensions[0], 0, tab_completion_content) + self.assertEqual(expected_addstr_call, textbox.win.addstr.call_args) + expected_move_call = call(dimensions[0], len(tab_completion_content)) + self.assertTrue(expected_move_call, textbox.win.move.call_args)

1 0

[nyx/master] Nyx tor interpreter now uses Stem's tor interpretor methods
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 89e9ff7f8af12a3f9b5c4d6ad553825ecf8d281a Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 00:36:06 2016 -0700 Nyx tor interpreter now uses Stem's tor interpretor methods --- nyx/panel/interpreter.py | 56 ++++++--- nyx/tor_interpreter.py | 310 ----------------------------------------------- 2 files changed, 39 insertions(+), 327 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 0c5d8c6..85efb02 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -5,14 +5,20 @@ information, tab completion, and other usability features. import nyx.controller import nyx.curses +import re -from nyx.curses import GREEN, CYAN, BOLD, HIGHLIGHT +from nyx.curses import BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, BOLD, HIGHLIGHT, NORMAL from nyx import panel, tor_interpreter +import stem.connection +import stem.interpreter.commands -USAGE_INFO = "to use this panel press enter" -PROMPT = ">>> " + +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} class InterpreterPanel(panel.Panel): """ @@ -24,7 +30,12 @@ class InterpreterPanel(panel.Panel): panel.Panel.__init__(self, 'interpreter') self._is_input_mode = False - self.interpreter = tor_interpreter.ControlInterpreter() + self.controller = stem.connection.connect( + control_port = ('127.0.0.1', 'default'), + control_socket = '/var/run/tor/control', + password_prompt = True, + ) + self.interpreter = stem.interpreter.commands.ControlInterpretor(self.controller) def key_handlers(self): def _execute_command(): @@ -37,15 +48,21 @@ class InterpreterPanel(panel.Panel): if not user_input: is_done = True - else: - try: - 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 tor_interpreter.InterpreterClosed: - 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'): + new_attrs = [] + ansi_re = ANSI_RE.findall(line) + if line.find("\x1b[") == 0 and ansi_re: + for attr in ansi_re[0].split(';'): + new_attrs.append(ATTRS[attr]) + attrs = new_attrs + line = ANSI_RE.sub('', line) + PROMPT_LINE.insert(len(PROMPT_LINE) - 1, [(line, ) + tuple(attrs)]) if is_done: self._is_input_mode = False @@ -56,7 +73,7 @@ class InterpreterPanel(panel.Panel): ) def draw(self, width, height): - usage_msg = " (enter \"/help\" for usage or a blank line to stop)" if self._is_input_mode else "" + 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 @@ -64,12 +81,17 @@ class InterpreterPanel(panel.Panel): for entry in PROMPT_LINE: cursor = x_offset - msg, color, attr = None, None, None for line in entry: - if len(line) == 2: + if len(line) == 1: + self.addstr(draw_line, cursor, line[0]) + elif len(line) == 2: self.addstr(draw_line, cursor, line[0], line[1]) elif len(line) == 3: self.addstr(draw_line, cursor, line[0], line[1], line[2]) - cursor += len(line[0]) + self.addstr(draw_line, cursor, line) + try: + cursor += len(line[0]) + except: + pass draw_line += 1 diff --git a/nyx/tor_interpreter.py b/nyx/tor_interpreter.py deleted file mode 100644 index 7b59a36..0000000 --- a/nyx/tor_interpreter.py +++ /dev/null @@ -1,310 +0,0 @@ -from nyx.curses import GREEN, CYAN, RED, MAGENTA, BLUE, BOLD, HIGHLIGHT -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 - /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: - """ - Interpretor that handles queries to the control port, providing usability - imporvements like irc style help optoins. This tracks input and responses. - """ - - 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. - """ - - arg = arg.upper() - - # 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 arg: - 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, )]) - - 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"): - 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((user_input, 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,)]) - - return input_entry, output_entry - - -class InterpreterClosed(Exception): - """ - Exception raised when the interpreter should be shut down. - """ - - pass

1 0

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

31 Jul '16

commit f39349c83e77040654d4d217b907241ba74c382a Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jul 16 14:12:26 2016 -0700 Added comments to str_input functions --- nyx/curses.py | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/nyx/curses.py b/nyx/curses.py index b4c34f2..2bd9c06 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -14,6 +14,9 @@ if we want Windows support in the future too. start - initializes curses with the given function raw_screen - provides direct access to the curses screen key_input - get keypress by user + str_input_handle_key - helper function to display content in text field + str_input_handle_history_key - handle up/down arrow key in text field + str_input_handle_tab_completion - handle tab completion in text field str_input - text field where user can input a string curses_attr - curses encoded text attribute screen_size - provides the dimensions of our screen @@ -248,6 +251,14 @@ def key_input(input_timeout = None): def str_input_handle_key(textbox, key): + """ + Outputs the entered key onto the textbox. + + :param Textbox textbox: current textbox context + :param int key: key pressed + + :returns: **str** with the user input or **None** if the prompt is canceled + """ y, x = textbox.win.getyx() if key == 27: @@ -272,6 +283,17 @@ def str_input_handle_key(textbox, key): def str_input_handle_history_key(textbox, key, backlog): + """ + Handles history validation. When the up/down arrow keys are pressed, + the relative previous/next commands are shown. + + :param Textbox textbox: current textbox context + :param int key: key pressed + :param list backlog: backlog of all previous commands entered + + :returns: **None** if up/down arrow key is pressed or calls function + to write key to the textbox + """ global HISTORY_DICT if key in (curses.KEY_UP, curses.KEY_DOWN): offset = 1 if key == curses.KEY_UP else -1 @@ -304,6 +326,20 @@ def str_input_handle_history_key(textbox, key, backlog): def str_input_handle_tab_completion(textbox, key, backlog, tab_completion): + """ + Handles tab completion. If the tab key is pressed, the current textbox + contents are checked for probable commands. + + :param Textbox textbox: current textbox context + :param int key: key pressed + :param list backlog: backlog of all previous commands entered + :param Autocompleter.matches tab_completion: function to suggest probable + commands based on current content + + :returns: **None** when tab key is pressed or calls function to handle + history validation + """ + if key == 9: current_contents = textbox.gather().strip() matches = tab_completion(current_contents) @@ -342,7 +378,7 @@ def str_input(x, y, initial_text = '', backlog=None, tab_completion=None): :param int y: vertical location :param str initial_text: initial input of the field - :returns: **str** with the user input or **None** if the prompt is caneled + :returns: **str** with the user input or **None** if the prompt is canceled """ with CURSES_LOCK:

1 0

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

31 Jul '16

commit 7994d68175c9a248dfd835a4e4fb82cb2fb681af Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sat Jun 25 17:07:50 2016 -0700 Fixed scrollbar --- nyx/panel/interpreter.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index 2877501..62ece1d 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -3,6 +3,7 @@ Panel providing raw control port access with syntax hilighting, usage information, tab completion, and other usability features. """ +import curses import nyx.controller import nyx.curses import re @@ -18,14 +19,15 @@ 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} +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} + def ansi_to_output(line, attrs): ansi_re = ANSI_RE.findall(line) new_attrs = [] - if line.find("\x1b[") == 0 and ansi_re: + if line.find('\x1b[') == 0 and ansi_re: for attr in ansi_re[0].split(';'): new_attrs.append(ATTRS[attr]) attrs = new_attrs @@ -79,6 +81,7 @@ class InterpreterPanel(panel.Panel): while self._is_input_mode: 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:])) user_input, is_done = user_input.strip(), False @@ -88,7 +91,6 @@ class InterpreterPanel(panel.Panel): try: response = self.interpreter.run_command(user_input) - color = None if response: PROMPT_LINE.insert(len(PROMPT_LINE) - 1, format_input(user_input)) attrs = [] @@ -113,11 +115,11 @@ class InterpreterPanel(panel.Panel): 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 = self._last_content_height > height - 1 - if is_scrollbar_visible: + if self._last_content_height > height - 1: + self._x_offset = 2 self.add_scroll_bar(scroll, scroll + height, self._last_content_height, 1) - self._x_offset, y = 2 if is_scrollbar_visible else 0, 1 - scroll + y = 1 - scroll for entry in PROMPT_LINE: cursor = self._x_offset @@ -133,7 +135,7 @@ class InterpreterPanel(panel.Panel): y += 1 - new_content_height = y + scroll - 1 + new_content_height = y + scroll if new_content_height != self._last_content_height: self._last_content_height = new_content_height self.redraw(True)

1 0

[nyx/master] Improve format input
by atagar＠torproject.org 31 Jul '16

31 Jul '16

commit 2f224dd348e4175e2dd0912bc04657c8a400ef05 Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Sun Jun 26 01:18:17 2016 -0700 Improve format input --- nyx/panel/interpreter.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nyx/panel/interpreter.py b/nyx/panel/interpreter.py index c60b3f8..0937808 100644 --- a/nyx/panel/interpreter.py +++ b/nyx/panel/interpreter.py @@ -38,12 +38,20 @@ def ansi_to_output(line, 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)) + output = [(PROMPT, GREEN, BOLD)] + + if ' ' in user_input: + cmd, arg = user_input.split(' ', 1) + else: + cmd, arg = 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)) return output

1 0