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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 4a5f7d0b50360a33818962d955cffadf543d90d0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 08:15:28 2016 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index 4183e25..a562191 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "Inställningar för SSL Observatoriet"> <!ENTITY https-everywhere.menu.globalEnable "Aktivera HTTPS Everywhere"> <!ENTITY https-everywhere.menu.globalDisable "Inaktivera HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blockera alla okrypterade förfrågningar"> <!ENTITY https-everywhere.menu.showCounter "Visa räknare"> <!ENTITY https-everywhere.menu.viewAllRules "Visa alla regler">

1 0

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

16 Jul '16

commit 1186af4161b85f04e2344bc18945fc5921b835d2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 06:45:03 2016 +0000 Update translations for bridgedb --- hi/LC_MESSAGES/bridgedb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po index 520c6a9..a20020a 100644 --- a/hi/LC_MESSAGES/bridgedb.po +++ b/hi/LC_MESSAGES/bridgedb.po @@ -10,7 +10,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-07-16 06:14+0000\n" +"PO-Revision-Date: 2016-07-16 06:24+0000\n" "Last-Translator: Shubham Singh <kalyanwat2(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,7 @@ msgstr "आपने आवृति दर की सीमा पार कर #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "आदेश: (क्रमशः एक से अधिक विकल्प उल्लेखित करने के लिए आदेशों को एक साथ जोड़ें)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -188,7 +188,7 @@ msgstr "BridgeDB में आपका स्वागत हैं!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "वर्तमान में समर्थित Transport TYPEs:" #: bridgedb/strings.py:56 #, python-format @@ -251,7 +251,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "bridges क्या हैं?" #: bridgedb/strings.py:102 #, python-format @@ -317,7 +317,7 @@ msgstr "" #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "ऊपर के चित्र से अक्षर डाले." #: bridgedb/strings.py:144 msgid "How to start using your bridges" @@ -357,18 +357,18 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "यह सन्देश दिखाएं." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "vanilla bridges के लिए निवेदन करें." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6 bridges के लिए निवेदन करें." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 @@ -379,4 +379,4 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "BridgeDB की सार्वजनिक GnuPG कुंजी प्राप्त करें."

1 0

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

16 Jul '16

commit 3ecb05229118020c85079702251ebc0ed0d80c4a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 06:15:03 2016 +0000 Update translations for bridgedb --- hi/LC_MESSAGES/bridgedb.po | 55 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po index af53bef..520c6a9 100644 --- a/hi/LC_MESSAGES/bridgedb.po +++ b/hi/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Bineet kumar gaur <bineetkumar(a)live.in>, 2014 +# Shubham Singh <kalyanwat2(a)gmail.com>, 2016 msgid "" 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-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2016-07-16 06:14+0000\n" +"Last-Translator: Shubham Singh <kalyanwat2(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,35 +33,35 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "क्षमा करें ! आपका अनुरोध पूरा नहीं किया जा सका." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "किसी त्रुटी के बारें में बताएं " #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "संकेत लिपि का स्त्रोत " #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "परिवर्तनसूची " #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "संपर्क करें " #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "सब कुछ चुने " #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "QRcode दिखाएं " #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "आपकी bridge lines के लिए QRCode " #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -69,58 +70,58 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "अरे नहीं , Spaghettios!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "ऐसा लग रहा है आपके QRCode को प्राप्त करने में कुछ त्रुटी हुई." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "यह QRCode आपकी bridge lines रखता हैं. अपनी bridge lines को मोबाइल और दुसरे उपकरणों में प्रतिलिपि प्राप्त करने के लिए इसे QRCode Reader से Scan करें ." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "इस समय कोई bridge उपलब्ध नहीं हैं ..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "शायद आपको %sपीछे जाकर %sदुबारा से दूसरा bridge type का चयन करने की कोशिश करनी चाहिए!" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "चरण %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "%s Tor Browser %s डाउनलोड करें." #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "चरण %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "%s bridges %s प्राप्त हो रहे हैं " #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "चरण %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "अब %s bridges को Tor Browser से जोड़ें %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -129,7 +130,7 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sकेवल%s bridges दीजिये !" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -157,22 +158,22 @@ msgstr "%sजी%s हाँ!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sB%sridges प्राप्त हो रहे हैं." #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[यह एक स्वचालित सन्देश हैं; कृप्या जवाब न दें.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "ये रहे आपके bridges:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "आपने आवृति दर की सीमा पार कर ली है. कृपया गति कम करें! \nEmails के बीच का न्यूनतम समय %s घंटे हैं. इस समय सीमा में आने वाले Emails अनदेखे कर दिए जायेगे. " #: bridgedb/strings.py:50 msgid "" @@ -182,7 +183,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "BridgeDB में आपका स्वागत हैं!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 8bfaa47610a17812c8b6de284a5d7f123473dda0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 05:46:00 2016 +0000 Update translations for torbirdy_completed --- hi/torbirdy.dtd | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd new file mode 100644 index 0000000..e7428f1 --- /dev/null +++ b/hi/torbirdy.dtd @@ -0,0 +1,58 @@ +<!ENTITY torbirdy.accountprefs.title "खाता विन्यास"> +<!ENTITY torbirdy.accountprefs.startup.label "शुरु होते ही नए संदेशों की जाँच करें"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "सभी नए संदेशों की जाँच करें"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "मिनट"> +<!ENTITY torbirdy.accountprefs.cancel.button "रद्द करें "> +<!ENTITY torbirdy.accountprefs.save.button "संचय करें "> +<!ENTITY torbirdy.accountprefs.save.key "s"> + +<!ENTITY torbirdy.prefs.title "टॉरबर्डी प्राथमिकताएं"> +<!ENTITY torbirdy.prefs.save.button "संचय करें "> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "रद्द करें "> +<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "Proxy Settings जाँचे "> +<!ENTITY torbirdy.prefs.testproxy.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "निजता"> +<!ENTITY torbirdy.prefs.enigmail.label "इनिग्मेल"> +<!ENTITY torbirdy.prefs.recommended.text "टॉरबर्डी (टॉर) के लिए अनुशंसित प्रोक्सी सेटिंग्स का प्रयोग करें"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "एक अज्ञातीकरण सेवा चुनें"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "व्यवहारिक प्रोक्सी सेटिंग का उपयोग करे"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS आतिथेय :"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "पोर्ट/द्वार :"> +<!ENTITY torbirdy.prefs.socks_port.key "P/प"> +<!ENTITY torbirdy.prefs.torification.label "पारदर्शी Torification (चेतावनी: चयनित transproxy या टॉर राउटर की आवश्यकता)"> +<!ENTITY torbirdy.prefs.torification.key "टी "> +<!ENTITY torbirdy.prefs.global "वैश्विक"> +<!ENTITY torbirdy.prefs.imap.label "IMAP खाते के लिये पुश ई-मेल समर्थन को सक्षम करें [डिफ़ॉल्ट: अक्षम]"> +<!ENTITY torbirdy.prefs.imap.key "P"> +<!ENTITY torbirdy.prefs.startup_folder.label "स्टार्टअप होने पर अंतिम बार एक्सेस किये गए मेल फोल्डर को चुने. [डिफ़ॉल्ट: अक्षम]"> +<!ENTITY torbirdy.prefs.startup_folder.key "i"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "इनक्रिप्टेट (गोपनीकृत) संदेशों में प्राप्तकर्ता की कुंजी न प्रेषित करें [मानक स्थिति: प्रेषित]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.confirmemail.label "यदि इनिग्मेल सक्रिय है, तो ई मेल प्रेषित करने से पूर्व पुष्टि करें [मानक स्थिति: पुष्टि न करें]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "थंडरबर्ड का स्वचालित ई मेल कन्फिगरेशन विज़र्ड सक्षम करें [मानक: अक्षम]"> +<!ENTITY torbirdy.prefs.emailwizard.key "P/प"> +<!ENTITY torbirdy.prefs.automatic.label "सभी खातों के लिए नये संदेशों कि स्वतः जाँच करें [मानक: अक्षम]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.account_specific "खाता विशिष्ट"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "खाता चुनें"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "उपयोग करने के लिए Keyserver(s):"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये."> +<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) का उपयोग करें "> +<!ENTITY torbirdy.panel.usewhonix.label "Whonix का उपयोग करें"> +<!ENTITY torbirdy.panel.preferences.label "TorBirdy Preferences खोलें "> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 132f68acfc63c5075674337504a772e8e2ef24b9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 05:45:50 2016 +0000 Update translations for torbirdy --- hi/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index fd816c3..e7428f1 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -34,7 +34,7 @@ <!ENTITY torbirdy.prefs.global "वैश्विक"> <!ENTITY torbirdy.prefs.imap.label "IMAP खाते के लिये पुश ई-मेल समर्थन को सक्षम करें [डिफ़ॉल्ट: अक्षम]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> +<!ENTITY torbirdy.prefs.startup_folder.label "स्टार्टअप होने पर अंतिम बार एक्सेस किये गए मेल फोल्डर को चुने. [डिफ़ॉल्ट: अक्षम]"> <!ENTITY torbirdy.prefs.startup_folder.key "i"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "इनक्रिप्टेट (गोपनीकृत) संदेशों में प्राप्तकर्ता की कुंजी न प्रेषित करें [मानक स्थिति: प्रेषित]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> @@ -47,7 +47,7 @@ <!ENTITY torbirdy.prefs.account_specific "खाता विशिष्ट"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "खाता चुनें"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "उपयोग करने के लिए Keyserver(s):"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये.">

1 0

[nyx/master] Drop legacy draw method
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 0f7339404ba391a26047ddc3fe0272812e84a3cf Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 09:04:15 2016 -0700 Drop legacy draw method Now that all our panels use the new draw() function the other condition is dead code. This in turns means we can drop the force flag since it's unused. --- nyx/controller.py | 6 ++--- nyx/panel/__init__.py | 59 ++++++------------------------------------------- nyx/panel/config.py | 8 +++---- nyx/panel/connection.py | 8 +++---- nyx/panel/graph.py | 8 +++---- nyx/panel/header.py | 4 ++-- nyx/panel/log.py | 12 +++++----- nyx/panel/torrc.py | 8 +++---- 8 files changed, 34 insertions(+), 79 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 1957770..964e27d 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -153,7 +153,7 @@ class Controller(object): if page_number != self._page: self._page = page_number self._force_redraw = True - self.header_panel().redraw(True) + self.header_panel().redraw() def next_page(self): """ @@ -184,7 +184,7 @@ class Controller(object): if is_pause != self._is_paused: self._is_paused = is_pause self._force_redraw = True - self.header_panel().redraw(True) + self.header_panel().redraw() for panel_impl in self.get_all_panels(): panel_impl.set_paused(is_pause) @@ -265,7 +265,7 @@ class Controller(object): stdscr.clear() for panel_impl in display_panels: - panel_impl.redraw(force) + panel_impl.redraw() if force: self._last_drawn = current_time diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 313f264..06af3e1 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -172,7 +172,7 @@ class Panel(object): self.pause_time = time.time() self.paused = is_pause - self.redraw(True) + self.redraw() def get_pause_time(self): """ @@ -238,7 +238,7 @@ class Panel(object): return () - def draw(self, width, height): + def draw(self, subwindow): """ Draws display's content. This is meant to be overwritten by implementations and not called directly (use redraw() instead). The @@ -246,19 +246,15 @@ class Panel(object): a column less than the actual space. Arguments: - width - horizontal space available for content - height - vertical space available for content + subwindow - window content is drawn into """ pass - def redraw(self, force_redraw=False): + def redraw(self): """ Clears display and redraws its content. This can skip redrawing content if able (ie, the subwindow's unchanged), instead just refreshing the display. - - Arguments: - force_redraw - forces the content to be cleared and redrawn if true """ # skipped if not currently visible or activity has been halted @@ -266,51 +262,10 @@ class Panel(object): if not self.visible or HALT_ACTIVITY: return - if self.panel_name in ('header', 'graph', 'log', 'connections', 'configuration', 'torrc'): - height = self.get_height() if self.get_height() != -1 else None - width = self.get_width() if self.get_width() != -1 else None - - nyx.curses.draw(self.draw, top = self.top, width = width, height = height) - return - - # if the panel's completely outside its parent then this is a no-op - - new_height, new_width = self.get_preferred_size() - - if new_height == 0 or new_width == 0: - self.win = None - return - - # recreates the subwindow if necessary - - is_new_window = self._reset_subwindow() - - if not self.win: - return - - # The reset argument is disregarded in a couple of situations: - # - The subwindow's been recreated (obviously it then doesn't have the old - # content to refresh). - # - The subwindow's dimensions have changed since last drawn (this will - # likely change the content's layout) - - subwin_max_y, subwin_max_x = self.win.getmaxyx() - - if is_new_window or subwin_max_y != self.max_y or subwin_max_x != self.max_x: - force_redraw = True - - self.max_y, self.max_x = subwin_max_y, subwin_max_x - - if not nyx.curses.CURSES_LOCK.acquire(False): - return + height = self.get_height() if self.get_height() != -1 else None + width = self.get_width() if self.get_width() != -1 else None - try: - if force_redraw: - self.win.erase() # clears any old contents - self.draw(self.max_x, self.max_y) - self.win.refresh() - finally: - nyx.curses.CURSES_LOCK.release() + nyx.curses.draw(self.draw, top = self.top, width = width, height = height) def hline(self, y, x, length, *attributes): """ diff --git a/nyx/panel/config.py b/nyx/panel/config.py index f3e747a..14e73ac 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -196,7 +196,7 @@ class ConfigPanel(nyx.panel.Panel): except IOError as exc: nyx.controller.show_message('Unable to save configuration (%s)' % exc.strerror, HIGHLIGHT, max_wait = 2) - self.redraw(True) + self.redraw() def key_handlers(self): def _scroll(key): @@ -204,7 +204,7 @@ class ConfigPanel(nyx.panel.Panel): is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) if is_changed: - self.redraw(True) + self.redraw() def _edit_selected_value(): selected = self._scroller.selection(self._get_config_options()) @@ -224,13 +224,13 @@ class ConfigPanel(nyx.panel.Panel): new_value = new_value.split(',') # set_conf accepts list inputs tor_controller().set_conf(selected.name, new_value) - self.redraw(True) + self.redraw() except Exception as exc: nyx.controller.show_message('%s (press any key)' % exc, HIGHLIGHT, max_wait = 30) def _toggle_show_all(): self._show_all = not self._show_all - self.redraw(True) + self.redraw() return ( nyx.panel.KeyHandler('arrows', 'scroll up and down', _scroll, key_func = lambda key: key.is_scroll()), diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 3163b5d..2facd55 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -322,11 +322,11 @@ class ConnectionPanel(nyx.panel.DaemonPanel): is_changed = self._scroller.handle_key(key, lines, page_height) if is_changed: - self.redraw(True) + self.redraw() def _show_details(): self._show_details = not self._show_details - self.redraw(True) + self.redraw() def _show_descriptor(): entries = self._entries @@ -351,7 +351,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): elif key.match('right'): _scroll(nyx.curses.KeyInput(curses.KEY_DOWN)) - self.redraw(True) + self.redraw() def _pick_connection_resolver(): connection_tracker = nyx.tracker.get_connection_tracker() @@ -361,7 +361,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): selected = nyx.popups.select_from_list('Connection Resolver:', options, resolver if resolver else 'auto') connection_tracker.set_custom_resolver(None if selected == 'auto' else selected) - self.redraw(True) + self.redraw() 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 1043339..5869dff 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -435,7 +435,7 @@ class GraphPanel(nyx.panel.Panel): controller = tor_controller() controller.add_event_listener(self._update_accounting, EventType.BW) controller.add_event_listener(self._update_stats, EventType.BW) - controller.add_status_listener(lambda *args: self.redraw(True)) + controller.add_status_listener(lambda *args: self.redraw()) @property def displayed_stat(self): @@ -538,11 +538,11 @@ class GraphPanel(nyx.panel.Panel): def _next_bounds(): self.bounds_type = Bounds.next(self.bounds_type) - self.redraw(True) + self.redraw() def _pick_interval(): self.update_interval = nyx.popups.select_from_list('Update Interval:', list(Interval), self.update_interval) - self.redraw(True) + self.redraw() return ( nyx.panel.KeyHandler('g', 'resize graph', self.resize_graph), @@ -605,7 +605,7 @@ class GraphPanel(nyx.panel.Panel): update_rate = INTERVAL_SECONDS[self.update_interval] if param.primary.tick % update_rate == 0: - self.redraw(True) + self.redraw() def _draw_subgraph(subwindow, data, x, width, height, bounds_type, interval, color, fill_char = ' '): diff --git a/nyx/panel/header.py b/nyx/panel/header.py index d470ba1..231ff1b 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -70,7 +70,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): self._message = message self._message_attr = attr - self.redraw(True) + self.redraw() if 'max_wait' in kwargs: user_input = nyx.curses.key_input(kwargs['max_wait']) @@ -205,7 +205,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): self._reported_inactive = False log.notice('Relay resumed') - self.redraw(True) + self.redraw() class Sampling(object): diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 5d4c36e..355e52c 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -148,7 +148,7 @@ class LogPanel(nyx.panel.DaemonPanel): if event_types and event_types != self._event_types: self._event_types = nyx.log.listen_for_events(self._register_tor_event, event_types) - self.redraw(True) + self.redraw() def show_snapshot_prompt(self): """ @@ -170,7 +170,7 @@ class LogPanel(nyx.panel.DaemonPanel): """ self._event_log = nyx.log.LogGroup(CONFIG['cache.log_panel.size'], group_by_day = True) - self.redraw(True) + self.redraw() def save_snapshot(self, path): """ @@ -211,7 +211,7 @@ class LogPanel(nyx.panel.DaemonPanel): is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: - self.redraw(True) + self.redraw() def _pick_filter(): with nyx.curses.CURSES_LOCK: @@ -228,7 +228,7 @@ class LogPanel(nyx.panel.DaemonPanel): def _toggle_deduplication(): self.set_duplicate_visability(not self._show_duplicates) - self.redraw(True) + self.redraw() def _clear_log(): msg = 'This will clear the log. Are you sure (c again to confirm)?' @@ -300,7 +300,7 @@ class LogPanel(nyx.panel.DaemonPanel): if force_redraw: log.debug('redrawing the log panel with the corrected content height (%s)' % force_redraw_reason) - self.redraw(True) + self.redraw() def _update(self): """ @@ -313,7 +313,7 @@ class LogPanel(nyx.panel.DaemonPanel): if self._has_new_event or self._last_day != current_day: self._last_day = current_day - self.redraw(True) + self.redraw() def _register_tor_event(self, event): msg = ' '.join(str(event).split(' ')[1:]) diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 868e546..e9f4ee2 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -76,7 +76,7 @@ class TorrcPanel(panel.Panel): """ self._show_comments = is_visible - self.redraw(True) + self.redraw() def set_line_number_visible(self, is_visible): """ @@ -86,7 +86,7 @@ class TorrcPanel(panel.Panel): """ self._show_line_numbers = is_visible - self.redraw(True) + self.redraw() def key_handlers(self): def _scroll(key): @@ -94,7 +94,7 @@ class TorrcPanel(panel.Panel): is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: - self.redraw(True) + self.redraw() def _toggle_comment_stripping(): self.set_comments_visible(not self._show_comments) @@ -175,4 +175,4 @@ class TorrcPanel(panel.Panel): if self._last_content_height != new_content_height: self._last_content_height = new_content_height - self.draw(subwindow) + self.redraw()

1 0

[nyx/master] Drop name attribute of panels
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit a35433758b5e2f8e1e3ad3600f685d359b21cb6f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 08:38:06 2016 -0700 Drop name attribute of panels Now that we're only using this a couple spots in the menu we can finally drop this attribute. --- nyx/menu.py | 16 ++++++++++------ nyx/panel/__init__.py | 15 +++------------ nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/nyx/menu.py b/nyx/menu.py index 697dfac..fef66d3 100644 --- a/nyx/menu.py +++ b/nyx/menu.py @@ -10,7 +10,11 @@ import functools import nyx.controller import nyx.curses import nyx.popups +import nyx.panel.config +import nyx.panel.connection import nyx.panel.graph +import nyx.panel.log +import nyx.panel.torrc import nyx.controller import nyx.tracker @@ -38,15 +42,15 @@ def make_menu(): control = nyx.controller.get_controller() for page_panel in control.get_display_panels(): - if page_panel.get_name() == 'graph': + if isinstance(page_panel, nyx.panel.graph.GraphPanel): base_menu.add(make_graph_menu(page_panel)) - elif page_panel.get_name() == 'log': + elif isinstance(page_panel, nyx.panel.log.LogPanel): base_menu.add(make_log_menu(page_panel)) - elif page_panel.get_name() == 'connections': + elif isinstance(page_panel, nyx.panel.connection.ConnectionPanel): base_menu.add(make_connections_menu(page_panel)) - elif page_panel.get_name() == 'configuration': + elif isinstance(page_panel, nyx.panel.config.ConfigPanel): base_menu.add(make_configuration_menu(page_panel)) - elif page_panel.get_name() == 'torrc': + elif isinstance(page_panel, nyx.panel.torrc.TorrcPanel): base_menu.add(make_torrc_menu(page_panel)) base_menu.add(make_help_menu()) @@ -100,7 +104,7 @@ def make_view_menu(): for i in range(control.get_page_count()): page_panels = control.get_display_panels(page_number = i) - label = ' / '.join([str_tools._to_camel_case(panel.get_name()) for panel in page_panels]) + label = ' / '.join([type(panel).__name__.replace('Panel', '') for panel in page_panels]) view_menu.add(SelectionMenuItem(label, page_group, i)) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index fdd1480..c4d9222 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -77,12 +77,11 @@ class Panel(object): redraw(). """ - def __init__(self, name): + def __init__(self): """ Creates a durable wrapper for a curses subwindow in the given parent. Arguments: - name - identifier for the panel top - positioning of top within parent left - positioning of the left edge within the parent height - maximum height of panel (uses all available space if -1) @@ -93,7 +92,6 @@ class Panel(object): # implementations aren't entirely deterministic (for instance panels # might chose their height based on its parent's current width). - self.panel_name = name self.visible = False self.paused = False @@ -106,13 +104,6 @@ class Panel(object): self.max_y, self.max_x = -1, -1 # subwindow dimensions when last redrawn - def get_name(self): - """ - Provides panel's identifier. - """ - - return self.panel_name - def set_visible(self, is_visible): """ Toggles if the panel is visible or not. @@ -243,8 +234,8 @@ class Panel(object): class DaemonPanel(Panel, threading.Thread): - def __init__(self, name, update_rate): - Panel.__init__(self, name) + def __init__(self, update_rate): + Panel.__init__(self) threading.Thread.__init__(self) self.setDaemon(True) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index 14e73ac..cbbaa92 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -122,7 +122,7 @@ class ConfigPanel(nyx.panel.Panel): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'configuration') + nyx.panel.Panel.__init__(self) self._contents = [] self._scroller = nyx.curses.CursorScroller() diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 2facd55..8e032e6 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -262,7 +262,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): """ def __init__(self): - nyx.panel.DaemonPanel.__init__(self, 'connections', UPDATE_RATE) + nyx.panel.DaemonPanel.__init__(self, UPDATE_RATE) self._scroller = nyx.curses.CursorScroller() self._entries = [] # last fetched display entries diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 5869dff..9cf1d71 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -409,7 +409,7 @@ class GraphPanel(nyx.panel.Panel): """ def __init__(self): - nyx.panel.Panel.__init__(self, 'graph') + nyx.panel.Panel.__init__(self) self._displayed_stat = None if CONFIG['features.graph.type'] == 'none' else CONFIG['features.graph.type'] self._update_interval = CONFIG['features.graph.interval'] diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 231ff1b..a2a5ae7 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -44,7 +44,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): """ def __init__(self): - nyx.panel.DaemonPanel.__init__(self, 'header', UPDATE_RATE) + nyx.panel.DaemonPanel.__init__(self, UPDATE_RATE) self._vals = Sampling.create() self._last_width = nyx.curses.screen_size().width diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 355e52c..81b7a64 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -66,7 +66,7 @@ class LogPanel(nyx.panel.DaemonPanel): """ def __init__(self): - nyx.panel.DaemonPanel.__init__(self, 'log', UPDATE_RATE) + nyx.panel.DaemonPanel.__init__(self, UPDATE_RATE) logged_events = CONFIG['startup.events'].split(',') tor_events = tor_controller().get_info('events/names', '').split() diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index e9f4ee2..6927e0c 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -35,7 +35,7 @@ class TorrcPanel(panel.Panel): """ def __init__(self): - panel.Panel.__init__(self, 'torrc') + panel.Panel.__init__(self) self._scroller = nyx.curses.Scroller() self._show_line_numbers = True # shows left aligned line numbers

1 0

[nyx/master] Drop legacy draw methods
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit c98081dddc0cf3930dbfa38db999311869742544 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 09:12:17 2016 -0700 Drop legacy draw methods Now that we draw using our Subwindow class we can drop the old curses methods from Panel. --- nyx/panel/__init__.py | 287 -------------------------------------------------- 1 file changed, 287 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 06af3e1..fdd1480 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -6,16 +6,11 @@ Panels consisting the nyx interface. """ import collections -import curses import inspect import threading import time import nyx.curses -import stem.util.log - -from nyx.curses import HIGHLIGHT -from stem.util import conf, str_tools __all__ = [ 'config', @@ -26,16 +21,6 @@ __all__ = [ 'torrc', ] - -def conf_handler(key, value): - if key == 'features.torrc.maxLineWrap': - return max(1, value) - - -CONFIG = conf.config_dict('nyx', { - 'features.maxLineWrap': 8, -}, conf_handler) - HALT_ACTIVITY = False # prevents curses redraws if set @@ -119,16 +104,6 @@ class Panel(object): self.height = -1 self.width = -1 - # The panel's subwindow instance. This is made available to implementors - # via their draw method and shouldn't be accessed directly. - # - # This is None if either the subwindow failed to be created or needs to be - # remade before it's used. The later could be for a couple reasons: - # - The subwindow was never initialized. - # - Any of the parameters used for subwindow initialization have changed. - - self.win = None - self.max_y, self.max_x = -1, -1 # subwindow dimensions when last redrawn def get_name(self): @@ -192,7 +167,6 @@ class Panel(object): if self.top != top: self.top = top - self.win = None def get_height(self): """ @@ -267,267 +241,6 @@ class Panel(object): nyx.curses.draw(self.draw, top = self.top, width = width, height = height) - def hline(self, y, x, length, *attributes): - """ - Draws a horizontal line. This should only be called from the context of a - panel's draw method. - - Arguments: - y - vertical location - x - horizontal location - length - length the line spans - attr - text attributes - """ - - format_attr = nyx.curses.curses_attr(*attributes) - - if self.win and self.max_x > x and self.max_y > y: - try: - draw_length = min(length, self.max_x - x) - self.win.hline(y, x, curses.ACS_HLINE | format_attr, draw_length) - except: - # in edge cases drawing could cause a _curses.error - pass - - def vline(self, y, x, length, *attributes): - """ - Draws a vertical line. This should only be called from the context of a - panel's draw method. - - Arguments: - y - vertical location - x - horizontal location - length - length the line spans - attr - text attributes - """ - - format_attr = nyx.curses.curses_attr(*attributes) - - if self.win and self.max_x > x and self.max_y > y: - try: - draw_length = min(length, self.max_y - y) - self.win.vline(y, x, curses.ACS_VLINE | format_attr, draw_length) - except: - # in edge cases drawing could cause a _curses.error - pass - - def addch(self, y, x, char, *attributes): - """ - Draws a single character. This should only be called from the context of a - panel's draw method. - - Arguments: - y - vertical location - x - horizontal location - char - character to be drawn - attr - text attributes - """ - - format_attr = nyx.curses.curses_attr(*attributes) - - if self.win and self.max_x > x and self.max_y > y: - try: - self.win.addch(y, x, char, format_attr) - return x + 1 - except: - # in edge cases drawing could cause a _curses.error - pass - - return x - - def addstr(self, y, x, msg, *attributes): - """ - Writes string to subwindow if able. This takes into account screen bounds - to avoid making curses upset. This should only be called from the context - of a panel's draw method. - - Arguments: - y - vertical location - x - horizontal location - msg - text to be added - attr - text attributes - """ - - format_attr = nyx.curses.curses_attr(*attributes) - - # subwindows need a single character buffer (either in the x or y - # direction) from actual content to prevent crash when shrank - - if self.win and self.max_x > x and self.max_y > y: - try: - drawn_msg = msg[:self.max_x - x] - self.win.addstr(y, x, drawn_msg, format_attr) - return x + len(drawn_msg) - except: - # this might produce a _curses.error during edge cases, for instance - # when resizing with visible popups - - pass - - return x - - def addstr_wrap(self, y, x, msg, width, min_x = 0, *attr): - orig_y = y - - while msg: - draw_msg, msg = str_tools.crop(msg, width - x, None, ending = None, get_remainder = True) - - if not draw_msg: - draw_msg, msg = str_tools.crop(msg, width - x), '' # first word is longer than the line - - x = self.addstr(y, x, draw_msg, *attr) - - if (y - orig_y + 1) >= CONFIG['features.maxLineWrap']: - break # maximum number we'll wrap - - if msg: - x, y = min_x, y + 1 - - return x, y - - def add_scroll_bar(self, top, bottom, size, draw_top = 0): - """ - Draws a left justified scroll bar reflecting position within a vertical - listing. This is shorted if necessary, and left undrawn if no space is - available. The bottom is squared off, having a layout like: - | - *| - *| - *| - | - -+ - - This should only be called from the context of a panel's draw method. - - Arguments: - top - list index for the top-most visible element - bottom - list index for the bottom-most visible element - size - size of the list in which the listed elements are contained - draw_top - starting row where the scroll bar should be drawn - """ - - if (self.max_y - draw_top) < 2: - return # not enough room - - # determines scrollbar dimensions - - scrollbar_height = self.max_y - draw_top - 1 - slider_top = scrollbar_height * top / size - slider_size = scrollbar_height * (bottom - top) / size - - # ensures slider isn't at top or bottom unless really at those extreme bounds - - if top > 0: - slider_top = max(slider_top, 1) - - if bottom != size: - slider_top = min(slider_top, scrollbar_height - slider_size - 2) - - # avoids a rounding error that causes the scrollbar to be too low when at - # the bottom - - if bottom == size: - slider_top = scrollbar_height - slider_size - 1 - - # draws scrollbar slider - - for i in range(scrollbar_height): - if i >= slider_top and i <= slider_top + slider_size: - self.addstr(i + draw_top, 0, ' ', HIGHLIGHT) - else: - self.addstr(i + draw_top, 0, ' ') - - # draws box around the scroll bar - - self.vline(draw_top, 1, self.max_y - 2) - self.addch(self.max_y - 1, 1, curses.ACS_LRCORNER) - self.addch(self.max_y - 1, 0, curses.ACS_HLINE) - - def _reset_subwindow(self): - """ - Create a new subwindow instance for the panel if: - - Panel currently doesn't have a subwindow (was uninitialized or - invalidated). - - There's room for the panel to grow vertically (curses automatically - lets subwindows regrow horizontally, but not vertically). - - The subwindow has been displaced. This is a curses display bug that - manifests if the terminal's shrank then re-expanded. Displaced - subwindows are never restored to their proper position, resulting in - graphical glitches if we draw to them. - - The preferred size is smaller than the actual size (should shrink). - - This returns True if a new subwindow instance was created, False otherwise. - """ - - new_height, new_width = self.get_preferred_size() - - if new_height == 0: - return False # subwindow would be outside its parent - - # determines if a new subwindow should be recreated - - recreate = self.win is None - - if self.win: - subwin_max_y, subwin_max_x = self.win.getmaxyx() - recreate |= subwin_max_y < new_height # check for vertical growth - recreate |= self.top > self.win.getparyx()[0] # check for displacement - recreate |= subwin_max_x > new_width or subwin_max_y > new_height # shrinking - - # I'm not sure if recreating subwindows is some sort of memory leak but the - # Python curses bindings seem to lack all of the following: - # - subwindow deletion (to tell curses to free the memory) - # - subwindow moving/resizing (to restore the displaced windows) - # so this is the only option (besides removing subwindows entirely which - # would mean far more complicated code and no more selective refreshing) - - if recreate: - with nyx.curses.raw_screen() as stdscr: - self.win = stdscr.subwin(new_height, new_width, self.top, self.left) - - # note: doing this log before setting win produces an infinite loop - stem.util.log.debug("recreating panel '%s' with the dimensions of %i/%i" % (self.get_name(), new_height, new_width)) - - return recreate - - def draw_box(self, top = 0, left = 0, width = -1, height = -1, *attributes): - """ - Draws a box in the panel with the given bounds. - - Arguments: - top - vertical position of the box's top - left - horizontal position of the box's left side - width - width of the drawn box - height - height of the drawn box - attr - text attributes - """ - - if width == -1 or height == -1: - panel_height, panel_width = self.get_preferred_size() - - if width == -1: - width = panel_width - left - - if height == -1: - height = panel_height - top - - # draws the top and bottom - - self.hline(top, left + 1, width - 2, *attributes) - self.hline(top + height - 1, left + 1, width - 2, *attributes) - - # draws the left and right sides - - self.vline(top + 1, left, height - 2, *attributes) - self.vline(top + 1, left + width - 1, height - 2, *attributes) - - # draws the corners - - self.addch(top, left, curses.ACS_ULCORNER, *attributes) - self.addch(top, left + width - 1, curses.ACS_URCORNER, *attributes) - self.addch(top + height - 1, left, curses.ACS_LLCORNER, *attributes) - self.addch(top + height - 1, left + width - 1, curses.ACS_LRCORNER, *attributes) - class DaemonPanel(Panel, threading.Thread): def __init__(self, name, update_rate):

1 0

[nyx/master] Make Panel attributes private
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit f82b9229354a11a006deed91acc5bd38b49e500f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 09:46:42 2016 -0700 Make Panel attributes private With one minor exception we were already only using these attributes from within the Panel class. Marking 'em as private. --- nyx/panel/__init__.py | 77 ++++++++++++++++++++------------------------------- nyx/panel/graph.py | 2 +- 2 files changed, 31 insertions(+), 48 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index c4d9222..ee938dc 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -65,44 +65,20 @@ class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current' class Panel(object): """ - Wrapper for curses subwindows. This hides most of the ugliness in common - curses operations including: - - locking when concurrently drawing to multiple windows - - gracefully handle terminal resizing - - clip text that falls outside the panel - - convenience methods for word wrap, in-line formatting, etc - - This uses a design akin to Swing where panel instances provide their display - implementation by overwriting the draw() method, and are redrawn with - redraw(). + Common parent for interface panels, providing the ability to pause and + configure dimensions. """ def __init__(self): - """ - Creates a durable wrapper for a curses subwindow in the given parent. - - Arguments: - top - positioning of top within parent - left - positioning of the left edge within the parent - height - maximum height of panel (uses all available space if -1) - width - maximum width of panel (uses all available space if -1) - """ - - # The not-so-pythonic getters for these parameters are because some - # implementations aren't entirely deterministic (for instance panels - # might chose their height based on its parent's current width). - - self.visible = False + self._visible = False - self.paused = False - self.pause_time = -1 + self._paused = False + self._pause_time = -1 - self.top = 0 - self.left = 0 - self.height = -1 - self.width = -1 - - self.max_y, self.max_x = -1, -1 # subwindow dimensions when last redrawn + self._top = 0 + self._left = 0 + self._height = -1 + self._width = -1 def set_visible(self, is_visible): """ @@ -112,14 +88,14 @@ class Panel(object): is_visible - panel is redrawn when requested if true, skipped otherwise """ - self.visible = is_visible + self._visible = is_visible def is_paused(self): """ Provides if the panel's configured to be paused or not. """ - return self.paused + return self._paused def set_paused(self, is_pause): """ @@ -133,11 +109,11 @@ class Panel(object): them editable otherwise """ - if is_pause != self.paused: + if is_pause != self._paused: if is_pause: - self.pause_time = time.time() + self._pause_time = time.time() - self.paused = is_pause + self._paused = is_pause self.redraw() def get_pause_time(self): @@ -146,7 +122,14 @@ class Panel(object): been paused. """ - return self.pause_time + return self._pause_time + + def get_top(self): + """ + Provides the top position used for subwindows. + """ + + return self._top def set_top(self, top): """ @@ -156,22 +139,22 @@ class Panel(object): top - positioning of top within parent """ - if self.top != top: - self.top = top + if self._top != top: + self._top = top def get_height(self): """ Provides the height used for subwindows (-1 if it isn't limited). """ - return self.height + return self._height def get_width(self): """ Provides the width used for subwindows (-1 if it isn't limited). """ - return self.width + return self._width def get_preferred_size(self): """ @@ -184,8 +167,8 @@ class Panel(object): new_height, new_width = stdscr.getmaxyx() set_height, set_width = self.get_height(), self.get_width() - new_height = max(0, new_height - self.top) - new_width = max(0, new_width - self.left) + new_height = max(0, new_height - self._top) + new_width = max(0, new_width - self._left) if set_height != -1: new_height = min(new_height, set_height) @@ -224,13 +207,13 @@ class Panel(object): # skipped if not currently visible or activity has been halted - if not self.visible or HALT_ACTIVITY: + if not self._visible or HALT_ACTIVITY: return height = self.get_height() if self.get_height() != -1 else None width = self.get_width() if self.get_width() != -1 else None - nyx.curses.draw(self.draw, top = self.top, width = width, height = height) + nyx.curses.draw(self.draw, top = self._top, width = width, height = height) class DaemonPanel(Panel, threading.Thread): diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 9cf1d71..029f417 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -512,7 +512,7 @@ class GraphPanel(nyx.panel.Panel): # (plus an extra line for the graph/log gap) with nyx.curses.raw_screen() as stdscr: - max_height = stdscr.getmaxyx()[0] - self.top + max_height = stdscr.getmaxyx()[0] - self.get_top() current_height = self.get_height()

1 0

[nyx/master] Centralize pausing in Controller
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit e7385ff70800c162699c72de30822139b053982e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 10:24:59 2016 -0700 Centralize pausing in Controller Pausing is a global state. We never pause only some of our interface, as such this belongs in the Controller. There's a couple panels that need special handling but otherwise a pretty straight forward move. --- nyx/controller.py | 42 +++++++++++++++++++++++++++++++++--------- nyx/panel/__init__.py | 42 ++++-------------------------------------- nyx/panel/connection.py | 6 ++++-- nyx/panel/graph.py | 12 +++++++----- nyx/panel/header.py | 5 +++-- nyx/panel/log.py | 5 ++--- test/panel/header.py | 1 + 7 files changed, 54 insertions(+), 59 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index 964e27d..fc38185 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -120,7 +120,8 @@ class Controller(object): self.quit_signal = False self._page = 0 - self._is_paused = False + self._paused = False + self._pause_time = -1 self._force_redraw = False self._last_drawn = 0 @@ -171,23 +172,46 @@ class Controller(object): def is_paused(self): """ - True if the interface is paused, false otherwise. + Provides if the interface is configured to be paused or not. + + :returns: **True** if the interface is paused and **False** otherwise """ - return self._is_paused + return self._paused def set_paused(self, is_pause): """ - Sets the interface to be paused or unpaused. + Pauses or unpauses the interface. + + :param bool is_pause: suspends the interface if **True**, resumes it + otherwise """ - if is_pause != self._is_paused: - self._is_paused = is_pause - self._force_redraw = True - self.header_panel().redraw() + if is_pause != self._paused: + if is_pause: + self._pause_time = time.time() + + # Couple panels have their own pausing behavior. I'll later change this to + # a listener approach or someting else that's less hacky. for panel_impl in self.get_all_panels(): - panel_impl.set_paused(is_pause) + if isinstance(panel_impl, nyx.panel.graph.GraphPanel) or isinstance(panel_impl, nyx.panel.log.LogPanel): + panel_impl.set_paused(is_pause) + + self._paused = is_pause + + for panel_impl in self.get_display_panels(): + panel_impl.redraw() + + def get_pause_time(self): + """ + Provides the time that we were last paused, returning -1 if we've never + been paused. + + :returns: **float** with the unix timestamp for when we were last paused + """ + + return self._pause_time def header_panel(self): return self._header_panel diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index ee938dc..1d6ae9f 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -72,9 +72,6 @@ class Panel(object): def __init__(self): self._visible = False - self._paused = False - self._pause_time = -1 - self._top = 0 self._left = 0 self._height = -1 @@ -90,40 +87,6 @@ class Panel(object): self._visible = is_visible - def is_paused(self): - """ - Provides if the panel's configured to be paused or not. - """ - - return self._paused - - def set_paused(self, is_pause): - """ - Toggles if the panel is paused or not. This causes the panel to be redrawn - when toggling is pause state unless told to do otherwise. This is - important when pausing since otherwise the panel's display could change - when redrawn for other reasons. - - Arguments: - is_pause - freezes the state of the pause attributes if true, makes - them editable otherwise - """ - - if is_pause != self._paused: - if is_pause: - self._pause_time = time.time() - - self._paused = is_pause - self.redraw() - - def get_pause_time(self): - """ - Provides the time that we were last paused, returning -1 if we've never - been paused. - """ - - return self._pause_time - def get_top(self): """ Provides the top position used for subwindows. @@ -234,10 +197,13 @@ class DaemonPanel(Panel, threading.Thread): Performs our _update() action at the given rate. """ + import nyx.controller + last_ran = -1 + nyx_controller = nyx.controller.get_controller() while not self._halt: - if self.is_paused() or (time.time() - last_ran) < self._update_rate: + if nyx_controller.is_paused() or (time.time() - last_ran) < self._update_rate: with self._pause_condition: if not self._halt: self._pause_condition.wait(0.2) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 8e032e6..bd78a9b 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -11,6 +11,7 @@ import collections import curses import itertools +import nyx.controller import nyx.curses import nyx.panel import nyx.popups @@ -401,6 +402,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): def draw(self, subwindow): controller = tor_controller() + nyx_controller = nyx.controller.get_controller() entries = self._entries lines = list(itertools.chain.from_iterable([entry.get_lines() for entry in entries])) @@ -408,8 +410,8 @@ class ConnectionPanel(nyx.panel.DaemonPanel): details_offset = DETAILS_HEIGHT + 1 if is_showing_details else 0 selected, scroll = self._scroller.selection(lines, subwindow.height - details_offset - 1) - if self.is_paused(): - current_time = self.get_pause_time() + if nyx_controller.is_paused(): + current_time = nyx_controller.get_pause_time() elif not controller.is_alive(): current_time = controller.connection_time() else: diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 029f417..e5f9cc7 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -481,8 +481,9 @@ class GraphPanel(nyx.panel.Panel): if not self.displayed_stat: return 0 + nyx_controller = nyx.controller.get_controller() height = DEFAULT_CONTENT_HEIGHT + self._graph_height - accounting_stats = self._accounting_stats if self.is_paused() else self._accounting_stats_paused + accounting_stats = self._accounting_stats if nyx_controller.is_paused() else self._accounting_stats_paused if self.displayed_stat == GraphStat.BANDWIDTH and accounting_stats: height += 3 @@ -556,13 +557,13 @@ class GraphPanel(nyx.panel.Panel): self._accounting_stats_paused = copy.copy(self._accounting_stats) self._stats_paused = dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) - nyx.panel.Panel.set_paused(self, is_pause) - def draw(self, subwindow): if not self.displayed_stat: return - if not self.is_paused(): + nyx_controller = nyx.controller.get_controller() + + if not nyx_controller.is_paused(): stat = self._stats[self.displayed_stat] accounting_stats = self._accounting_stats else: @@ -586,10 +587,11 @@ class GraphPanel(nyx.panel.Panel): if not CONFIG['features.graph.bw.accounting.show']: self._accounting_stats = None elif not self._accounting_stats or time.time() - self._accounting_stats.retrieved >= ACCOUNTING_RATE: + nyx_controller = nyx.controller.get_controller() old_accounting_stats = self._accounting_stats self._accounting_stats = tor_controller().get_accounting_stats(None) - if not self.is_paused(): + if not nyx_controller.is_paused(): # if we either added or removed accounting info then redraw the whole # screen to account for resizing diff --git a/nyx/panel/header.py b/nyx/panel/header.py index a2a5ae7..5f33f4f 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -148,9 +148,10 @@ class HeaderPanel(nyx.panel.DaemonPanel): # space available for content + nyx_controller = nyx.controller.get_controller() left_width = max(subwindow.width / 2, 77) if is_wide else subwindow.width right_width = subwindow.width - left_width - pause_time = self.get_pause_time() if self.is_paused() else None + pause_time = nyx_controller.get_pause_time() if nyx_controller.is_paused() else None _draw_platform_section(subwindow, 0, 0, left_width, vals) @@ -175,7 +176,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, self.get_height() - 1, self.is_paused(), self._message, *self._message_attr) + _draw_status(subwindow, 0, self.get_height() - 1, nyx_controller.is_paused(), self._message, *self._message_attr) def reset_listener(self, controller, event_type, _): self._update() diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 81b7a64..02cd7fe 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -250,17 +250,16 @@ class LogPanel(nyx.panel.DaemonPanel): if is_pause: self._event_log_paused = self._event_log.clone() - nyx.panel.Panel.set_paused(self, is_pause) - def draw(self, subwindow): scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) + nyx_controller = nyx.controller.get_controller() event_filter = self._filter.clone() event_types = list(self._event_types) last_content_height = self._last_content_height show_duplicates = self._show_duplicates - event_log = self._event_log_paused if self.is_paused() else self._event_log + event_log = self._event_log_paused if nyx_controller.is_paused() else self._event_log event_log = filter(lambda entry: event_filter.match(entry.display_message), event_log) event_log = filter(lambda entry: not entry.is_duplicate or show_duplicates, event_log) diff --git a/test/panel/header.py b/test/panel/header.py index 3e47afa..c14b404 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -73,6 +73,7 @@ class TestHeaderPanel(unittest.TestCase): @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().is_paused.return_value = False nyx_controller_mock().get_page.return_value = 1 nyx_controller_mock().get_page_count.return_value = 4 sampling_mock.return_value = test_sampling()

1 0