Merge pull request #3931 from xoriole/issue_3929

Missing IPv8 statistics
Tribler · Oct 4, 2018 · b439d10 · b439d10
2 parents e7d9eb6 + f4acff4
commit b439d10
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/TriblerGUI/debug_window.py b/TriblerGUI/debug_window.py
@@ -155,6 +155,9 @@ def __init__(self, settings, tribler_version):
         self.window().log_refresh_button.clicked.connect(lambda: self.load_logs_tab())
         self.window().log_tab_widget.currentChanged.connect(lambda index: self.load_logs_tab())
 
+        # IPv8 statistics enabled?
+        self.ipv8_statistics_enabled = settings['ipv8']['statistics']
+
         # Position to center
         frame_geometry = self.frameGeometry()
         screen = QDesktopWidget().screenNumber(QDesktopWidget().cursor().pos())
@@ -305,17 +308,30 @@ def on_ipv8_community_stats(self, data):
                 item.setText(6, "%s" % statistics["num_up"])
                 item.setText(7, "%s" % statistics["num_down"])
                 item.setText(8, "%.3f" % statistics["diff_time"])
+            else:
+                item.setText(4, "N/A")
+                item.setText(5, "N/A")
+                item.setText(6, "N/A")
+                item.setText(7, "N/A")
+                item.setText(8, "N/A")
 
             self.window().communities_tree_widget.addTopLevelItem(item)
+            map(self.window().communities_tree_widget.resizeColumnToContents, xrange(10))
 
     def load_ipv8_community_details_tab(self):
-        self.request_mgr = TriblerRequestManager()
-        self.request_mgr.perform_request("ipv8/overlays/statistics", self.on_ipv8_community_detail_stats)
+        if self.ipv8_statistics_enabled:
+            self.window().ipv8_statistics_error_label.setHidden(True)
+            self.request_mgr = TriblerRequestManager()
+            self.request_mgr.perform_request("ipv8/overlays/statistics", self.on_ipv8_community_detail_stats)
+        else:
+            self.window().ipv8_statistics_error_label.setHidden(False)
+            self.window().ipv8_communities_details_widget.setHidden(True)
 
     def on_ipv8_community_detail_stats(self, data):
         if not data:
             return
 
+        self.window().ipv8_communities_details_widget.setHidden(False)
         self.window().ipv8_communities_details_widget.clear()
         for overlay in data["statistics"]:
             self.window().ipv8_communities_details_widget.setColumnWidth(0, 250)

diff --git a/TriblerGUI/qt_resources/debugwindow.ui b/TriblerGUI/qt_resources/debugwindow.ui
@@ -246,9 +246,6 @@
               <property name="indentation">
                <number>0</number>
               </property>
-              <attribute name="headerDefaultSectionSize">
-               <number>200</number>
-              </attribute>
               <column>
                <property name="text">
                 <string>Name</string>
@@ -318,13 +315,37 @@
             <property name="bottomMargin">
              <number>0</number>
             </property>
+            <item>
+             <widget class="QLabel" name="ipv8_statistics_error_label">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>
+                  The details are not available because the statistics measurement is not enabled.
+                  To enable the statistics measurement, go to:
+
+                  SETTINGS -&gt; DEBUG -&gt; Network (IPv8) Statistics
+
+                  After enabling the checkbox and saving the settings, restart Tribler.
+                  Then the details will be available here.
+                 </string>
+              </property>
+              <property name="textFormat">
+               <enum>Qt::PlainText</enum>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QTreeWidget" name="ipv8_communities_details_widget">
               <property name="indentation">
                <number>0</number>
               </property>
               <attribute name="headerDefaultSectionSize">
-               <number>200</number>
+               <number>150</number>
               </attribute>
               <column>
                <property name="text">