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

[webwml/master] update blog post url
by arma＠torproject.org 04 Apr '16

04 Apr '16

commit 8973afcf34cfce8b84d4d2b0e0653bd5eedfcc7d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 4 06:14:57 2016 -0400 update blog post url --- docs/en/faq-abuse.wml | 2 +- docs/en/faq.wml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/faq-abuse.wml b/docs/en/faq-abuse.wml index 699ac50..17b810f 100644 --- a/docs/en/faq-abuse.wml +++ b/docs/en/faq-abuse.wml @@ -164,7 +164,7 @@ using technology?</a></li> types, see <a href="<wiki>doc/TorAbuseTemplates">the collection of templates on the Tor wiki</a>. You can also proactively reduce the amount of abuse you - get by following <a href="<blog>tips-running-exit-node-minimal-harassment">these tips + get by following <a href="<blog>running-exit-node">these tips for running an exit node with minimal harassment</a> and <a href="<wiki>doc/ReducedExitPolicy">running a reduced exit policy</a>.</p> diff --git a/docs/en/faq.wml b/docs/en/faq.wml index 1385eac..936c317 100644 --- a/docs/en/faq.wml +++ b/docs/en/faq.wml @@ -2408,7 +2408,7 @@ on <a href="<page docs/faq-abuse>#TypicalAbuses">issues you might encounter</a> if you use the default exit policy, and then read Mike Perry's - <a href="<blog>tips-running-exit-node-minimal-harassment">tips + <a href="<blog>running-exit-node">tips for running an exit node with minimal harassment</a>. </p>

1 0

[tor-brochure/master] Add Arabic translation by poly and Sherief.
by karsten＠torproject.org 04 Apr '16

04 Apr '16

commit 25f1e7ebee464069f91c4739b947c110bc9f7025 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 4 09:13:15 2016 +0200 Add Arabic translation by poly and Sherief. --- .gitignore | 1 + tor-brochure-ar.odg | Bin 0 -> 616834 bytes tor-brochure-ar.txt | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 125 insertions(+) diff --git a/.gitignore b/.gitignore index 412228f..f60613b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tor-brochure-*.pdf +tor-brochure-*.png diff --git a/tor-brochure-ar.odg b/tor-brochure-ar.odg new file mode 100644 index 0000000..135c2f4 Binary files /dev/null and b/tor-brochure-ar.odg differ diff --git a/tor-brochure-ar.txt b/tor-brochure-ar.txt new file mode 100644 index 0000000..a7988c5 --- /dev/null +++ b/tor-brochure-ar.txt @@ -0,0 +1,124 @@ +مهمة تور + +منظمة تور (The Tor Project) تبني و تنشر أدوات مجانية تسمح للصحفيين و نشطاء حقوق اﻹنسان و الدبلوماسيين و رجال الأعمال و غيرهم من عامة الناس بتصفح اﻹنترنت بدون مراقبة من قبل الحكومات و الشركات الخاصة. + +منظمة تور هي أيضا مورد للتكنولوجيا و الدراسات العلمية و المصادر التعليمة المتعلقة بحرية التعبير و حقوق الخصوصية على اﻹنترنت و اختراق حجب المواقع. تعتبر منظمة تور من قادة المنظمات الغير ربحية في الولايات المتّحدة الأمريكيّة. + +اقرؤوا أكثر على: +https://www.torproject.org/ + +انضموا إلينا + +نحتاج إلى مساعدتكم لنكمل هذا المبادرة العالمية المتعلقة بحرية التعبير و حقوق الخصوصية على اﻹنترنت و تخطي حجب المواقع. إنضموا إلينا كرعاة أو متطوعين أو ممولين أو لزيارة اللقاءات المستضافة من قبل فريق تور. + +مزايا تور + +حفظ الخصوصية على الإنترنت + +كسر حجب المواقع + +حماية الصحفيين + +حماية نشطاء حقوق الإنسان + +حماية ضحايا العنف الأسري + +إبقاء قنوات المعرفة العالمية مفتوحة للجميع + +العمل مع صناع القرار + +العمل سوية مع المؤسسات الأكاديمية و مراكز الأبحاث + +تور و وكالات تطبيق القانون + +من يستخدم تور؟ + +أغلبية مستخدمي تور هم إما مواطنون عاديون يريدون حفظ خصوصيتهم أو مستخدمون يحتاجون لتجاوز الرقابة و حجب المواقع على الإنترنت. و على أي حال، المجرمون المستعدون لخرق القانون لديهم أدوات أكثر فاعلية من تور. + +لا سجل و لا وجود لثغرات تحكم أو تنصت + +يستطيع مسخدمي تور الإعتماد على خصوصية و سرية هذه الخدمة. لقد صمم تور و مرحلاته بطريقة لا تكشف هوية مستخدميه. ويتم مراجعة مصدر تور من قبل جهات مختلفة مثل الأكاديميين و مطورو المصادر المفتوحة حتى يتم ضمان عدم وجود ثغرات تحكم أو تنصت. + +الخطوط الساخنة للإبلاغ بمجهولية + +توفر شبكة تور البنية الأكثر أمانا لإنشاء خطوط ساخنة على الإنترنت لا تكشف الهوية بغرض حماية الشاهدين و المخبرين. + +سرية عمليات الشرطة + +تستخدم الكثير من الوكالات الأمنية تور لمراقبة صفحات المشتبه بهم بدون كشف هوية المحققين أو إثارة الشبهة. + +كيف يعمل تور؟ + +إذا أرادت "أليس" زيارة موقع "بوب"، فهي تشفر طلب الزيارة ثلاث مرات و تبعثه إلى أول خادم مُرحل. + +يزيل الخادم الأول أول طبقة من الشيفرة و لا يستطيع معرفة الموقع المطلوب تصفحه. + +يزيل الخادم الثاني طبقة أخرى من الشيفرة و يمرر الرسالة. + +يزيل الخادم الثالث الطبقة الأخيرة من الشيفرة و يمرر الرسالة إلى خادم موقع "بوب"، لكنه لا يعرف أن الرسالة من أليس. + +بوب لا يعرف أن طلب التصفح من أليس إلا إذا هي أخبرته بذلك. + +تعلم المزيد + +يضم تعهد منظمة تور للتعليم الإلتزام المستمر في تعليم وكالات الأمن أو منفذي القانون و صناع القرار. + +وثائق و قنوات المساعدة المتعلقة بتور مفتوحة للجميع. + +تعلم كيفية إستخدام خدمة إكسونيراتور (ExoneraTor) لمعرفة إذا كان عنوان الإنترنت (IP) قد تم إستخدمه كخادم تور. + +تعلم أكثر عن تور بمراسلة فريق خبراء تور. + +فوائد حجب الهوية على الإنترنت + +واقع الأمر + +مزودوا خدمة الإنترنت (مثل إتصالات و فودافون) و مواقع الإنترنت (مثل جوجل و فيس بوك) و الحكومات يستخدمون نوعا شائعًا من التعقب المعروف بإسم مراقبة عنوان الإنترنت (IP) بغرض مراقبة المحادثات على الشبكات العمومية. + +مواقع الأخبار قد تروج مقالات مختلقة حسب المكان الذي تزوها منه. + +مواقع التسوق قد تميز بين المستخدمين حسب البلد و تغير أسعار ما تبيعه. + +الشخص العادي تتعقبه أكثر من مئة شركة على الإنترنت تبيع معلومات عنه لشركات الإعلان. + +يمكن لؤناس سيئي النية كشف نشاطاتكم على مواقع الإتصال الإجتماعية. + +الحرية + +ساحة الإنترنت دوما في حالة تغير و تعديلات القوانين، وسياسات الإستخدام، والتكنولوجيا تهدد حماية هوية المستخدم وقدرته على حرية التعبير بشكل لم يسبق قط. إن الدول تراقب بعضها البعض و تراقب مواطنيها و تحجب المواقع و تراقب حركة مستخدمي الإنترنت و تقيد نشر الأخبار العالمية المهمة. + +(كيف يستخدم تور: كما في السابق) + +1- في حق الخصوصية على الإنترنت + +تور من البرامج المجانية مفتوحة المصدر وتم تطويره من قبل فريق من المبرمجين و خبراء أمن على مدى العشر سنوات الماضية. + +يعتبر تور واحدا من أفضل طرق حماية الخصوصية على الإنترنت و التأكد من أمن معلومات المستخدم الإلكترونية و تحكمه بها. + +الحرية و الخصوصية على الإنترنت + +الرقابة + +(معجم "مريم ويبستر"، ٢٠١٢) + +كل فعل يغير أو يقمع التعبير مهما كانت صيغته كتابة أو كلامًا بحجة عدم الإخلال بالصالح العام. + +الرقابة و الحجب على الإنترنت + +على المستوى العالمي، يصبح للرقابة معنى جديد. حجب المعلومات و تعقب محتويات ما يكتبه الناس اصبحا واقعا في معظم الدول. الباحثون المتخصصون بالرقابة و الحجب لدى منظمة تور يعملون على بناء أدوات تبقى فعالة في المستقبل و توفر قنوات تواصل مفتوحة للكل، بفض النظر عن دولهم. تعمل منظمة تور بالتضامن مع مؤسسات أخرى على نشر الوعي بأهمية حق الخصوصية و حرية التعبير على الإنترنت. + +رقابة الإنترنت شيء سهل و منتشر. + +أجزاء من الشبكة قد تخضع للمراقبة. + +يمكن ل"بوب" أن يكون مراقبًا من قبل النظام أو يكون متواطئ معه. + +قد تراقب "أليس" عند محاولة الأتصال بـ"بوب". + +(كيف يستخدم تور: كما في السابق) + +بعض برامج إختراق الحجب تستخدم طبقة واحدة فقط لإخفاء الأتصال. + +الخادم الوكيل (Proxy) قد يكون يتنصت أو مراقب. + +للأسف، من السهل الهجوم على خدمات الطبقة الواحدة (مثل الخادم الوكيل) \ No newline at end of file

1 0

[nyx/master] Revise sort order dialog
by atagar＠torproject.org 03 Apr '16

03 Apr '16

commit f9cf4bbc821356f7918860166d23f682ece39846 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 3 12:45:31 2016 -0700 Revise sort order dialog Rewriting this sucker. Quite a bit shorter, cleaner, and now tested. --- nyx/popups.py | 145 ++++++++++++++++++++----------------------------------- test/__init__.py | 2 +- test/popups.py | 62 ++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 93 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index 4a51e0c..b0cd48e 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -199,114 +199,75 @@ def show_counts(title, counts, fill_char = ' '): nyx.curses.key_input() -def show_sort_dialog(title, options, old_selection, option_colors): +def show_sort_dialog(title, options, previous_order, option_colors): """ - Displays a sorting dialog of the form: + Provides sorting dialog of the form... - Current Order: <previous selection> - New Order: <selections made> + Current Order: <previous order> + New Order: <selected options> <option 1> <option 2> <option 3> Cancel - Options are colored when among the "Current Order" or "New Order", but not - when an option below them. If cancel is selected or the user presses escape - then this returns None. Otherwise, the new ordering is provided. + :param str title: dialog title + :param list options: sort options to be provided + :param list previous_order: previous ordering + :param dict optoin_colors: mapping of options to their color - Arguments: - title - title displayed for the popup window - options - ordered listing of option labels - old_selection - current ordering - option_colors - mappings of options to their color + :returns: **list** of the new sort order or **None** if dialog is canceled """ - with popup_window(9, 80) as (popup, _, _): - if popup: - new_selections = [] # new ordering - cursor_location = 0 # index of highlighted option - - selection_options = list(options) - selection_options.append('Cancel') - - while len(new_selections) < len(old_selection): - popup.win.erase() - popup.draw_box() - popup.addstr(0, 0, title, HIGHLIGHT) - - _draw_sort_selection(popup, 1, 2, 'Current Order: ', old_selection, option_colors) - _draw_sort_selection(popup, 2, 2, 'New Order: ', new_selections, option_colors) - - # presents remaining options, each row having up to four options with - # spacing of nineteen cells - - row, col = 4, 0 - - for i in range(len(selection_options)): - option_format = HIGHLIGHT if cursor_location == i else NORMAL - popup.addstr(row, col * 19 + 2, selection_options[i], option_format) - col += 1 - - if col == 4: - row, col = row + 1, 0 - - popup.win.refresh() - - key = nyx.curses.key_input() - - if key.match('left'): - cursor_location = max(0, cursor_location - 1) - elif key.match('right'): - cursor_location = min(len(selection_options) - 1, cursor_location + 1) - elif key.match('up'): - cursor_location = max(0, cursor_location - 4) - elif key.match('down'): - cursor_location = min(len(selection_options) - 1, cursor_location + 4) - elif key.is_selection(): - selection = selection_options[cursor_location] - - if selection == 'Cancel': - break - else: - new_selections.append(selection) - selection_options.remove(selection) - cursor_location = min(cursor_location, len(selection_options) - 1) - elif key.match('esc'): - break # esc - cancel + new_order = [] + cursor_index = 0 + shown_options = list(options) + ['Cancel'] - if len(new_selections) == len(old_selection): - return new_selections - else: - return None + def _draw_selection(subwindow, y, label, selection): + x = subwindow.addstr(2, y, label, BOLD) + for i, option in enumerate(selection): + x = subwindow.addstr(x, y, option, option_colors.get(option, WHITE), BOLD) -def _draw_sort_selection(popup, y, x, prefix, options, option_colors): - """ - Draws a series of comma separated sort selections. The whole line is bold - and sort options also have their specified color. Example: + if i < len(selection) - 1: + x = subwindow.addstr(x, y, ', ', BOLD) - Current Order: Man Page Entry, Option Name, Is Default - - Arguments: - popup - panel in which to draw sort selection - y - vertical location - x - horizontal location - prefix - initial string description - options - sort options to be shown - option_colors - mappings of options to their color - """ + def _render(subwindow): + subwindow.box() + subwindow.addstr(0, 0, title, HIGHLIGHT) - popup.addstr(y, x, prefix, BOLD) - x += len(prefix) + _draw_selection(subwindow, 1, 'Current Order: ', previous_order) + _draw_selection(subwindow, 2, 'New Order: ', new_order) - for i in range(len(options)): - sort_type = options[i] - popup.addstr(y, x, sort_type, option_colors.get(sort_type, WHITE), BOLD) - x += len(sort_type) + # presents remaining options, each row having up to four options - # comma divider between options, if this isn't the last + for i, option in enumerate(shown_options): + attr = HIGHLIGHT if i == cursor_index else NORMAL + subwindow.addstr((i % 4) * 19 + 2, (i / 4) + 4, option, attr) - if i < len(options) - 1: - popup.addstr(y, x, ', ', BOLD) - x += 2 + with nyx.curses.CURSES_LOCK: + while len(new_order) < len(previous_order): + nyx.curses.draw(_render, top = nyx.controller.get_controller().header_panel().get_height(), width = 80, height = 9) + key = nyx.curses.key_input() + + if key.match('left'): + cursor_index = max(0, cursor_index - 1) + elif key.match('right'): + cursor_index = min(len(shown_options) - 1, cursor_index + 1) + elif key.match('up'): + cursor_index = max(0, cursor_index - 4) + elif key.match('down'): + cursor_index = min(len(shown_options) - 1, cursor_index + 4) + elif key.is_selection(): + selection = shown_options[cursor_index] + + if selection == 'Cancel': + return None + else: + new_order.append(selection) + shown_options.remove(selection) + cursor_index = min(cursor_index, len(shown_options) - 1) + elif key.match('esc'): + return None + + return new_order def show_menu(title, options, old_selection): diff --git a/test/__init__.py b/test/__init__.py index 0884866..705e9b1 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -51,7 +51,7 @@ def render(func, *args, **kwargs): if SHOW_RENDERED_CONTENT: time.sleep(SHOW_RENDERED_CONTENT) - with patch('nyx.curses.key_input', return_value = Mock()): + with patch('nyx.curses.key_input', return_value = nyx.curses.KeyInput(27)): nyx.curses.start(draw_func, transparent_background = True, cursor = False) return RenderResult(attr.get('content'), attr.get('return_value'), attr.get('runtime')) diff --git a/test/popups.py b/test/popups.py index b82c9a2..8a7e76b 100644 --- a/test/popups.py +++ b/test/popups.py @@ -2,6 +2,7 @@ Unit tests for nyx.popups. """ +import curses import unittest import nyx.panel @@ -52,6 +53,30 @@ Client Locales-----------------------------------------------------------------+ +------------------------------------------------------------------------------+ """.strip() +EXPECTED_SORT_DIALOG_START = """ +Config Option Ordering:--------------------------------------------------------+ +| Current Order: Man Page Entry, Name, Is Set | +| New Order: | +| | +| Name Value Value Type Category | +| Usage Summary Description Man Page Entry | +| Is Set Cancel | +| | ++------------------------------------------------------------------------------+ +""".strip() + +EXPECTED_SORT_DIALOG_END = """ +Config Option Ordering:--------------------------------------------------------+ +| Current Order: Man Page Entry, Name, Is Set | +| New Order: Name, Summary | +| | +| Value Value Type Category Usage | +| Description Man Page Entry Is Set Cancel | +| | +| | ++------------------------------------------------------------------------------+ +""".strip() + class TestPopups(unittest.TestCase): @patch('nyx.controller.get_controller') @@ -117,3 +142,40 @@ class TestPopups(unittest.TestCase): rendered = test.render(nyx.popups.show_counts, 'Client Locales', clients, fill_char = '*') self.assertEqual(EXPECTED_COUNTS, rendered.content) + + @patch('nyx.controller.get_controller') + def test_sort_dialog(self, get_controller_mock): + get_controller_mock().header_panel().get_height.return_value = 0 + + previous_order = ['Man Page Entry', 'Name', 'Is Set'] + options = ['Name', 'Value', 'Value Type', 'Category', 'Usage', 'Summary', 'Description', 'Man Page Entry', 'Is Set'] + + rendered = test.render(nyx.popups.show_sort_dialog, 'Config Option Ordering:', options, previous_order, {}) + self.assertEqual(EXPECTED_SORT_DIALOG_START, rendered.content) + self.assertEqual(None, rendered.return_value) + + @patch('nyx.controller.get_controller') + def test_sort_dialog_selecting(self, get_controller_mock): + # Use the dialog to make a selection. At the end we render two options as + # being selected (rather than three) because the act of selecing the third + # closed the popup. + + keypresses = [ + nyx.curses.KeyInput(curses.KEY_ENTER), + nyx.curses.KeyInput(curses.KEY_DOWN), + nyx.curses.KeyInput(curses.KEY_ENTER), + nyx.curses.KeyInput(curses.KEY_ENTER), + ] + + def draw_func(): + with patch('nyx.curses.key_input', side_effect = keypresses): + return nyx.popups.show_sort_dialog('Config Option Ordering:', options, previous_order, {}) + + get_controller_mock().header_panel().get_height.return_value = 0 + + previous_order = ['Man Page Entry', 'Name', 'Is Set'] + options = ['Name', 'Value', 'Value Type', 'Category', 'Usage', 'Summary', 'Description', 'Man Page Entry', 'Is Set'] + + rendered = test.render(draw_func) + self.assertEqual(EXPECTED_SORT_DIALOG_END, rendered.content) + self.assertEqual(['Name', 'Summary', 'Description'], rendered.return_value)

1 0

[nyx/master] Revise selection dialog
by atagar＠torproject.org 03 Apr '16

03 Apr '16

commit 196add96cc96422c31b843d0d3af36e81f8f930d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 3 14:58:31 2016 -0700 Revise selection dialog Cleaning up another dialog of ours. This one provides a list of options for the user to select from. --- nyx/panel/connection.py | 9 +++-- nyx/panel/graph.py | 20 +++-------- nyx/panel/log.py | 15 ++++---- nyx/popups.py | 96 ++++++++++++++++++++++--------------------------- test/popups.py | 22 ++++++++++++ 5 files changed, 79 insertions(+), 83 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index a59b41c..e8eb0b5 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -389,14 +389,13 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): def _pick_connection_resolver(): connection_tracker = nyx.tracker.get_connection_tracker() + resolver = connection_tracker.get_custom_resolver() options = ['auto'] + list(connection.Resolver) + list(nyx.tracker.CustomResolver) - resolver = connection_tracker.get_custom_resolver() - selected_index = 0 if resolver is None else options.index(resolver) - selected = nyx.popups.show_menu('Connection Resolver:', options, selected_index) + selected = nyx.popups.show_selector('Connection Resolver:', options, resolver if resolver else 'auto') + connection_tracker.set_custom_resolver(None if selected == 'auto' else selected) - if selected != -1: - connection_tracker.set_custom_resolver(None if selected == 0 else options[selected]) + self.redraw(True) def _show_client_locales(): nyx.popups.show_counts('Client Locales', self._client_locale_usage) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 4ef9af3..2b40390 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -506,31 +506,19 @@ class GraphPanel(nyx.panel.Panel): def key_handlers(self): def _pick_stats(): - # provides a menu to pick the graphed stats - available_stats = sorted(self.stat_options()) options = ['None'] + [stat.capitalize() for stat in available_stats] - initial_selection = available_stats.index(self.displayed_stat) + 1 if self.displayed_stat else 0 - - selection = nyx.popups.show_menu('Graphed Stats:', options, initial_selection) - - # applies new setting + previous_selection = options[available_stats.index(self.displayed_stat) + 1] if self.displayed_stat else 'None' - if selection == 0: - self.displayed_stat = None - elif selection != -1: - self.displayed_stat = available_stats[selection - 1] + selection = nyx.popups.show_selector('Graphed Stats:', options, previous_selection) + self.displayed_stat = None if selection == 'None' else available_stats[options.index(selection) - 1] def _next_bounds(): self.bounds_type = Bounds.next(self.bounds_type) self.redraw(True) def _pick_interval(): - selection = nyx.popups.show_menu('Update Interval:', list(Interval), list(Interval).index(self.update_interval)) - - if selection != -1: - self.update_interval = list(Interval)[selection] - + self.update_interval = nyx.popups.show_selector('Update Interval:', list(Interval), self.update_interval) self.redraw(True) return ( diff --git a/nyx/panel/log.py b/nyx/panel/log.py index e2d7676..765e251 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -235,17 +235,16 @@ class LogPanel(nyx.panel.Panel, threading.Thread): def _pick_filter(): with nyx.curses.CURSES_LOCK: - initial_selection = 1 if self._filter.selection() else 0 options = ['None'] + self._filter.latest_selections() + ['New...'] - selection = nyx.popups.show_menu('Log Filter:', options, initial_selection) + initial_selection = self._filter.selection() if self._filter.selection() else 'None' + selection = nyx.popups.show_selector('Log Filter:', options, initial_selection) - if selection == 0: + if selection == 'None': self._filter.select(None) - elif selection == len(options) - 1: - # selected 'New...' option - prompt user to input regular expression - self.show_filter_prompt() - elif selection != -1: - self._filter.select(self._filter.latest_selections()[selection - 1]) + elif selection == 'New...': + self.show_filter_prompt() # prompt user to input regular expression + else: + self._filter.select(selection) def _toggle_deduplication(): self.set_duplicate_visability(not self._show_duplicates) diff --git a/nyx/popups.py b/nyx/popups.py index b0cd48e..261cdce 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -199,6 +199,47 @@ def show_counts(title, counts, fill_char = ' '): nyx.curses.key_input() +def show_selector(title, options, previous_selection): + """ + Provides list of items the user can choose from. + + :param str title: dialog title + :param list options: options that can be selected from + :param str previous_selection: previously selected option + + :returns: **str** of selection or **previous_selection** if dialog is canceled + """ + + selected_index = options.index(previous_selection) if previous_selection in options else 0 + top = nyx.controller.get_controller().header_panel().get_height() + + def _render(subwindow): + subwindow.box() + subwindow.addstr(0, 0, title, HIGHLIGHT) + + for i, option in enumerate(options): + if option == previous_selection: + subwindow.addstr(2, i + 1, '> ') + + attr = HIGHLIGHT if i == selected_index else NORMAL + subwindow.addstr(4, i + 1, ' %s ' % option, attr) + + with nyx.curses.CURSES_LOCK: + while True: + nyx.curses.draw(lambda subwindow: subwindow.addstr(0, 0, ' ' * 500), top = top, height = 1) # hides title below us + nyx.curses.draw(_render, top = top, width = max(map(len, options)) + 9, height = len(options) + 2) + key = nyx.curses.key_input() + + if key.match('up'): + selected_index = max(0, selected_index - 1) + elif key.match('down'): + selected_index = min(len(options) - 1, selected_index + 1) + elif key.is_selection(): + return options[selected_index] + elif key.match('esc'): + return previous_selection + + def show_sort_dialog(title, options, previous_order, option_colors): """ Provides sorting dialog of the form... @@ -211,7 +252,7 @@ def show_sort_dialog(title, options, previous_order, option_colors): :param str title: dialog title :param list options: sort options to be provided :param list previous_order: previous ordering - :param dict optoin_colors: mapping of options to their color + :param dict option_colors: mapping of options to their color :returns: **list** of the new sort order or **None** if dialog is canceled """ @@ -270,59 +311,6 @@ def show_sort_dialog(title, options, previous_order, option_colors): return new_order -def show_menu(title, options, old_selection): - """ - Provides menu with options laid out in a single column. User can cancel - selection with the escape key, in which case this proives -1. Otherwise this - returns the index of the selection. - - Arguments: - title - title displayed for the popup window - options - ordered listing of options to display - old_selection - index of the initially selected option (uses the first - selection without a carrot if -1) - """ - - max_width = max(map(len, options)) + 9 - - with popup_window(len(options) + 2, max_width) as (popup, _, _): - if not popup: - return -1 - - selection = old_selection if old_selection != -1 else 0 - - with popup_window(1, -1) as (title_erase, _, _): - title_erase.addstr(0, 0, ' ' * 500) # hide title of the panel below us - - while True: - popup.win.erase() - popup.draw_box() - popup.addstr(0, 0, title, HIGHLIGHT) - - for i in range(len(options)): - label = options[i] - format = HIGHLIGHT if i == selection else NORMAL - tab = '> ' if i == old_selection else ' ' - popup.addstr(i + 1, 2, tab) - popup.addstr(i + 1, 4, ' %s ' % label, format) - - popup.win.refresh() - - key = nyx.curses.key_input() - - if key.match('up'): - selection = max(0, selection - 1) - elif key.match('down'): - selection = min(len(options) - 1, selection + 1) - elif key.is_selection(): - break - elif key.match('esc'): - selection = -1 - break - - return selection - - def show_descriptor_popup(fingerprint, color, max_width, is_close_key): """ Provides a dialog showing the descriptors for a given relay. diff --git a/test/popups.py b/test/popups.py index 8a7e76b..f3d4963 100644 --- a/test/popups.py +++ b/test/popups.py @@ -53,6 +53,19 @@ Client Locales-----------------------------------------------------------------+ +------------------------------------------------------------------------------+ """.strip() +EXPECTED_SELECTOR = """ +Update Interval:---+ +| > each second | +| 5 seconds | +| 30 seconds | +| minutely | +| 15 minute | +| 30 minute | +| hourly | +| daily | ++------------------+ +""".strip() + EXPECTED_SORT_DIALOG_START = """ Config Option Ordering:--------------------------------------------------------+ | Current Order: Man Page Entry, Name, Is Set | @@ -144,6 +157,15 @@ class TestPopups(unittest.TestCase): self.assertEqual(EXPECTED_COUNTS, rendered.content) @patch('nyx.controller.get_controller') + def test_selector(self, get_controller_mock): + get_controller_mock().header_panel().get_height.return_value = 0 + + options = ['each second', '5 seconds', '30 seconds', 'minutely', '15 minute', '30 minute', 'hourly', 'daily'] + rendered = test.render(nyx.popups.show_selector, 'Update Interval:', options, 'each second') + self.assertEqual(EXPECTED_SELECTOR, rendered.content) + self.assertEqual('each second', rendered.return_value) + + @patch('nyx.controller.get_controller') def test_sort_dialog(self, get_controller_mock): get_controller_mock().header_panel().get_height.return_value = 0

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 03 Apr '16

03 Apr '16

commit fbfda1abd5049373f053149f6614cfa35f96f6ca Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 3 16:16:53 2016 +0000 Update translations for tails-onioncircuits_completed --- sv/onioncircuits.pot | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/sv/onioncircuits.pot b/sv/onioncircuits.pot new file mode 100644 index 0000000..885503e --- /dev/null +++ b/sv/onioncircuits.pot @@ -0,0 +1,93 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Anders Nilsson <locally(a)devode.se>, 2016 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2016 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-31 21:31+0200\n" +"PO-Revision-Date: 2016-04-03 16:09+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" +"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../onioncircuits:81 +msgid "" +"Cannot connect to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Kan inte ansluta till Tor-demonen. Onion Circuits kommer försöka återansluta..." + +#: ../onioncircuits:94 +msgid "Onion Circuits" +msgstr "Onion kretsar" + +#: ../onioncircuits:95 +msgid "Display Tor circuits and streams" +msgstr "Visa Tor kretsar och strömmar" + +#: ../onioncircuits:107 +msgid "OK" +msgstr "Okej" + +#: ../onioncircuits:124 +msgid "Path" +msgstr "Sökväg" + +#: ../onioncircuits:125 +msgid "Status" +msgstr "Status" + +#: ../onioncircuits:141 +msgid "Click on a path to get details" +msgstr "Klicka på en sökväg för att få information" + +#: ../onioncircuits:215 +msgid "" +"Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." +msgstr "Förlorade anslutning till Tor bakgrundsprogrammet. Onion kretsar kommer att försöka återansluta..." + +#: ../onioncircuits:232 +msgid "Connected to the Tor daemon! You can use now Onion Circuits." +msgstr "Ansluten till Tor bakgrundsprogrammet! Du kan nu använda Onion kretsar." + +#: ../onioncircuits:314 +msgid "Building..." +msgstr "Bygger..." + +#: ../onioncircuits:339 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: ../onioncircuits:564 +msgid "Fingerprint:" +msgstr "Fingeravtryck:" + +#: ../onioncircuits:565 +msgid "Published:" +msgstr "Publicerad:" + +#: ../onioncircuits:566 +msgid "IP:" +msgstr "IP:" + +#: ../onioncircuits:566 +#, c-format +msgid "%s (%s)" +msgstr "%s (%s)" + +#: ../onioncircuits:567 +msgid "Bandwidth:" +msgstr "Bandbredd:" + +#: ../onioncircuits:567 +#, c-format +msgid "%.2f Mb/s" +msgstr "%.2f Mb/s"

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 03 Apr '16

03 Apr '16

commit 3a88681dfc79b4bc5353a94a79b14a70d59e250b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 3 16:16:48 2016 +0000 Update translations for tails-onioncircuits --- sv/onioncircuits.pot | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sv/onioncircuits.pot b/sv/onioncircuits.pot index acbc19c..885503e 100644 --- a/sv/onioncircuits.pot +++ b/sv/onioncircuits.pot @@ -4,13 +4,14 @@ # # Translators: # Anders Nilsson <locally(a)devode.se>, 2016 +# Jonatan Nyberg <jonatan(a)autistici.org>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-04-02 10:19+0000\n" -"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" +"PO-Revision-Date: 2016-04-03 16:09+0000\n" +"Last-Translator: Jonatan Nyberg <jonatan(a)autistici.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,11 +26,11 @@ msgstr "Kan inte ansluta till Tor-demonen. Onion Circuits kommer försöka åter #: ../onioncircuits:94 msgid "Onion Circuits" -msgstr "" +msgstr "Onion kretsar" #: ../onioncircuits:95 msgid "Display Tor circuits and streams" -msgstr "" +msgstr "Visa Tor kretsar och strömmar" #: ../onioncircuits:107 msgid "OK" @@ -45,16 +46,16 @@ msgstr "Status" #: ../onioncircuits:141 msgid "Click on a path to get details" -msgstr "" +msgstr "Klicka på en sökväg för att få information" #: ../onioncircuits:215 msgid "" "Lost connection to the Tor daemon. Onion Circuits will try to reconnect..." -msgstr "" +msgstr "Förlorade anslutning till Tor bakgrundsprogrammet. Onion kretsar kommer att försöka återansluta..." #: ../onioncircuits:232 msgid "Connected to the Tor daemon! You can use now Onion Circuits." -msgstr "" +msgstr "Ansluten till Tor bakgrundsprogrammet! Du kan nu använda Onion kretsar." #: ../onioncircuits:314 msgid "Building..."

1 0

[nyx/master] Unit test count popup
by atagar＠torproject.org 03 Apr '16

03 Apr '16

commit 5f08fc9eacb1ab5c40b7c9d9c2d1aed2cfbfba42 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 2 17:31:37 2016 -0700 Unit test count popup Finish unit testing the popups we've finished overhauling. I'll be slowly expanding test coverage as we switch more things over to the new curses draw() pattern. --- nyx/popups.py | 5 +++-- test/__init__.py | 6 ++++-- test/popups.py | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/nyx/popups.py b/nyx/popups.py index e65be70..4a51e0c 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -150,13 +150,14 @@ def show_about(): nyx.curses.key_input() -def show_counts(title, counts): +def show_counts(title, counts, fill_char = ' '): """ Provides a dialog with bar graphs and percentages for the given set of counts. Pressing any key closes the dialog. :param str title: dialog title :param dict counts: mapping of labels to their value + :param str fill_char: character to use for rendering the bar graph """ def _render_no_stats(subwindow): @@ -183,7 +184,7 @@ def show_counts(title, counts): x = subwindow.addstr(2, y + 1, label, GREEN, BOLD) for j in range(graph_width * v / value_total): - subwindow.addstr(x + j + 1, y + 1, ' ', RED, HIGHLIGHT) + subwindow.addstr(x + j + 1, y + 1, fill_char, RED, HIGHLIGHT) subwindow.addstr(2, subwindow.height - 2, 'Press any key...') diff --git a/test/__init__.py b/test/__init__.py index 44a53b0..0884866 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -27,7 +27,7 @@ SHOW_RENDERED_CONTENT = None RenderResult = collections.namedtuple('RenderResult', ['content', 'return_value', 'runtime']) -def render(func): +def render(func, *args, **kwargs): """ Runs the given curses function, providing content that's rendered on the screen. @@ -41,8 +41,10 @@ def render(func): def draw_func(): nyx.curses.disable_acs() + nyx.curses.CURSES_SCREEN.erase() + start_time = time.time() - attr['return_value'] = func() + attr['return_value'] = func(*args, **kwargs) attr['runtime'] = time.time() - start_time attr['content'] = nyx.curses.screenshot() diff --git a/test/popups.py b/test/popups.py index fde87f2..b82c9a2 100644 --- a/test/popups.py +++ b/test/popups.py @@ -34,6 +34,24 @@ About:-------------------------------------------------------------------------+ +------------------------------------------------------------------------------+ """.strip() +EXPECTED_EMPTY_COUNTS = """ +Client Locales---------------------------------------+ +| Usage stats aren't available yet, press any key... | ++----------------------------------------------------+ +""".strip() + +EXPECTED_COUNTS = """ +Client Locales-----------------------------------------------------------------+ +| de 41 (43%) *************************** | +| ru 32 (33%) ********************* | +| ca 11 (11%) ******* | +| us 6 (6 %) **** | +| fr 5 (5 %) *** | +| | +| Press any key... | ++------------------------------------------------------------------------------+ +""".strip() + class TestPopups(unittest.TestCase): @patch('nyx.controller.get_controller') @@ -77,3 +95,25 @@ class TestPopups(unittest.TestCase): rendered = test.render(nyx.popups.show_about) self.assertEqual(EXPECTED_ABOUT_POPUP, rendered.content) + + @patch('nyx.controller.get_controller') + def test_counts_when_empty(self, get_controller_mock): + get_controller_mock().header_panel().get_height.return_value = 0 + + rendered = test.render(nyx.popups.show_counts, 'Client Locales', {}) + self.assertEqual(EXPECTED_EMPTY_COUNTS, rendered.content) + + @patch('nyx.controller.get_controller') + def test_counts(self, get_controller_mock): + get_controller_mock().header_panel().get_height.return_value = 0 + + clients = { + 'fr': 5, + 'us': 6, + 'ca': 11, + 'ru': 32, + 'de': 41, + } + + rendered = test.render(nyx.popups.show_counts, 'Client Locales', clients, fill_char = '*') + self.assertEqual(EXPECTED_COUNTS, rendered.content)

1 0

[nyx/master] Unit test help popups
by atagar＠torproject.org 03 Apr '16

03 Apr '16

commit a5f5caa583c222223f77e665f6174a9ce46dc0e8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 2 17:09:54 2016 -0700 Unit test help popups Tad more substantial popup. This is so neat! --- test/popups.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/test/popups.py b/test/popups.py index c4f56ea..fde87f2 100644 --- a/test/popups.py +++ b/test/popups.py @@ -4,10 +4,23 @@ Unit tests for nyx.popups. import unittest +import nyx.panel import nyx.popups import test -from mock import patch +from mock import patch, Mock + +EXPECTED_HELP_POPUP = """ +Page 1 Commands:---------------------------------------------------------------+ +| arrows: scroll up and down a: save snapshot of the log | +| e: change logged events f: log regex filter (disabled) | +| u: duplicate log entries (hidden) c: clear event log | +| r: resize graph s: graphed stats (bandwidth) | +| b: graph bounds (local max) i: graph update interval (each second)| +| | +| Press any key... | ++------------------------------------------------------------------------------+ +""".strip() EXPECTED_ABOUT_POPUP = """ About:-------------------------------------------------------------------------+ @@ -24,6 +37,41 @@ About:-------------------------------------------------------------------------+ class TestPopups(unittest.TestCase): @patch('nyx.controller.get_controller') + def test_help(self, get_controller_mock): + header_panel = Mock() + + header_panel.key_handlers.return_value = ( + nyx.panel.KeyHandler('n'), + nyx.panel.KeyHandler('r'), + ) + + graph_panel = Mock() + + graph_panel.key_handlers.return_value = ( + nyx.panel.KeyHandler('r', 'resize graph'), + nyx.panel.KeyHandler('s', 'graphed stats', current = 'bandwidth'), + nyx.panel.KeyHandler('b', 'graph bounds', current = 'local max'), + nyx.panel.KeyHandler('i', 'graph update interval', current = 'each second'), + ) + + log_panel = Mock() + + log_panel.key_handlers.return_value = ( + nyx.panel.KeyHandler('arrows', 'scroll up and down'), + nyx.panel.KeyHandler('a', 'save snapshot of the log'), + nyx.panel.KeyHandler('e', 'change logged events'), + nyx.panel.KeyHandler('f', 'log regex filter', current = 'disabled'), + nyx.panel.KeyHandler('u', 'duplicate log entries', current = 'hidden'), + nyx.panel.KeyHandler('c', 'clear event log'), + ) + + get_controller_mock().header_panel().get_height.return_value = 0 + get_controller_mock().get_display_panels.return_value = [header_panel, graph_panel, log_panel] + + rendered = test.render(nyx.popups.show_help) + self.assertEqual(EXPECTED_HELP_POPUP, rendered.content) + + @patch('nyx.controller.get_controller') def test_about(self, get_controller_mock): get_controller_mock().header_panel().get_height.return_value = 0

1 0

[nyx/master] Revise about popup
by atagar＠torproject.org 02 Apr '16

02 Apr '16

commit 081aa02330ac9442df2ae9491403d8c839df74d5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 2 12:00:34 2016 -0700 Revise about popup I'm really tempted to just drop this. It really doesn't provide any useful information. Just there because UIs conventionally have this option there. Meh. Might revisit this when we hit the menus. --- nyx/controller.py | 2 +- nyx/menu/actions.py | 4 ++-- nyx/popups.py | 40 ++++++++++++++++++++-------------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 1d1730a..e1cc1f8 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -360,7 +360,7 @@ def start_nyx(): except IOError as exc: log.error('Error detected when reloading tor: %s' % exc.strerror) elif key.match('h'): - override_key = nyx.popups.show_help_popup() + override_key = nyx.popups.show_help() elif key == ord('l') - 96: # force redraw when ctrl+l is pressed control.redraw(True) diff --git a/nyx/menu/actions.py b/nyx/menu/actions.py index a1199aa..7f25504 100644 --- a/nyx/menu/actions.py +++ b/nyx/menu/actions.py @@ -125,8 +125,8 @@ def make_help_menu(): """ help_menu = nyx.menu.item.Submenu('Help') - help_menu.add(nyx.menu.item.MenuItem('Hotkeys', nyx.popups.show_help_popup)) - help_menu.add(nyx.menu.item.MenuItem('About', nyx.popups.show_about_popup)) + help_menu.add(nyx.menu.item.MenuItem('Hotkeys', nyx.popups.show_help)) + help_menu.add(nyx.menu.item.MenuItem('About', nyx.popups.show_about)) return help_menu diff --git a/nyx/popups.py b/nyx/popups.py index 06241a3..de057af 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -8,11 +8,11 @@ Functions for displaying popups in the interface. import math import operator +import nyx import nyx.controller import nyx.curses import nyx.panel -from nyx import __version__, __release_date__, tor_controller from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, NORMAL, BOLD, HIGHLIGHT NO_STATS_MSG = "Usage stats aren't available yet, press any key..." @@ -78,25 +78,25 @@ def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = True return _Popup() -def show_help_popup(): +def show_help(): """ - Presents a popup with instructions for the current page's hotkeys. + Presents a popup with the current page's hotkeys. :returns: :class:`~nyx.curses.KeyInput` that was pressed to close the popup if it's one panels should act upon, **None** otherwise """ control = nyx.controller.get_controller() - help_options = [] + handlers = [] for panel in reversed(control.get_display_panels()): - help_options += [handler for handler in panel.key_handlers() if handler.description] + handlers += [handler for handler in panel.key_handlers() if handler.description] def _render(subwindow): subwindow.box() subwindow.addstr(0, 0, 'Page %i Commands:' % (control.get_page() + 1), HIGHLIGHT) - for i, option in enumerate(help_options): + for i, option in enumerate(handlers): if i / 2 >= subwindow.height - 2: break @@ -118,7 +118,7 @@ def show_help_popup(): # tells user to press a key if the lower left is unoccupied - if len(help_options) < 13 and subwindow.height == 9: + if len(handlers) < 13 and subwindow.height == 9: subwindow.addstr(2, 7, 'Press any key...') with nyx.curses.CURSES_LOCK: @@ -131,23 +131,23 @@ def show_help_popup(): return keypress -def show_about_popup(): +def show_about(): """ Presents a popup with author and version information. """ - with popup_window(9, 80) as (popup, _, height): - if popup: - popup.draw_box() - popup.addstr(0, 0, 'About:', HIGHLIGHT) - popup.addstr(1, 2, 'nyx, version %s (released %s)' % (__version__, __release_date__), BOLD) - popup.addstr(2, 4, 'Written by Damian Johnson (atagar(a)torproject.org)') - popup.addstr(3, 4, 'Project page: www.atagar.com/nyx') - popup.addstr(5, 2, 'Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html)') - popup.addstr(7, 2, 'Press any key...') - popup.win.refresh() + def _render(subwindow): + subwindow.box() + subwindow.addstr(0, 0, 'About:', HIGHLIGHT) + subwindow.addstr(2, 1, 'Nyx, version %s (released %s)' % (nyx.__version__, nyx.__release_date__), BOLD) + subwindow.addstr(4, 2, 'Written by Damian Johnson (atagar(a)torproject.org)') + subwindow.addstr(4, 3, 'Project page: %s' % nyx.__url__) + subwindow.addstr(2, 5, 'Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html)') + subwindow.addstr(2, 7, 'Press any key...') - nyx.curses.key_input() + with nyx.curses.CURSES_LOCK: + nyx.curses.draw(_render, top = nyx.controller.get_controller().header_panel().get_height(), width = 80, height = 9) + keypress = nyx.curses.key_input() def show_count_dialog(title, counts): @@ -416,7 +416,7 @@ def _display_text(fingerprint): :returns: **list** with the lines that should be displayed in the dialog """ - controller = tor_controller() + controller = nyx.tor_controller() router_status_entry = controller.get_network_status(fingerprint, None) microdescriptor = controller.get_microdescriptor(fingerprint, None) server_descriptor = controller.get_server_descriptor(fingerprint, None)

1 0

[nyx/master] Revise count popup
by atagar＠torproject.org 02 Apr '16

02 Apr '16

commit 201063c6123759134c289aa67844911811439aeb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 2 13:41:46 2016 -0700 Revise count popup Just another simple replacement to use our new draw() function. --- nyx/panel/connection.py | 4 ++-- nyx/popups.py | 57 +++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index a26c0d2..a59b41c 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -399,7 +399,7 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): connection_tracker.set_custom_resolver(None if selected == 0 else options[selected]) def _show_client_locales(): - nyx.popups.show_count_dialog('Client Locales', self._client_locale_usage) + nyx.popups.show_counts('Client Locales', self._client_locale_usage) def _show_exiting_port_usage(): counts = {} @@ -413,7 +413,7 @@ class ConnectionPanel(nyx.panel.Panel, threading.Thread): counts[k] = v - nyx.popups.show_count_dialog('Exiting Port Usage', counts) + nyx.popups.show_counts('Exiting Port Usage', counts) resolver = nyx.tracker.get_connection_tracker().get_custom_resolver() user_traffic_allowed = tor_controller().is_user_traffic_allowed() diff --git a/nyx/popups.py b/nyx/popups.py index de057af..c56cb25 100644 --- a/nyx/popups.py +++ b/nyx/popups.py @@ -150,7 +150,7 @@ def show_about(): keypress = nyx.curses.key_input() -def show_count_dialog(title, counts): +def show_counts(title, counts): """ Provides a dialog with bar graphs and percentages for the given set of counts. Pressing any key closes the dialog. @@ -159,42 +159,43 @@ def show_count_dialog(title, counts): :param dict counts: mapping of labels to their value """ - if not counts: - height, width = 3, len(NO_STATS_MSG) + 4 - else: - height, width = 4 + max(1, len(counts)), 80 + def _render_no_stats(subwindow): + subwindow.box() + subwindow.addstr(0, 0, title, HIGHLIGHT) + subwindow.addstr(2, 1, NO_STATS_MSG, CYAN, BOLD) - with nyx.popups.popup_window(height, width) as (popup, width, height): - if not popup: - return + def _render_stats(subwindow): + key_width, val_width, value_total = 3, 1, 0 - if not counts: - popup.addstr(1, 2, NO_STATS_MSG, CYAN, BOLD) - else: - key_width, val_width, value_total = 3, 1, 0 + for k, v in counts.items(): + key_width = max(key_width, len(k)) + val_width = max(val_width, len(str(v))) + value_total += v - for k, v in counts.items(): - key_width = max(key_width, len(k)) - val_width = max(val_width, len(str(v))) - value_total += v + subwindow.box() + subwindow.addstr(0, 0, title, HIGHLIGHT) - sorted_counts = sorted(counts.iteritems(), key = operator.itemgetter(1), reverse = True) - graph_width = width - key_width - val_width - 11 # border, extra spaces, and percentage column + graph_width = subwindow.width - key_width - val_width - 11 # border, extra spaces, and percentage column + sorted_counts = sorted(counts.iteritems(), key = operator.itemgetter(1), reverse = True) - for y, (k, v) in enumerate(sorted_counts): - label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 / value_total) - x = popup.addstr(y + 1, 2, label, GREEN, BOLD) + for y, (k, v) in enumerate(sorted_counts): + label = '%s %s (%-2i%%)' % (k.ljust(key_width), str(v).rjust(val_width), v * 100 / value_total) + x = subwindow.addstr(2, y + 1, label, GREEN, BOLD) - for j in range(graph_width * v / value_total): - popup.addstr(y + 1, x + j + 1, ' ', RED, HIGHLIGHT) + for j in range(graph_width * v / value_total): + subwindow.addstr(x + j + 1, y + 1, ' ', RED, HIGHLIGHT) - popup.addstr(height - 2, 2, 'Press any key...') + subwindow.addstr(2, subwindow.height - 2, 'Press any key...') - popup.draw_box() - popup.addstr(0, 0, title, HIGHLIGHT) - popup.win.refresh() + top = nyx.controller.get_controller().header_panel().get_height() - nyx.curses.key_input() + with nyx.curses.CURSES_LOCK: + if not counts: + nyx.curses.draw(_render_no_stats, top = top, width = len(NO_STATS_MSG) + 4, height = 3) + else: + nyx.curses.draw(_render_stats, top = top, width = 80, height = 4 + max(1, len(counts))) + + keypress = nyx.curses.key_input() def show_sort_dialog(title, options, old_selection, option_colors):

1 0