- tor-commits - lists.torproject.org

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 8419943c05f794c4e01b179d51d51ade0f6445e1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:07 2016 +0000 Update translations for bridgedb_completed --- zh_HK/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 052ad76..d09da40 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-18 08:27+0000\n" +"PO-Revision-Date: 2016-04-19 06:53+0000\n" "Last-Translator: 大圈洋蔥\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接嘅方式係發送電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接嘅方式係電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟寄電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "橋接器無法正常運作，我需要幫助！" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果Tor洋蔥路由無法運作，可發送電郵到%s。" +msgstr "如果Tor洋蔥路由無法運作，可電郵到%s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Apr '16

19 Apr '16

commit 4f59ff22d03b5882532c0677ae3b344370473485 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 19 07:15:03 2016 +0000 Update translations for bridgedb --- zh_HK/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 052ad76..d09da40 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-04-18 08:27+0000\n" +"PO-Revision-Date: 2016-04-19 06:53+0000\n" "Last-Translator: 大圈洋蔥\n" "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n" "MIME-Version: 1.0\n" @@ -272,7 +272,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "另一取得橋接嘅方式係發送電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟發送電郵：\n%s、%s或%s。" +msgstr "另一取得橋接嘅方式係電郵到%s。請注意，你須\n使用下列電郵提供者嘅位址嚟寄電郵：\n%s、%s或%s。" #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "橋接器無法正常運作，我需要幫助！" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "如果Tor洋蔥路由無法運作，可發送電郵到%s。" +msgstr "如果Tor洋蔥路由無法運作，可電郵到%s。" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser".

1 0

[research-web/master] petsymposium is https now
by arma＠torproject.org 19 Apr '16

19 Apr '16

commit 643acc70f5c42b8df6c32183fa1a1eaade09ab58 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 18 21:50:54 2016 -0400 petsymposium is https now --- htdocs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/index.html b/htdocs/index.html index 4f77d2a..50921b7 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -112,7 +112,7 @@ really important. So let us know, and we'll work something out. <p> If you're interested in anonymity research, you must make it to the -<a href="http://petsymposium.org/">Privacy Enhancing Technologies +<a href="https://petsymposium.org/">Privacy Enhancing Technologies Symposium</a>. Everybody who's anybody in the anonymity research world will be there. Stipends are generally available for people whose presence will benefit the community.

1 0

[check/master] Add some translations
by arlo＠torproject.org 18 Apr '16

18 Apr '16

commit abca67d60674e9b93f6be6621cc86b0ef07218aa Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Apr 18 14:18:52 2016 -0700 Add some translations --- utils.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils.go b/utils.go index 0872c15..4d438d2 100644 --- a/utils.go +++ b/utils.go @@ -171,12 +171,14 @@ func GetLocaleList(base string) map[string]string { "hr_HR": "Hrvatski jezik (Croatia)", "hu": "Magyar", "id": "Bahasa Indonesia", + "is": "íslenska", "it": "Italiano", "ja": "日本語", "km": "មែរ", "kn": "ಕನ್ನಡ", "ko": "한국어", "ko_KR": "한국어 (South Korea)", + "lb": "Lëtzebuergesch", "lo": "ລາວ", "lv": "Latviešu valoda", "mk": "македонски јазик", @@ -208,6 +210,7 @@ func GetLocaleList(base string) map[string]string { "tr": "Türkçe", "uk": "українська мова", "zh_CN": "中文简体", + "zh_HK": "中文繁體", "zh_TW": "中文繁體", }

1 0

[nyx/master] Test overall header panel rendering
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit bcd498a464172ada4e760de20b6a7caf5d5c44a9 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 13:19:38 2016 -0700 Test overall header panel rendering --- nyx/panel/header.py | 2 +- test/__init__.py | 2 +- test/panel/header.py | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index a9712b4..d470ba1 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -175,7 +175,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): _draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) _draw_flags(subwindow, 0, 4, vals.flags) - _draw_status(subwindow, 0, subwindow.height - 1, self.is_paused(), self._message, *self._message_attr) + _draw_status(subwindow, 0, self.get_height() - 1, self.is_paused(), self._message, *self._message_attr) def reset_listener(self, controller, event_type, _): self._update() diff --git a/test/__init__.py b/test/__init__.py index 178b79d..3730254 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -71,7 +71,7 @@ def render(func, *args, **kwargs): func_args = inspect.getargspec(func).args - if func_args and func_args[0] == 'subwindow': + if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']: def _draw(subwindow): return func(subwindow, *args, **kwargs) diff --git a/test/panel/header.py b/test/panel/header.py index 58f700c..62d54af 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -16,8 +16,70 @@ import test from test import require_curses from mock import patch, Mock +EXPECTED_PANEL = """ +nyx - odin (Linux 3.5.0-54-generic) Tor 0.2.8.1-alpha-dev +Unnamed - 174.21.17.28:7000, Dir Port: 7001, Control Port (cookie): 7002 +cpu: 12.3% tor, 5.7% nyx mem: 11 MB (2.1%) pid: 765 +fingerprint: 1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B +flags: Running, Exit + +page 2 / 4 - m: menu, p: pause, h: page help, q: quit +""".strip() + + +def test_sampling(): + return nyx.panel.header.Sampling( + retrieved = 1234.5, + is_connected = True, + connection_time = 2345.6, + last_heartbeat = 3456.7, + + fingerprint = '1A94D1A794FCB2F8B6CBC179EF8FDD4008A98D3B', + nickname = 'Unnamed', + newnym_wait = None, + exit_policy = stem.exit_policy.ExitPolicy('reject *:*'), + flags = ['Running', 'Exit'], + + version = '0.2.8.1-alpha-dev', + version_status = 'unrecommended', + + address = '174.21.17.28', + or_port = '7000', + dir_port = '7001', + control_port = '7002', + socket_path = None, + is_relay = True, + + auth_type = 'cookie', + pid = '765', + start_time = 4567.8, + fd_limit = 100, + fd_used = 40, + + nyx_total_cpu_time = 100, + tor_cpu = '12.3', + nyx_cpu = '5.7', + memory = '11 MB', + memory_percent = '2.1', + + hostname = 'odin', + platform = 'Linux 3.5.0-54-generic', + ) + class TestHeader(unittest.TestCase): + @require_curses + @patch('nyx.controller.get_controller') + @patch('nyx.panel.header.tor_controller') + @patch('nyx.panel.header.Sampling.create') + def test_rendering_panel(self, sampling_mock, tor_controller_mock, nyx_controller_mock): + nyx_controller_mock().get_page.return_value = 1 + nyx_controller_mock().get_page_count.return_value = 4 + sampling_mock.return_value = test_sampling() + + panel = nyx.panel.header.HeaderPanel() + self.assertEqual(EXPECTED_PANEL, test.render(panel.draw).content) + @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') @patch('time.time', Mock(return_value = 1234.5))

1 0

[nyx/master] Finish and test header panel
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit c8b4852149e90786196d35a930ce18226f0587b7 Merge: 60a5765 bcd498a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 13:22:21 2016 -0700 Finish and test header panel On our first pass we left a few todo comments. Finishing these off and adding tests for panel rendering. Not perfect, but good enough as a template for the rest of our panels. nyx/arguments.py | 10 +- nyx/controller.py | 18 +- nyx/curses.py | 66 +++++ nyx/log.py | 14 +- nyx/panel/__init__.py | 200 ++++--------- nyx/panel/connection.py | 47 +--- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 621 +++++++++++++++++++---------------------- nyx/panel/log.py | 58 +--- nyx/panel/torrc.py | 2 +- nyx/settings/attributes.cfg | 4 +- nyx/tracker.py | 5 +- nyxrc.sample | 4 - test/__init__.py | 22 +- test/arguments.py | 12 +- test/log/condense_runlevels.py | 4 +- test/panel/__init__.py | 7 + test/panel/header.py | 349 +++++++++++++++++++++++ test/popups.py | 2 +- 19 files changed, 838 insertions(+), 609 deletions(-)

1 0

[nyx/master] Fix nyx event names in tests
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit c6a21afa3a6d182e6f16f8860c61a4490b5685ac Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 12:52:20 2016 -0700 Fix nyx event names in tests Oops, changed what our warning and error runlevels were but didn't update the tests. --- test/arguments.py | 12 ++++++------ test/log/condense_runlevels.py | 4 ++-- test/popups.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/arguments.py b/test/arguments.py index d27281c..76c6d38 100644 --- a/test/arguments.py +++ b/test/arguments.py @@ -68,7 +68,7 @@ class TestArgumentParsing(unittest.TestCase): class TestExpandEvents(unittest.TestCase): def test_examples(self): self.assertEqual(set(['INFO', 'NOTICE', 'UNKNOWN', 'TRANSPORT_LAUNCHED']), expand_events('inUt')) - self.assertEqual(set(['NOTICE', 'WARN', 'ERR', 'NYX_WARN', 'NYX_ERR']), expand_events('N4')) + self.assertEqual(set(['NOTICE', 'WARN', 'ERR', 'NYX_WARNING', 'NYX_ERROR']), expand_events('N4')) self.assertEqual(set(), expand_events('cfX')) def test_runlevel_expansion(self): @@ -78,11 +78,11 @@ class TestExpandEvents(unittest.TestCase): self.assertEqual(set(['WARN', 'ERR']), expand_events('W')) self.assertEqual(set(['ERR']), expand_events('E')) - self.assertEqual(set(['NYX_DEBUG', 'NYX_INFO', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('1')) - self.assertEqual(set(['NYX_INFO', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('2')) - self.assertEqual(set(['NYX_NOTICE', 'NYX_WARN', 'NYX_ERR']), expand_events('3')) - self.assertEqual(set(['NYX_WARN', 'NYX_ERR']), expand_events('4')) - self.assertEqual(set(['NYX_ERR']), expand_events('5')) + self.assertEqual(set(['NYX_DEBUG', 'NYX_INFO', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('1')) + self.assertEqual(set(['NYX_INFO', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('2')) + self.assertEqual(set(['NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR']), expand_events('3')) + self.assertEqual(set(['NYX_WARNING', 'NYX_ERROR']), expand_events('4')) + self.assertEqual(set(['NYX_ERROR']), expand_events('5')) def test_short_circuit_options(self): # Check that the 'A' and 'X' options short circuit normal parsing, diff --git a/test/log/condense_runlevels.py b/test/log/condense_runlevels.py index f7c831c..5c06d92 100644 --- a/test/log/condense_runlevels.py +++ b/test/log/condense_runlevels.py @@ -9,5 +9,5 @@ class TestCondenseRunlevels(unittest.TestCase): self.assertEqual(['BW'], condense_runlevels('BW')) self.assertEqual(['DEBUG', 'NOTICE', 'ERR'], condense_runlevels('DEBUG', 'NOTICE', 'ERR')) self.assertEqual(['DEBUG-NOTICE', 'NYX DEBUG-INFO'], condense_runlevels('DEBUG', 'NYX_DEBUG', 'INFO', 'NYX_INFO', 'NOTICE')) - self.assertEqual(['TOR/NYX NOTICE-ERR'], condense_runlevels('NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR')) - self.assertEqual(['DEBUG', 'TOR/NYX NOTICE-ERR', 'BW'], condense_runlevels('DEBUG', 'NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARN', 'NYX_ERR', 'BW')) + self.assertEqual(['TOR/NYX NOTICE-ERR'], condense_runlevels('NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR')) + self.assertEqual(['DEBUG', 'TOR/NYX NOTICE-ERR', 'BW'], condense_runlevels('DEBUG', 'NOTICE', 'WARN', 'ERR', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR', 'BW')) diff --git a/test/popups.py b/test/popups.py index f38cb45..d782b96 100644 --- a/test/popups.py +++ b/test/popups.py @@ -313,7 +313,7 @@ class TestPopups(unittest.TestCase): def test_select_event_types_with_input(self): rendered = test.render(nyx.popups.select_event_types) self.assertEqual(EXPECTED_EVENT_SELECTOR, rendered.content) - self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERR', 'NYX_WARN', 'NYX_NOTICE']), rendered.return_value) + self.assertEqual(set(['NYX_INFO', 'ERR', 'WARN', 'BW', 'NYX_ERROR', 'NYX_WARNING', 'NYX_NOTICE']), rendered.return_value) @require_curses @patch('nyx.popups._top', Mock(return_value = 0))

1 0

[nyx/master] Fix nyx error logging
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 26ded909760b5e143e8a6bf061b8fa9b1d44ef39 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Apr 18 11:33:43 2016 -0700 Fix nyx error logging Log messages at our error level weren't being displayed. This is because we logged them as 'NYX_ERROR' but expected 'NYX_ERR'. We were attempted to name our runlevels after tor but on reflection lets not - tor's names suck. Showing our actual runlevel names which are... * WARN => WARNING * ERR => ERROR --- nyx/arguments.py | 10 ++++------ nyx/log.py | 14 +++++++++++--- nyx/panel/log.py | 3 --- nyx/settings/attributes.cfg | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/nyx/arguments.py b/nyx/arguments.py index e70278b..ad8ea4a 100644 --- a/nyx/arguments.py +++ b/nyx/arguments.py @@ -10,6 +10,7 @@ import getopt import os import nyx +import nyx.log import stem.util.connection @@ -215,12 +216,9 @@ def expand_events(flags): expanded_events, invalid_flags = set(), '' - tor_runlevels = ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR'] - nyx_runlevels = ['NYX_' + runlevel for runlevel in tor_runlevels] - for flag in flags: if flag == 'A': - return set(list(TOR_EVENT_TYPES) + nyx_runlevels + ['UNKNOWN']) + return set(list(TOR_EVENT_TYPES) + nyx.log.NYX_RUNLEVELS + ['UNKNOWN']) elif flag == 'X': return set() elif flag in 'DINWE12345': @@ -238,9 +236,9 @@ def expand_events(flags): runlevel_index = 4 if flag in 'DINWE': - runlevels = tor_runlevels[runlevel_index:] + runlevels = nyx.log.TOR_RUNLEVELS[runlevel_index:] elif flag in '12345': - runlevels = nyx_runlevels[runlevel_index:] + runlevels = nyx.log.NYX_RUNLEVELS[runlevel_index:] expanded_events.update(set(runlevels)) elif flag == 'U': diff --git a/nyx/log.py b/nyx/log.py index ec09c3f..2a60a9e 100644 --- a/nyx/log.py +++ b/nyx/log.py @@ -61,6 +61,7 @@ except ImportError: from stem.util.lru_cache import lru_cache TOR_RUNLEVELS = ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR'] +NYX_RUNLEVELS = ['NYX_DEBUG', 'NYX_INFO', 'NYX_NOTICE', 'NYX_WARNING', 'NYX_ERROR'] TIMEZONE_OFFSET = time.altzone if time.localtime()[8] else time.timezone @@ -133,9 +134,16 @@ def condense_runlevels(*events): tor_runlevels.append(r) events.remove(r) - if 'NYX_%s' % r in events: + if r == 'WARN': + nyx_runlevel = 'NYX_WARNING' + elif r == 'ERR': + nyx_runlevel = 'NYX_ERROR' + else: + nyx_runlevel = 'NYX_%s' % r + + if nyx_runlevel in events: nyx_runlevels.append(r) - events.remove('NYX_%s' % r) + events.remove(nyx_runlevel) tor_ranges = ranges(tor_runlevels) nyx_ranges = ranges(nyx_runlevels) @@ -180,7 +188,7 @@ def listen_for_events(listener, events): # accounts for runlevel naming difference tor_events = events.intersection(set(nyx.arguments.TOR_EVENT_TYPES.values())) - nyx_events = events.intersection(set(['NYX_%s' % runlevel for runlevel in TOR_RUNLEVELS])) + nyx_events = events.intersection(set(NYX_RUNLEVELS)) # adds events unrecognized by nyx if we're listening to the 'UNKNOWN' type diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 3e8932d..278c633 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -378,9 +378,6 @@ class LogPanel(nyx.panel.DaemonPanel): self._register_event(nyx.log.LogEntry(event.arrived_at, event.type, msg)) def _register_nyx_event(self, record): - if record.levelname == 'WARNING': - record.levelname = 'WARN' - self._register_event(nyx.log.LogEntry(int(record.created), 'NYX_%s' % record.levelname, record.msg)) def _register_event(self, event): diff --git a/nyx/settings/attributes.cfg b/nyx/settings/attributes.cfg index fcc78f3..37e8ebc 100644 --- a/nyx/settings/attributes.cfg +++ b/nyx/settings/attributes.cfg @@ -48,8 +48,8 @@ attr.log_color ERR => Red attr.log_color NYX_DEBUG => Magenta attr.log_color NYX_INFO => Blue attr.log_color NYX_NOTICE => Green -attr.log_color NYX_WARN => Yellow -attr.log_color NYX_ERR => Red +attr.log_color NYX_WARNING => Yellow +attr.log_color NYX_ERROR => Red attr.log_color CIRC => Yellow attr.log_color BW => Cyan

1 0

[nyx/master] Draw helper for status message
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 68cb4ab6a854d41aab575c5f0ac934aa263b6444 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 17 12:52:52 2016 -0700 Draw helper for status message Just a small helper so this can be uniform with the rest. --- nyx/panel/header.py | 24 ++++++++++++++++-------- test/panel/header.py | 10 ++++++++++ 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 84b4b38..115bd3b 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -56,7 +56,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): self._reported_inactive = False self._message = None - self._message_attr = None + self._message_attr = [] tor_controller().add_status_listener(self.reset_listener) @@ -197,13 +197,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): _draw_fingerprint_and_fd_usage(subwindow, 0, 3, left_width, vals) _draw_flags(subwindow, 0, 4, vals.flags) - if self._message: - subwindow.addstr(0, subwindow.height - 1, self._message, *self._message_attr) - elif not self.is_paused(): - controller = nyx.controller.get_controller() - subwindow.addstr(0, subwindow.height - 1, 'page %i / %i - m: menu, p: pause, h: page help, q: quit' % (controller.get_page() + 1, controller.get_page_count())) - else: - subwindow.addstr(0, subwindow.height - 1, 'Paused', HIGHLIGHT) + _draw_status(subwindow, 0, subwindow.height - 1, self.is_paused(), self._message, *self._message_attr) def run(self): """ @@ -544,3 +538,17 @@ def _draw_newnym_option(subwindow, x, y, newnym_wait): else: plural = 's' if newnym_wait > 1 else '' subwindow.addstr(x, y, 'building circuits, available again in %i second%s' % (newnym_wait, plural)) + + +def _draw_status(subwindow, x, y, is_paused, message, *attr): + """ + Provides general usage information or a custom message. + """ + + if message: + subwindow.addstr(x, y, message, *attr) + elif not is_paused: + controller = nyx.controller.get_controller() + subwindow.addstr(x, y, 'page %i / %i - m: menu, p: pause, h: page help, q: quit' % (controller.get_page() + 1, controller.get_page_count())) + else: + subwindow.addstr(x, y, 'Paused', HIGHLIGHT) diff --git a/test/panel/header.py b/test/panel/header.py index e601f00..58f700c 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -275,3 +275,13 @@ class TestHeader(unittest.TestCase): self.assertEqual("press 'n' for a new identity", test.render(nyx.panel.header._draw_newnym_option, 0, 0, 0).content) self.assertEqual('building circuits, available again in 1 second', test.render(nyx.panel.header._draw_newnym_option, 0, 0, 1).content) self.assertEqual('building circuits, available again in 5 seconds', test.render(nyx.panel.header._draw_newnym_option, 0, 0, 5).content) + + @require_curses + @patch('nyx.controller.get_controller') + def test_draw_status(self, nyx_controller_mock): + nyx_controller_mock().get_page.return_value = 1 + nyx_controller_mock().get_page_count.return_value = 4 + + self.assertEqual('page 2 / 4 - m: menu, p: pause, h: page help, q: quit', test.render(nyx.panel.header._draw_status, 0, 0, False, None).content) + self.assertEqual('Paused', test.render(nyx.panel.header._draw_status, 0, 0, True, None).content) + self.assertEqual('pepperjack is wonderful!', test.render(nyx.panel.header._draw_status, 0, 0, False, 'pepperjack is wonderful!').content)

1 0

[nyx/master] Initialize header to a proper width
by atagar＠torproject.org 18 Apr '16

18 Apr '16

commit 95febabba28fac36d48d7f4e0c58a661de37ebe5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 17 13:01:50 2016 -0700 Initialize header to a proper width Using the actual screen size when initializing rather than a hardcoded value. This should prevent things from jumping around at startup on smaller monitors. --- nyx/panel/header.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 115bd3b..164929b 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -18,6 +18,7 @@ import stem.util.str_tools import stem.util.system import nyx.controller +import nyx.curses import nyx.panel import nyx.popups import nyx.tracker @@ -50,7 +51,7 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread): self._vals = Sampling.create() - self._last_width = 100 + self._last_width = nyx.curses.screen_size()[0] self._pause_condition = threading.Condition() self._halt = False # terminates thread if true self._reported_inactive = False

1 0