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

[Core] Fix torrent pause/resume logic 

If the torrent_id argument received in the pause or resume methods is not a string, the methods execute with the un-parsed input and then with parsed input on a second call. A key error exception is thrown from the first call, and the second call succeeds.
This commit is contained in:
Deepak 2018-07-30 16:14:50 -05:00 committed by Calum Lind
parent f94f58918e
commit 585ea88f1f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deluge/core/core.py
View File

@ -627,7 +627,8 @@ class Core(component.Component):
log.debug('Pausing: %s', torrent_id) log.debug('Pausing: %s', torrent_id)
if not isinstance(torrent_id, str if not PY2 else basestring): if not isinstance(torrent_id, str if not PY2 else basestring):
self.pause_torrents(torrent_id) self.pause_torrents(torrent_id)
self.torrentmanager[torrent_id].pause() else:
self.torrentmanager[torrent_id].pause()
@export @export
def pause_torrents(self, torrent_ids=None): def pause_torrents(self, torrent_ids=None):
@ -677,7 +678,8 @@ class Core(component.Component):
log.debug('Resuming: %s', torrent_id) log.debug('Resuming: %s', torrent_id)
if not isinstance(torrent_id, str if not PY2 else basestring): if not isinstance(torrent_id, str if not PY2 else basestring):
self.resume_torrents(torrent_id) self.resume_torrents(torrent_id)
self.torrentmanager[torrent_id].resume() else:
self.torrentmanager[torrent_id].resume()
@export @export
def resume_torrents(self, torrent_ids=None): def resume_torrents(self, torrent_ids=None):