January 2014 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 96e8a8baf6d63eaccb7a80512b08ffa0f8b26995 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:45:12 2014 +0000 Update translations for vidalia --- km/qt_km.po | 4 ++-- km/vidalia_km.po | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/km/qt_km.po b/km/qt_km.po index fb15f59..759a2ff 100644 --- a/km/qt_km.po +++ b/km/qt_km.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2014-01-22 03:30+0000\n" +"PO-Revision-Date: 2014-01-27 03:30+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -309,7 +309,7 @@ msgstr "" #: qfileiconprovider.cpp:412 msgctxt "QFileDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" #: qfiledialog.cpp:439 msgctxt "QFileDialog" diff --git a/km/vidalia_km.po b/km/vidalia_km.po index 1c7a14d..9f22ff1 100755 --- a/km/vidalia_km.po +++ b/km/vidalia_km.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2014-01-22 09:40+0000\n" +"PO-Revision-Date: 2014-01-27 03:41+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -373,7 +373,7 @@ msgstr "" msgctxt "Circuit" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "CircuitItem" msgid "<Path Empty>" @@ -1601,7 +1601,7 @@ msgstr "" msgctxt "LogEvent" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "LogTreeItem" msgid "Debug" @@ -1625,7 +1625,7 @@ msgstr "" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "MainWindow" msgid "Start Tor" @@ -2217,7 +2217,7 @@ msgstr "" msgctxt "MessageLog" msgid "Clear" -msgstr "" +msgstr "សម្អាត" msgctxt "MessageLog" msgid "Clear all messages from the Message Log (Ctrl+E)" @@ -2536,7 +2536,7 @@ msgstr "" msgctxt "NetViewer" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "NetViewer" msgid "Full Screen" @@ -2752,7 +2752,7 @@ msgstr "" msgctxt "RouterInfoDialog" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "RouterInfoDialog" msgid "Relay Details" @@ -3489,7 +3489,7 @@ msgstr "" msgctxt "Stream" msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]"

1 0

[stem/master] Resetting NEWNYM counter when wiping cache
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 9f3bd3f6a9c1b3155efe123ad9390c5365d76192 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:21:59 2014 -0800 Resetting NEWNYM counter when wiping cache If we attach to a new (or maybe previous) tor instance then we shouldn't carry over the timestamp we last issued a NEWNYM signal. --- stem/control.py | 1 + 1 file changed, 1 insertion(+) diff --git a/stem/control.py b/stem/control.py index 22a1962..0b611f5 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1833,6 +1833,7 @@ class Controller(BaseController): with self._cache_lock: self._request_cache = {} + self._last_newnym = 0.0 self._geoip_failure_count = 0 def load_conf(self, configtext):

1 0

[stem/master] Adding controller methods to check NEWNYM availability
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit c510c1b01599781b249f12c06062082309ea5f0e Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 19:15:51 2014 -0800 Adding controller methods to check NEWNYM availability Adding a couple methods to check if tor will respect a NEWNYM signal or not. This only works if signals are only sent through stem. --- docs/change_log.rst | 1 + stem/control.py | 38 +++++++++++++++++++++++++++++++++++++- test/integ/control/controller.py | 17 +++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index fa8b638..ab52e5f 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -41,6 +41,7 @@ The following are only available within stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.is_newnym_available` and :func:`~stem.control.Controller.get_newnym_wait` methods to the :class:`~stem.control.Controller` * Added the id attribute to the :class:`~stem.response.events.ORConnEvent` (:spec:`6f2919a`) * Added `support for CONN_BW events <api/response.html#stem.response.events.ConnectionBandwidthEvent>`_ (:spec:`6f2919a`) * Added `support for CIRC_BW events <api/response.html#stem.response.events.CircuitBandwidthEvent>`_ (:spec:`6f2919a`) diff --git a/stem/control.py b/stem/control.py index adfc56f..22a1962 100644 --- a/stem/control.py +++ b/stem/control.py @@ -64,6 +64,8 @@ providing its own for interacting at a higher level. |- close_stream - close a stream | |- signal - sends a signal to the tor client + |- is_newnym_available - true if tor would presently accept a NEWNYM signal + |- get_newnym_wait - seconds until tor would accept a NEWNYM signal |- is_geoip_unavailable - true if we've discovered our geoip db to be unavailable +- map_address - maps one address to another such that connections to the original are replaced with the other @@ -679,6 +681,7 @@ class Controller(BaseController): self._is_caching_enabled = True self._request_cache = {} + self._last_newnym = 0.0 self._cache_lock = threading.RLock() @@ -688,6 +691,7 @@ class Controller(BaseController): self._event_listeners_lock = threading.RLock() # number of sequential 'GETINFO ip-to-country/*' lookups that have failed + self._geoip_failure_count = 0 self._enabled_features = [] @@ -2258,12 +2262,44 @@ class Controller(BaseController): response = self.msg("SIGNAL %s" % signal) stem.response.convert("SINGLELINE", response) - if not response.is_ok(): + if response.is_ok(): + if signal == stem.Signal.NEWNYM: + self._last_newnym = time.time() + else: if response.code == "552": raise stem.InvalidArguments(response.code, response.message, [signal]) raise stem.ProtocolError("SIGNAL response contained unrecognized status code: %s" % response.code) + def is_newnym_available(self): + """ + Indicates if tor would presently accept a NEWNYM signal. This can only + account for signals sent via this controller. + + .. versionadded:: 1.2.0 + + :returns: **True** if tor would presently accept a NEWNYM signal, **False** + otherwise + """ + + if self.is_alive(): + return self.get_newnym_wait() == 0.0 + else: + return False + + def get_newnym_wait(self): + """ + Provides the number of seconds until a NEWNYM signal would be respected. + This can only account for signals sent via this controller. + + .. versionadded:: 1.2.0 + + :returns: **float** for the number of seconds until tor would respect + another NEWNYM signal + """ + + return max(0.0, self._last_newnym + 10 - time.time()) + def is_geoip_unavailable(self): """ Provides **True** if we've concluded hat our geoip database is unavailable, diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 1c0e468..d034853 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -654,6 +654,23 @@ class TestController(unittest.TestCase): # invalid signals self.assertRaises(stem.InvalidArguments, controller.signal, "FOOBAR") + def test_newnym_availability(self): + """ + Test the is_newnym_available and get_newnym_wait methods. + """ + + if test.runner.require_control(self): + return + + with test.runner.get_runner().get_tor_controller() as controller: + self.assertEqual(True, controller.is_newnym_available()) + self.assertEqual(0.0, controller.get_newnym_wait()) + + controller.signal(stem.Signal.NEWNYM) + + self.assertEqual(False, controller.is_newnym_available()) + self.assertTrue(controller.get_newnym_wait() > 9.0) + def test_extendcircuit(self): if test.runner.require_control(self): return

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 1b24dbee787509d4cba0ddbd880a095e3351e93f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:16:11 2014 +0000 Update translations for mat-gui --- km.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/km.po b/km.po index eb07d24..3120ac4 100644 --- a/km.po +++ b/km.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-27 02:46+0000\n" +"PO-Revision-Date: 2014-01-27 03:15+0000\n" "Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "ឯកសារដែលគាំទ្រ" #: mat-gui:157 msgid "No metadata found" -msgstr "" +msgstr "រកមិនឃើញទិន្នន័យមេតា" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" @@ -49,15 +49,15 @@ msgstr "មិនល្អ" #: mat-gui:165 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "ទិន្នន័យមេតារបស់ %s" #: mat-gui:176 msgid "Trash your meta, keep your data" -msgstr "" +msgstr "លុបមេតា រក្សាទិន្នន័យរបស់អ្នក" #: mat-gui:181 msgid "Website" -msgstr "" +msgstr "តំបន់បណ្ដាញ" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" @@ -65,23 +65,23 @@ msgstr "ចំណូលចិត្ត" #: mat-gui:220 msgid "Reduce PDF quality" -msgstr "" +msgstr "បន្ថយគុណភាព PDF" #: mat-gui:223 msgid "Reduce the produced PDF size and quality" -msgstr "" +msgstr "បន្ថយគុណភាព និងទំហំ PDF ដែលបានបង្កើត" #: mat-gui:226 msgid "Add unsupported file to archives" -msgstr "" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រទៅកាន់ប័ណ្ណសារ" #: mat-gui:229 msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "" +msgstr "បន្ថែមឯកសារដែលមិនគាំទ្រ (និងមិនមែនអនាមិក) ទៅកាន់ប័ណ្ណសារលទ្ធផល" #: mat-gui:268 msgid "Unknown" -msgstr "" +msgstr "មិនស្គាល់" #: mat-gui:310 msgid "Not-supported" @@ -127,16 +127,16 @@ msgstr "" #: mat-gui:394 #, python-format msgid "Checking %s" -msgstr "" +msgstr "កំពុងពិនិត្យ %s" #: mat-gui:409 #, python-format msgid "Cleaning %s" -msgstr "" +msgstr "កំពុងសម្អាត %s" #: data/mat.ui:63 msgid "_File" -msgstr "" +msgstr "ឯកសារ" #: data/mat.ui:99 msgid "_Edit"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 280da502c2ae0bd85fc7ba99d5ed0d5583b1e2cc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 03:15:56 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index f6869ee..ce1456a 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -25,7 +25,7 @@ <!ENTITY https-everywhere.prefs.notes "សម្គាល់"> <!ENTITY https-everywhere.prefs.list_caption "Which HTTPS redirection rules should apply?"> <!ENTITY https-everywhere.prefs.enabled "បានបើក"> -<!ENTITY https-everywhere.prefs.ruleset_howto "You can learn how to write your own rulesets (to add support for other web sites)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "អ្នកអាចស្វែងរកពីរបៀបសរសេរ rulesets ផ្ទាល់ខ្លួនរបស់អ្នក (ដើម្បីបន្ថែមការគាំទ្រសម្រាប់តំបន់បណ្ដាញផ្សេងៗ)"> <!ENTITY https-everywhere.prefs.here_link "ទីនេះ"> <!ENTITY https-everywhere.prefs.toggle "បិទ/បើក"> <!ENTITY https-everywhere.prefs.reset_default "កំណត់ឡើងវិញទៅលំនាំដើម">

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 4e9fb3abbb0a5d9fb6c77eb519acd0a484f3826e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:46:11 2014 +0000 Update translations for mat-gui --- km.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/km.po b/km.po index 5073edb..eb07d24 100644 --- a/km.po +++ b/km.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# soksophea <sksophea(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-19 14:48+0000\n" -"PO-Revision-Date: 2014-01-22 04:40+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-01-27 02:46+0000\n" +"Last-Translator: soksophea <sksophea(a)gmail.com>\n" "Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,19 +20,19 @@ msgstr "" #: mat-gui:61 mat-gui:403 mat-gui:422 msgid "Ready" -msgstr "" +msgstr "រួចរាល់" #: mat-gui:128 msgid "Choose files" -msgstr "" +msgstr "ជ្រើសឯកសារ" #: mat-gui:135 msgid "All files" -msgstr "" +msgstr "ឯកសារទាំងអស់" #: mat-gui:142 msgid "Supported files" -msgstr "" +msgstr "ឯកសារដែលគាំទ្រ" #: mat-gui:157 msgid "No metadata found" @@ -39,11 +40,11 @@ msgstr "" #: mat-gui:158 mat-gui:398 mat-gui:420 msgid "Clean" -msgstr "" +msgstr "សម្អាត" #: mat-gui:160 mat-gui:400 msgid "Dirty" -msgstr "" +msgstr "មិនល្អ" #: mat-gui:165 #, python-format @@ -60,7 +61,7 @@ msgstr "" #: mat-gui:207 data/mat.ui:107 msgid "Preferences" -msgstr "" +msgstr "ចំណូលចិត្ត" #: mat-gui:220 msgid "Reduce PDF quality" @@ -84,7 +85,7 @@ msgstr "" #: mat-gui:310 msgid "Not-supported" -msgstr "" +msgstr "មិនគាំទ្រ" #: mat-gui:324 msgid "Harmless fileformat" @@ -155,15 +156,15 @@ msgstr "" #: data/mat.ui:214 msgid "Add" -msgstr "" +msgstr "បន្ថែម" #: data/mat.ui:240 msgid "Check" -msgstr "" +msgstr "ពិនិត្យ" #: data/mat.ui:309 msgid "State" -msgstr "" +msgstr "សភាព" #: data/mat.ui:347 data/mat.ui:499 msgid "Metadata" @@ -179,7 +180,7 @@ msgstr "" #: data/mat.ui:452 msgid "Supported formats" -msgstr "" +msgstr "ទ្រង់ទ្រាយដែលគាំទ្រ" #: data/mat.ui:486 msgid "Support"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 59a8f0dde1f67f6ad56b51592a8a9bd20aaef26b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:45:57 2014 +0000 Update translations for https_everywhere --- km/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/https-everywhere.dtd b/km/https-everywhere.dtd index f009004..f6869ee 100644 --- a/km/https-everywhere.dtd +++ b/km/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "អំពី HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> +<!ENTITY https-everywhere.about.ext_description "អ៊ិនគ្រីបតំបន់បណ្ដាញ! ប្រើសុវត្ថិភាព HTTPS នៅលើបណ្ដាញជាច្រើន។"> <!ENTITY https-everywhere.about.version "កំណែ"> <!ENTITY https-everywhere.about.created_by "បានបង្កើតដោយ"> <!ENTITY https-everywhere.about.librarians "Ruleset Librarians">

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 27 Jan '14

27 Jan '14

commit 134cec88eb4635767a878414e5922c2722617115 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 02:45:07 2014 +0000 Update translations for orbot --- values-km/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/values-km/strings.xml b/values-km/strings.xml index 6010cbd..5238f2b 100644 --- a/values-km/strings.xml +++ b/values-km/strings.xml @@ -3,6 +3,7 @@ <string name="menu_info">Help</string> <string name="menu_start">ចាប់ផ្ដើម</string> <string name="button_help">Help</string> + <string name="menu_verify">ពិនិត្យ</string> <string name="menu_exit">ចាកចេញ</string> <string name="btn_cancel">Cancel</string>

1 0

[arm/master] Moving glyph demoing to its own executable
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 7b93874508050223d5ed36b67b889f1cbdfaa432 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 25 13:59:25 2014 -0800 Moving glyph demoing to its own executable Our curses glyph demo is a handly tool for curses development, but there's no reason for it to be part of our ui_tools. It's a script to demo curses' capabilities and only ever meant to be a reference during development. --- arm/demo_glyphs.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++ arm/util/ui_tools.py | 69 +++----------------------------------------------- 2 files changed, 69 insertions(+), 66 deletions(-) diff --git a/arm/demo_glyphs.py b/arm/demo_glyphs.py new file mode 100755 index 0000000..7781139 --- /dev/null +++ b/arm/demo_glyphs.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python +# Copyright 2014, Damian Johnson and The Tor Project +# See LICENSE for licensing information + +""" +Displays all ACS options with their corresponding representation. These are +undocumented in the pydocs. For more information see the following man page: + +http://www.mkssoftware.com/docs/man5/terminfo.5.asp +""" + +import curses + + +def main(): + try: + curses.wrapper(_show_glyphs) + except KeyboardInterrupt: + pass # quit + + +def _show_glyphs(stdscr): + """ + Renders a chart with the ACS glyphs. + """ + + try: + curses.use_default_colors() # allow semi-transparent backgrounds + except curses.error: + pass + + try: + curses.curs_set(0) # attempt to make the cursor invisible + except curses.error: + pass + + height, width = stdscr.getmaxyx() + columns = width / 30 + + if columns == 0: + return # not wide enough to show anything + + # mapping of keycodes to their ACS option names (for instance, ACS_LTEE) + + acs_options = dict((v, k) for (k, v) in curses.__dict__.items() if k.startswith('ACS_')) + + stdscr.addstr(0, 0, 'Curses Glyphs:', curses.A_STANDOUT) + x, y = 0, 2 + + for keycode in sorted(acs_options.keys()): + stdscr.addstr(y, x * 30, '%s (%i)' % (acs_options[keycode], keycode)) + stdscr.addch(y, (x * 30) + 25, keycode) + + x += 1 + + if x >= columns: + x, y = 0, y + 1 + + if y >= height: + break + + stdscr.getch() # quit on keyboard input + + +if __name__ == '__main__': + main() diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index 7a1a601..1d90001 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -13,6 +13,7 @@ from curses.ascii import isprint from stem.util import conf, enum, log, system # colors curses can handle + COLOR_LIST = { "red": curses.COLOR_RED, "green": curses.COLOR_GREEN, @@ -25,10 +26,12 @@ COLOR_LIST = { } # boolean for if we have color support enabled, None not yet determined + COLOR_IS_SUPPORTED = None # mappings for get_color() - this uses the default terminal color scheme if # color support is unavailable + COLOR_ATTR_INITIALIZED = False COLOR_ATTR = dict([(color, 0) for color in COLOR_LIST]) @@ -51,72 +54,6 @@ CONFIG = conf.config_dict("arm", { }, conf_handler) -def demo_glyphs(): - """ - Displays all ACS options with their corresponding representation. These are - undocumented in the pydocs. For more information see the following man page: - http://www.mkssoftware.com/docs/man5/terminfo.5.asp - """ - - try: - curses.wrapper(_show_glyphs) - except KeyboardInterrupt: - pass # quit - - -def _show_glyphs(stdscr): - """ - Renders a chart with the ACS glyphs. - """ - - # allows things like semi-transparent backgrounds - - try: - curses.use_default_colors() - except curses.error: - pass - - # attempts to make the cursor invisible - - try: - curses.curs_set(0) - except curses.error: - pass - - acs_options = [item for item in curses.__dict__.items() if item[0].startswith("ACS_")] - acs_options.sort(key=lambda i: (i[1])) # order by character codes - - # displays a chart with all the glyphs and their representations - - height, width = stdscr.getmaxyx() - - if width < 30: - return # not enough room to show a column - - columns = width / 30 - - # display title - - stdscr.addstr(0, 0, "Curses Glyphs:", curses.A_STANDOUT) - - x, y = 0, 1 - - while acs_options: - name, keycode = acs_options.pop(0) - stdscr.addstr(y, x * 30, "%s (%i)" % (name, keycode)) - stdscr.addch(y, (x * 30) + 25, keycode) - - x += 1 - - if x >= columns: - x, y = 0, y + 1 - - if y >= height: - break - - stdscr.getch() # quit on keyboard input - - def get_printable(line, keep_newlines = True): """ Provides the line back with non-printable characters stripped.

1 0

[arm/master] Revised color util handling
by atagar＠torproject.org 27 Jan '14

27 Jan '14

commit 7a15738d01cb62e47e776ed41e4fb0a227f33dbb Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 26 13:24:26 2014 -0800 Revised color util handling Cleaning up our ui_tools' color functions. --- arm/config/strings.cfg | 7 +- arm/controller.py | 6 +- arm/util/tracker.py | 4 +- arm/util/ui_tools.py | 280 ++++++++++++++++++++++++------------------------ 4 files changed, 151 insertions(+), 146 deletions(-) diff --git a/arm/config/strings.cfg b/arm/config/strings.cfg index 60194d2..17a9cd7 100644 --- a/arm/config/strings.cfg +++ b/arm/config/strings.cfg @@ -12,6 +12,8 @@ # ################################################################################ +msg.wrap {text} + msg.config.unable_to_load_settings Unable to load arm's internal configurations: {error} msg.config.unable_to_read_file Failed to load configuration (using defaults): "{error}" msg.config.nothing_loaded No armrc loaded, using defaults. You can customize arm by placing a configuration file at {path} (see the armrc.sample for its options). @@ -34,6 +36,8 @@ msg.setup.set_freebsd_chroot Adjusting paths to account for Tor running in a Fre msg.setup.tor_is_running_as_root Tor is currently running with root permissions. This isn't a good idea, nor should it be necessary. See the 'User UID' option on Tor's man page for an easy method of reducing its permissions after startup. msg.setup.unable_to_determine_pid Unable to determine Tor's pid. Some information, like its resource usage will be unavailable. msg.setup.unknown_event_types arm doesn't recognize the following event types: {event_types} (log 'UNKNOWN' events to see them) +msg.setup.color_support_available Terminal color support detected and enabled +msg.setup.color_support_unavailable Terminal color support unavailable msg.tracker.abort_getting_resources Failed three attempts to get process resource usage from {resolver}, {response} ({exc}) msg.tracker.abort_getting_port_usage Failed three attempts to determine the process using active ports ({exc}) @@ -45,8 +49,9 @@ msg.tracker.unable_to_use_resolver Unable to query connections with {old_resolve msg.usage.invalid_arguments {error} (for usage provide --help) msg.usage.not_a_valid_address '{address_input}' isn't a valid IPv4 address -msg.not_a_valid_port '{port_input}' isn't a valid port number +msg.usage.not_a_valid_port '{port_input}' isn't a valid port number msg.usage.unrecognized_log_flags Unrecognized event flags: {flags} +msg.usage.unable_to_set_color_override "{color}" isn't a valid color msg.connect.missing_password_bug |BUG: You provided a password but despite this stem reported that it was diff --git a/arm/controller.py b/arm/controller.py index 98b5adb..e684215 100644 --- a/arm/controller.py +++ b/arm/controller.py @@ -24,7 +24,7 @@ import arm.util.tracker from stem.control import State -from arm.util import panel, tor_config, tor_tools +from arm.util import panel, tor_config, tor_tools, ui_tools from stem.util import conf, enum, log, system @@ -41,6 +41,7 @@ def conf_handler(key, value): CONFIG = conf.config_dict("arm", { "startup.events": "N3", "startup.data_directory": "~/.arm", + "features.acsSupport": True, "features.panels.show.graph": True, "features.panels.show.log": True, "features.panels.show.connection": True, @@ -587,6 +588,9 @@ def start_arm(stdscr): init_controller(stdscr, start_time) control = get_controller() + if not CONFIG["features.acsSupport"]: + ui_tools.disable_acs() + # provides notice about any unused config keys for key in conf.get_config("arm").unused_keys(): diff --git a/arm/util/tracker.py b/arm/util/tracker.py index e56630d..a10d291 100644 --- a/arm/util/tracker.py +++ b/arm/util/tracker.py @@ -40,7 +40,7 @@ import time import threading from stem.control import State -from stem.util import conf, connection, log, proc, str_tools, system +from stem.util import conf, connection, proc, str_tools, system from arm.util import tor_controller, debug, info, notice @@ -465,7 +465,7 @@ class ConnectionTracker(Daemon): return True except IOError as exc: - log.info(exc) + info('wrap', text = exc) # Fail over to another resolver if we've repeatedly been unable to use # this one. diff --git a/arm/util/ui_tools.py b/arm/util/ui_tools.py index 1d90001..9e4a622 100644 --- a/arm/util/ui_tools.py +++ b/arm/util/ui_tools.py @@ -1,8 +1,5 @@ """ -Toolkit for common ui tasks when working with curses. This provides a quick and -easy method of providing the following interface components: -- preinitialized curses color attributes -- unit conversion for labels +Toolkit for working with curses. """ import sys @@ -10,88 +7,70 @@ import curses from curses.ascii import isprint -from stem.util import conf, enum, log, system +from arm.util import info, msg -# colors curses can handle +from stem.util import conf, enum, system COLOR_LIST = { - "red": curses.COLOR_RED, - "green": curses.COLOR_GREEN, - "yellow": curses.COLOR_YELLOW, - "blue": curses.COLOR_BLUE, - "cyan": curses.COLOR_CYAN, - "magenta": curses.COLOR_MAGENTA, - "black": curses.COLOR_BLACK, - "white": curses.COLOR_WHITE, + 'red': curses.COLOR_RED, + 'green': curses.COLOR_GREEN, + 'yellow': curses.COLOR_YELLOW, + 'blue': curses.COLOR_BLUE, + 'cyan': curses.COLOR_CYAN, + 'magenta': curses.COLOR_MAGENTA, + 'black': curses.COLOR_BLACK, + 'white': curses.COLOR_WHITE, } -# boolean for if we have color support enabled, None not yet determined +DEFAULT_COLOR_ATTR = dict([(color, 0) for color in COLOR_LIST]) +COLOR_ATTR = None -COLOR_IS_SUPPORTED = None - -# mappings for get_color() - this uses the default terminal color scheme if -# color support is unavailable - -COLOR_ATTR_INITIALIZED = False -COLOR_ATTR = dict([(color, 0) for color in COLOR_LIST]) - -Ending = enum.Enum("ELLIPSE", "HYPHEN") +Ending = enum.Enum('ELLIPSE', 'HYPHEN') SCROLL_KEYS = (curses.KEY_UP, curses.KEY_DOWN, curses.KEY_PPAGE, curses.KEY_NPAGE, curses.KEY_HOME, curses.KEY_END) def conf_handler(key, value): - if key == "features.color_override" and value != "none": - try: - set_color_override(value) - except ValueError as exc: - log.notice(exc) + if key == 'features.color_override': + if value not in COLOR_LIST.keys() and value != 'none': + raise ValueError(msg('usage.unable_to_set_color_override', color = value)) -CONFIG = conf.config_dict("arm", { - "features.color_override": "none", - "features.colorInterface": True, - "features.acsSupport": True, +CONFIG = conf.config_dict('arm', { + 'features.color_override': 'none', + 'features.colorInterface': True, }, conf_handler) -def get_printable(line, keep_newlines = True): - """ - Provides the line back with non-printable characters stripped. - - Arguments: - line - string to be processed - stripNewlines - retains newlines if true, stripped otherwise - """ - - line = line.replace('\xc2', "'") - line = "".join([char for char in line if (isprint(char) or (keep_newlines and char == "\n"))]) - - return line - - def is_color_supported(): """ - True if the display supports showing color, false otherwise. - """ + Checks if curses presently supports rendering colors. - if COLOR_IS_SUPPORTED is None: - _init_colors() + :returns: **True** if colors can be rendered, **False** otherwise + """ - return COLOR_IS_SUPPORTED + return _color_attr() != DEFAULT_COLOR_ATTR def get_color(color): """ Provides attribute corresponding to a given text color. Supported colors include: - red green yellow blue - cyan magenta black white + + * red + * green + * yellow + * blue + * cyan + * magenta + * black + * white If color support isn't available or colors can't be initialized then this uses the terminal's default coloring scheme. - Arguments: - color - name of the foreground color to be returned + :param str color: color attributes to be provided + + :returns: **tuple** color pair used by curses to render the color """ color_override = get_color_override() @@ -99,43 +78,111 @@ def get_color(color): if color_override: color = color_override - if not COLOR_ATTR_INITIALIZED: - _init_colors() - - return COLOR_ATTR[color] + return _color_attr()[color] def set_color_override(color = None): """ - Overwrites all requests for color with the given color instead. This raises - a ValueError if the color is invalid. + Overwrites all requests for color with the given color instead. - Arguments: - color - name of the color to overwrite requests with, None to use normal - coloring + :param str color: color to override all requests with, **None** if color + requests shouldn't be overwritten + + :raises: **ValueError** if the color name is invalid """ + arm_config = conf.get_config('arm') + if color is None: - CONFIG["features.color_override"] = "none" + arm_config.set('features.color_override', 'none') elif color in COLOR_LIST.keys(): - CONFIG["features.color_override"] = color + arm_config.set('features.color_override', color) else: - raise ValueError("\"%s\" isn't a valid color" % color) + raise ValueError(msg('usage.unable_to_set_color_override', color = color)) def get_color_override(): """ - Provides the override color used by the interface, None if it isn't set. + Provides the override color used by the interface. + + :returns: **str** for the color requrests will be overwritten with, **None** + if no override is set """ - color_override = CONFIG.get("features.color_override", "none") + color_override = CONFIG.get('features.color_override', 'none') - if color_override == "none": + if color_override == 'none': return None else: return color_override +def _color_attr(): + """ + Initializes color mappings usable by curses. This can only be done after + calling curses.initscr(). + """ + + global COLOR_ATTR + + if COLOR_ATTR is None: + if not CONFIG['features.colorInterface']: + COLOR_ATTR = DEFAULT_COLOR_ATTR + elif curses.has_colors(): + color_attr = dict([(color, 0) for color in COLOR_LIST]) + + for color_pair, color_name in enumerate(COLOR_LIST): + foreground_color = COLOR_LIST[color_name] + background_color = -1 # allows for default (possibly transparent) background + curses.init_pair(color_pair + 1, foreground_color, background_color) + color_attr[color_name] = curses.color_pair(color_pair + 1) + + info('setup.color_support_available') + COLOR_ATTR = color_attr + else: + info('setup.color_support_unavailable') + COLOR_ATTR = DEFAULT_COLOR_ATTR + + return COLOR_ATTR + + +def disable_acs(): + """ + Replaces the curses ACS characters. This can be preferable if curses is + unable to render them... + + http://www.atagar.com/arm/images/acs_display_failure.png + """ + + for item in curses.__dict__: + if item.startswith('ACS_'): + curses.__dict__[item] = ord('+') + + # replace a few common border pipes that are better rendered as '|' or + # '-' instead + + curses.ACS_SBSB = ord('|') + curses.ACS_VLINE = ord('|') + curses.ACS_BSBS = ord('-') + curses.ACS_HLINE = ord('-') + + +def get_printable(line, keep_newlines = True): + """ + Provides the line back with non-printable characters stripped. + + :param str line: string to be processed + :param str keep_newlines: retains newlines if **True**, stripped otherwise + + :returns: **str** of the line with only printable content + """ + + line = line.replace('\xc2', "'") + line = filter(lambda char: isprint(char) or (keep_newlines and char == '\n'), line) + + return line + + def crop_str(msg, size, min_word_length = 4, min_crop = 0, end_type = Ending.ELLIPSE, get_remainder = False): """ Provides the msg constrained to the given length, truncating on word breaks. @@ -143,29 +190,29 @@ def crop_str(msg, size, min_word_length = 4, min_crop = 0, end_type = Ending.ELL isn't room for even a truncated single word (or one word plus the ellipse if including those) then this provides an empty string. If a cropped string ends with a comma or period then it's stripped (unless we're providing the - remainder back). Examples: + remainder back). For example... - crop_str("This is a looooong message", 17) - "This is a looo..." + >>> crop_str("This is a looooong message", 17) + "This is a looo..." - crop_str("This is a looooong message", 12) - "This is a..." + >>> crop_str("This is a looooong message", 12) + "This is a..." - crop_str("This is a looooong message", 3) - "" + >>> crop_str("This is a looooong message", 3) + "" - Arguments: - msg - source text - size - room available for text - min_word_length - minimum characters before which a word is dropped, requires - whole word if None - min_crop - minimum characters that must be dropped if a word's cropped - end_type - type of ending used when truncating: - None - blank ending - Ending.ELLIPSE - includes an ellipse - Ending.HYPHEN - adds hyphen when breaking words - get_remainder - returns a tuple instead, with the second part being the - cropped portion of the message + :param str msg: text to be processed + :param int size: space available for text + :param int min_word_length: minimum characters before which a word is + dropped, requires whole word if **None** + :param int min_crop: minimum characters that must be dropped if a word is + cropped + :param Ending end_type: type of ending used when truncating, no special + truncation is used if **None** + :param bool get_remainder: returns a tuple with the second part being the + cropped portion of the message + + :returns: **str** of the text truncated to the given length """ # checks if there's room for the whole message @@ -512,54 +559,3 @@ def is_wide_characters_supported(): pass return False - - -def _init_colors(): - """ - Initializes color mappings usable by curses. This can only be done after - calling curses.initscr(). - """ - - global COLOR_ATTR_INITIALIZED, COLOR_IS_SUPPORTED - - if not COLOR_ATTR_INITIALIZED: - # hack to replace all ACS characters with '+' if ACS support has been - # manually disabled - - if not CONFIG["features.acsSupport"]: - for item in curses.__dict__: - if item.startswith("ACS_"): - curses.__dict__[item] = ord('+') - - # replace a few common border pipes that are better rendered as '|' or - # '-' instead - - curses.ACS_SBSB = ord('|') - curses.ACS_VLINE = ord('|') - curses.ACS_BSBS = ord('-') - curses.ACS_HLINE = ord('-') - - COLOR_ATTR_INITIALIZED = True - COLOR_IS_SUPPORTED = False - - if not CONFIG["features.colorInterface"]: - return - - try: - COLOR_IS_SUPPORTED = curses.has_colors() - except curses.error: - return # initscr hasn't been called yet - - # initializes color mappings if color support is available - if COLOR_IS_SUPPORTED: - colorpair = 0 - log.info("Terminal color support detected and enabled") - - for color_name in COLOR_LIST: - foreground_color = COLOR_LIST[color_name] - background_color = -1 # allows for default (possibly transparent) background - colorpair += 1 - curses.init_pair(colorpair, foreground_color, background_color) - COLOR_ATTR[color_name] = curses.color_pair(colorpair) - else: - log.info("Terminal color support unavailable")

1 0