[tor-commits] [arm/master] Splitting GraphPanel's bandwidth_event()

[atagar at torproject.org]

commit d6518b0760a79fef8a561c7aec623e28f4385c11
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Nov 16 15:00:30 2014 -0800

    Splitting GraphPanel's bandwidth_event()
    
    Splitting its listener function into a couple with a more specific and
    self-descriptive purpose (_update_accounting() and _update_stats()). Also
    replacing our reset listener with a labmda.
---
 arm/graph_panel.py |   57 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/arm/graph_panel.py b/arm/graph_panel.py
index b6f8c97..c537ee8 100644
--- a/arm/graph_panel.py
+++ b/arm/graph_panel.py
@@ -348,8 +348,7 @@ class ResourceStats(GraphCategory):
 
 class GraphPanel(panel.Panel):
   """
-  Panel displaying a graph, drawing statistics from custom GraphCategory
-  implementations.
+  Panel displaying graphical information of GraphCategory instances.
   """
 
   def __init__(self, stdscr):
@@ -390,8 +389,9 @@ class GraphPanel(panel.Panel):
       except ValueError as exc:
         log.info(msg('panel.graphing.prepopulation_failure', error = exc))
 
-    controller.add_event_listener(self.bandwidth_event, EventType.BW)
-    controller.add_status_listener(self.reset_listener)
+    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))
 
   @property
   def displayed_stat(self):
@@ -429,30 +429,6 @@ class GraphPanel(panel.Panel):
 
     self._bounds = value
 
-  def bandwidth_event(self, event):
-    for stat in self._stats.values():
-      stat.bandwidth_event(event)
-
-    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:
-      old_accounting_stats = self._accounting_stats
-      self._accounting_stats = tor_controller().get_accounting_stats(None)
-
-      if bool(old_accounting_stats) != bool(self._accounting_stats):
-        # we either added or removed accounting info, redraw the whole screen since this changes our height
-
-        arm.controller.get_controller().redraw()
-
-    update_rate = INTERVAL_SECONDS[self.update_interval]
-    param = self.get_attr('_stats')[self.displayed_stat]
-
-    if param.primary.tick % update_rate == 0:
-      self.redraw(True)
-
-  def reset_listener(self, controller, event_type, _):
-    self.redraw(True)
-
   def get_height(self):
     """
     Provides the height of the content.
@@ -564,7 +540,7 @@ class GraphPanel(panel.Panel):
     return [
       ('r', 'resize graph', None),
       ('s', 'graphed stats', self.displayed_stat if self.displayed_stat else 'none'),
-      ('b', 'graph bounds', self.bounds_type.lower()),
+      ('b', 'graph bounds', self.bounds_type.replace('_', ' ')),
       ('i', 'graph update interval', self.update_interval),
     ]
 
@@ -737,3 +713,26 @@ class GraphPanel(panel.Panel):
       return dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats])
     else:
       return panel.Panel.copy_attr(self, attr)
+
+  def _update_accounting(self, event):
+    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:
+      old_accounting_stats = self._accounting_stats
+      self._accounting_stats = tor_controller().get_accounting_stats(None)
+
+      # if we either added or removed accounting info then redraw the whole
+      # screen to account for resizing
+
+      if bool(old_accounting_stats) != bool(self._accounting_stats):
+        arm.controller.get_controller().redraw()
+
+  def _update_stats(self, event):
+    for stat in self._stats.values():
+      stat.bandwidth_event(event)
+
+    param = self.get_attr('_stats')[self.displayed_stat]
+    update_rate = INTERVAL_SECONDS[self.update_interval]
+
+    if param.primary.tick % update_rate == 0:
+      self.redraw(True)