codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Core] Return plugin keys with get_torrents_status 

When requesting all keys, get_torrents_status was missing plugin added keys
This commit brings the behavior in line with get_torrent_status, and deluge 1.3

Closes: https://dev.deluge-torrent.org/ticket/3357
Closes: https://github.com/deluge-torrent/deluge/pull/347
This commit is contained in:
Chase Sterling 2022-01-21 22:06:32 -05:00 committed by Calum Lind
parent 7c9a542006
commit d8746a8852
No known key found for this signature in database
GPG Key ID: 90597A687B836BA3
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
deluge/core/core.py
View File

@ -763,25 +763,21 @@ class Core(component.Component):
)
@export
@defer.inlineCallbacks
def get_torrents_status(self, filter_dict, keys, diff=False):
"""
returns all torrents , optionally filtered by filter_dict.
"""
all_keys = not keys
torrent_ids = self.filtermanager.filter_torrent_ids(filter_dict)
d = self.torrentmanager.torrents_status_update(torrent_ids, keys, diff=diff)
def add_plugin_fields(args):
status_dict, plugin_keys = args
# Ask the plugin manager to fill in the plugin keys
if len(plugin_keys) > 0:
for key in status_dict:
status_dict[key].update(
self.pluginmanager.get_status(key, plugin_keys)
)
return status_dict
d.addCallback(add_plugin_fields)
return d
status_dict, plugin_keys = yield self.torrentmanager.torrents_status_update(
torrent_ids, keys, diff=diff
)
# Ask the plugin manager to fill in the plugin keys
if len(plugin_keys) > 0 or all_keys:
for key in status_dict:
status_dict[key].update(self.pluginmanager.get_status(key, plugin_keys))
return status_dict
@export
def get_filter_tree(self, show_zero_hits=True, hide_cat=None):