summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2021-09-26 10:46:19 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2021-10-03 14:19:40 +0100
commit54674576dba2c5efd945c1e8f5accd2d8ca2afcd (patch)
treeb89944a82854c1392b41009ef4214556d7ab9b3c
parent89189adb24321c3db6bfa816ec557d7d8367ba24 (diff)
downloaddeluge-54674576dba2c5efd945c1e8f5accd2d8ca2afcd.tar.gz
deluge-54674576dba2c5efd945c1e8f5accd2d8ca2afcd.tar.bz2
deluge-54674576dba2c5efd945c1e8f5accd2d8ca2afcd.zip
[UI] Remove num_blocks_cache_hits usage for stats
Removed in libtorrent v2: https://github.com/arvidn/libtorrent/commit/569d4
-rw-r--r--deluge/ui/common.py1
-rw-r--r--deluge/ui/console/modes/preferences/preference_panes.py5
-rw-r--r--deluge/ui/gtk3/glade/preferences_dialog.ui36
-rw-r--r--deluge/ui/gtk3/preferences.py1
4 files changed, 7 insertions, 36 deletions
diff --git a/deluge/ui/common.py b/deluge/ui/common.py
index 9af1d50bd..c5064a6f4 100644
--- a/deluge/ui/common.py
+++ b/deluge/ui/common.py
@@ -160,7 +160,6 @@ DISK_CACHE_KEYS = [
'disk.num_blocks_written',
'disk.num_read_ops',
'disk.num_write_ops',
- 'disk.num_blocks_cache_hits',
'read_hit_ratio',
'write_hit_ratio',
'disk.disk_blocks_in_use',
diff --git a/deluge/ui/console/modes/preferences/preference_panes.py b/deluge/ui/console/modes/preferences/preference_panes.py
index 62029a6a9..8663d8a9c 100644
--- a/deluge/ui/console/modes/preferences/preference_panes.py
+++ b/deluge/ui/console/modes/preferences/preference_panes.py
@@ -724,11 +724,6 @@ class CachePane(BasePreferencePane):
self.add_info_field(
'blocks_read', ' %s:' % _('Blocks Read'), status['disk.num_blocks_read']
)
- self.add_info_field(
- 'blocks_read_hit',
- ' %s:' % _('Blocks Read hit'),
- status['disk.num_blocks_cache_hits'],
- )
self.add_info_field('reads', ' %s:' % _('Reads'), status['disk.num_read_ops'])
self.add_info_field(
'read_hit_ratio',
diff --git a/deluge/ui/gtk3/glade/preferences_dialog.ui b/deluge/ui/gtk3/glade/preferences_dialog.ui
index 11eda3296..4cfceddcf 100644
--- a/deluge/ui/gtk3/glade/preferences_dialog.ui
+++ b/deluge/ui/gtk3/glade/preferences_dialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="adjustment_cache_expiry">
@@ -245,7 +245,7 @@
<property name="type_hint">dialog</property>
<signal name="configure-event" handler="on_pref_dialog_configure_event" swapped="no"/>
<signal name="delete-event" handler="on_pref_dialog_delete_event" swapped="no"/>
- <child>
+ <child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
@@ -3880,28 +3880,16 @@ the proxy instead of using the local DNS service</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label119">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">The number of blocks that were served from cache.</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Blocks Read Hit:</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label122">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">The cache hit ratio for the read cache.</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">Read Cache Hit Ratio:</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -3915,23 +3903,13 @@ the proxy instead of using the local DNS service</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label_cache_num_blocks_cache_hits">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="label_cache_read_hit_ratio">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
@@ -3945,7 +3923,7 @@ the proxy instead of using the local DNS service</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
@@ -3955,7 +3933,7 @@ the proxy instead of using the local DNS service</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
diff --git a/deluge/ui/gtk3/preferences.py b/deluge/ui/gtk3/preferences.py
index 5650ad8df..ec4b3265a 100644
--- a/deluge/ui/gtk3/preferences.py
+++ b/deluge/ui/gtk3/preferences.py
@@ -957,7 +957,6 @@ class Preferences(component.Component):
'label_cache_num_blocks_written',
'label_cache_read_hit_ratio',
'label_cache_write_hit_ratio',
- 'label_cache_num_blocks_cache_hits',
'label_cache_disk_blocks_in_use',
'label_cache_read_cache_blocks',
)