[Core] Stopped using libtorrent deprecated functions

As part of the process of adding support to LT 2.0, we should stop using
all deprecated function, as some (if not all) were removed.
For this process, we should use the LT 1.2 upgrade (guide)[1].

The change includes:
* stop using file entries directly
* start using the torrent handle's set/unset flags
* stop using url key in add_torrent_params (for magnet)
* stop accessing resume_data from save_resume_data_alert
* stop using deprecated session status keys in UI

[1] https://libtorrent.org/upgrade_to_1.2-ref.html
Closes: https://dev.deluge-torrent.org/ticket/3499
Closes: https://github.com/deluge-torrent/deluge/pull/342

5 files changed, 35 insertions, 22 deletions

diff --git a/deluge/ui/console/cmdline/commands/status.py b/deluge/ui/console/cmdline/commands/status.py
index 2ca1cda2f..05c9796ce 100644
--- a/deluge/ui/console/cmdline/commands/status.py
+++ b/deluge/ui/console/cmdline/commands/status.py
@@ -62,7 +62,12 @@ class Command(BaseCommand):
         deferreds = []
 
         ds = client.core.get_session_status(
-            ['num_peers', 'payload_upload_rate', 'payload_download_rate', 'dht_nodes']
+            [
+                'peer.num_peers_connected',
+                'payload_upload_rate',
+                'payload_download_rate',
+                'dht.dht_nodes',
+            ]
         )
         ds.addCallback(on_session_status)
         deferreds.append(ds)
@@ -92,7 +97,7 @@ class Command(BaseCommand):
                 '{!info!}Total download: %s'
                 % fspeed(self.status['payload_download_rate'])
             )
-        self.console.write('{!info!}DHT Nodes: %i' % self.status['dht_nodes'])
+        self.console.write('{!info!}DHT Nodes: %i' % self.status['dht.dht_nodes'])
 
         if isinstance(self.torrents, int):
             if self.torrents == -2:
diff --git a/deluge/ui/console/modes/torrentdetail.py b/deluge/ui/console/modes/torrentdetail.py
index eab9dfef1..bac9b9472 100644
--- a/deluge/ui/console/modes/torrentdetail.py
+++ b/deluge/ui/console/modes/torrentdetail.py
@@ -541,13 +541,13 @@ class TorrentDetail(BaseMode, PopupsHandler):
         # Seed/peer info
         s = '{{!info!}}{}:{{!green!}} {} {{!input!}}({})'.format(
             torrent_data_fields['seeds']['name'],
-            status['num_seeds'],
+            status['peer.num_peers_connected'],
             status['total_seeds'],
         )
         row = self.add_string(row, s)
         s = '{{!info!}}{}:{{!red!}} {} {{!input!}}({})'.format(
             torrent_data_fields['peers']['name'],
-            status['num_peers'],
+            status['peer.num_peers_connected'],
             status['total_peers'],
         )
         row = self.add_string(row, s)
diff --git a/deluge/ui/console/widgets/statusbars.py b/deluge/ui/console/widgets/statusbars.py
index 57128eabf..1b9173707 100644
--- a/deluge/ui/console/widgets/statusbars.py
+++ b/deluge/ui/console/widgets/statusbars.py
@@ -36,19 +36,23 @@ class StatusBars(component.Component):
         def on_get_session_status(status):
             self.upload = deluge.common.fsize(status['payload_upload_rate'])
             self.download = deluge.common.fsize(status['payload_download_rate'])
-            self.connections = status['num_peers']
+            self.connections = status['peer.num_peers_connected']
             if 'dht_nodes' in status:
-                self.dht = status['dht_nodes']
+                self.dht = status['dht.dht_nodes']
 
             self.update_statusbars()
 
         def on_get_external_ip(external_ip):
             self.external_ip = external_ip
 
-        keys = ['num_peers', 'payload_upload_rate', 'payload_download_rate']
+        keys = [
+            'peer.num_peers_connected',
+            'payload_upload_rate',
+            'payload_download_rate',
+        ]
 
         if self.config['dht']:
-            keys.append('dht_nodes')
+            keys.append('dht.dht_nodes')
 
         client.core.get_session_status(keys).addCallback(on_get_session_status)
         client.core.get_external_ip().addCallback(on_get_external_ip)
diff --git a/deluge/ui/gtk3/statusbar.py b/deluge/ui/gtk3/statusbar.py
index 3001a49ee..0a2e80095 100644
--- a/deluge/ui/gtk3/statusbar.py
+++ b/deluge/ui/gtk3/statusbar.py
@@ -317,18 +317,22 @@ class StatusBar(component.Component):
     def send_status_request(self):
         # Sends an async request for data from the core
         keys = [
-            'num_peers',
+            'peer.num_peers_connected',
             'upload_rate',
             'download_rate',
             'payload_upload_rate',
             'payload_download_rate',
+            'net.sent_bytes',
+            'net.recv_bytes',
+            'net.sent_payload_bytes',
+            'net.recv_payload_bytes',
         ]
 
         if self.dht_status:
-            keys.append('dht_nodes')
+            keys.append('dht.dht_nodes')
 
         if not self.health:
-            keys.append('has_incoming_connections')
+            keys.append('net.has_incoming_connections')
 
         client.core.get_session_status(keys).addCallback(self._on_get_session_status)
         client.core.get_free_space().addCallback(self._on_get_free_space)
@@ -367,18 +371,18 @@ class StatusBar(component.Component):
         self.upload_protocol_rate = (
             status['upload_rate'] - status['payload_upload_rate']
         ) // 1024
-        self.num_connections = status['num_peers']
+        self.num_connections = status['peer.num_peers_connected']
         self.update_download_label()
         self.update_upload_label()
         self.update_traffic_label()
         self.update_connections_label()
 
-        if 'dht_nodes' in status:
-            self.dht_nodes = status['dht_nodes']
+        if 'dht.dht_nodes' in status:
+            self.dht_nodes = status['dht.dht_nodes']
             self.update_dht_label()
 
-        if 'has_incoming_connections' in status:
-            self.health = status['has_incoming_connections']
+        if 'net.has_incoming_connections' in status:
+            self.health = status['net.has_incoming_connections']
             if self.health:
                 self.remove_item(self.health_item)
 
diff --git a/deluge/ui/web/json_api.py b/deluge/ui/web/json_api.py
index aa15d5ac6..e16c440ed 100644
--- a/deluge/ui/web/json_api.py
+++ b/deluge/ui/web/json_api.py
@@ -515,7 +515,7 @@ class WebApi(JSONComponent):
             return d
 
         def got_stats(stats):
-            ui_info['stats']['num_connections'] = stats['num_peers']
+            ui_info['stats']['num_connections'] = stats['peer.num_peers_connected']
             ui_info['stats']['upload_rate'] = stats['payload_upload_rate']
             ui_info['stats']['download_rate'] = stats['payload_download_rate']
             ui_info['stats']['download_protocol_rate'] = (
@@ -524,9 +524,9 @@ class WebApi(JSONComponent):
             ui_info['stats']['upload_protocol_rate'] = (
                 stats['upload_rate'] - stats['payload_upload_rate']
             )
-            ui_info['stats']['dht_nodes'] = stats['dht_nodes']
+            ui_info['stats']['dht_nodes'] = stats['dht.dht_nodes']
             ui_info['stats']['has_incoming_connections'] = stats[
-                'has_incoming_connections'
+                'net.has_incoming_connections'
             ]
 
         def got_filters(filters):
@@ -552,13 +552,13 @@ class WebApi(JSONComponent):
 
         d3 = client.core.get_session_status(
             [
-                'num_peers',
+                'peer.num_peers_connected',
                 'payload_download_rate',
                 'payload_upload_rate',
                 'download_rate',
                 'upload_rate',
-                'dht_nodes',
-                'has_incoming_connections',
+                'dht.dht_nodes',
+                'net.has_incoming_connections',
             ]
         )
         d3.addCallback(got_stats)