mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-11 02:48:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Core] Fix torrent displaying wrong state

Browse source
This commit is contained in:
Calum Lind 2015-09-29 13:19:35 +01:00
commit 5c545c5e0b
2 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

40
deluge/core/torrent.py
View file

@ -191,6 +191,7 @@ class Torrent(object):
self.statusmsg = "OK" self.statusmsg = "OK"
# The torrents state # The torrents state
self.state = None
self.update_state() self.update_state()
# The tracker status # The tracker status
@ -376,13 +377,15 @@ class Torrent(object):
# Set self.state to the ltstate right away just incase we don't hit some # Set self.state to the ltstate right away just incase we don't hit some
# of the logic below # of the logic below
old_state = self.state
if ltstate in LTSTATE: if ltstate in LTSTATE:
self.state = LTSTATE[ltstate] self.state = LTSTATE[ltstate]
else: else:
self.state = str(ltstate) self.state = str(ltstate)
is_paused = self.handle.is_paused()
session_paused = component.get("Core").session.is_paused()
log.debug("set_state_based_on_ltstate: %s", deluge.common.LT_TORRENT_STATE[ltstate]) log.debug("set_state_based_on_ltstate: %s with session.is_paused: %s", self.state, session_paused)
log.debug("session.is_paused: %s", component.get("Core").session.is_paused())
# First we check for an error from libtorrent, and set the state to that # First we check for an error from libtorrent, and set the state to that
# if any occurred. # if any occurred.
@ -390,27 +393,25 @@ class Torrent(object):
# This is an error'd torrent # This is an error'd torrent
self.state = "Error" self.state = "Error"
self.set_status_message(self.handle.status().error) self.set_status_message(self.handle.status().error)
if self.handle.is_paused(): if is_paused:
self.handle.auto_managed(False) self.handle.auto_managed(False)
return else:
if is_paused and self.handle.is_auto_managed() and not session_paused:
if ltstate == LTSTATE["Queued"] or ltstate == LTSTATE["Checking"]: self.state = "Queued"
if self.handle.is_paused(): elif is_paused or session_paused:
self.state = "Paused" self.state = "Paused"
else: elif ltstate == LTSTATE["Queued"] or ltstate == LTSTATE["Checking"] or \
ltstate == LTSTATE["Checking Resume Data"]:
self.state = "Checking" self.state = "Checking"
return elif ltstate == LTSTATE["Downloading"] or ltstate == LTSTATE["Downloading Metadata"]:
elif ltstate == LTSTATE["Downloading"] or ltstate == LTSTATE["Downloading Metadata"]: self.state = "Downloading"
self.state = "Downloading" elif ltstate == LTSTATE["Finished"] or ltstate == LTSTATE["Seeding"]:
elif ltstate == LTSTATE["Finished"] or ltstate == LTSTATE["Seeding"]: self.state = "Seeding"
self.state = "Seeding" elif ltstate == LTSTATE["Allocating"]:
elif ltstate == LTSTATE["Allocating"]: self.state = "Allocating"
self.state = "Allocating"
if self.handle.is_paused() and self.handle.is_auto_managed() and not component.get("Core").session.is_paused(): if self.state != old_state:
self.state = "Queued" component.get("EventManager").emit(TorrentStateChangedEvent(self.torrent_id, self.state))
elif component.get("Core").session.is_paused() or (self.handle.is_paused() and not self.handle.is_auto_managed()):
self.state = "Paused"
def set_state(self, state): def set_state(self, state):
"""Accepts state strings, ie, "Paused", "Seeding", etc.""" """Accepts state strings, ie, "Paused", "Seeding", etc."""
@ -990,4 +991,3 @@ class Torrent(object):
for key in self.prev_status.keys(): for key in self.prev_status.keys():
if not self.rpcserver.is_session_valid(key): if not self.rpcserver.is_session_valid(key):
del self.prev_status[key] del self.prev_status[key]

12
deluge/core/torrentmanager.py
View file

@ -965,10 +965,7 @@ class TorrentManager(component.Component):
except: except:
return return
# Set the torrent state # Set the torrent state
old_state = torrent.state
torrent.update_state() torrent.update_state()
if torrent.state != old_state:
component.get("EventManager").emit(TorrentStateChangedEvent(torrent_id, torrent.state))
# Don't save resume data for each torrent after self.stop() was called. # Don't save resume data for each torrent after self.stop() was called.
# We save resume data in bulk in self.stop() in this case. # We save resume data in bulk in self.stop() in this case.
@ -1079,11 +1076,7 @@ class TorrentManager(component.Component):
torrent_id = str(alert.handle.info_hash()) torrent_id = str(alert.handle.info_hash())
except: except:
return return
old_state = torrent.state
torrent.update_state() torrent.update_state()
if torrent.state != old_state:
# We need to emit a TorrentStateChangedEvent too
component.get("EventManager").emit(TorrentStateChangedEvent(torrent_id, torrent.state))
component.get("EventManager").emit(TorrentResumedEvent(torrent_id)) component.get("EventManager").emit(TorrentResumedEvent(torrent_id))
def on_alert_state_changed(self, alert): def on_alert_state_changed(self, alert):
@ -1094,7 +1087,6 @@ class TorrentManager(component.Component):
except: except:
return return
old_state = torrent.state
torrent.update_state() torrent.update_state()
# Torrent may need to download data after checking. # Torrent may need to download data after checking.
@ -1102,10 +1094,6 @@ class TorrentManager(component.Component):
torrent.is_finished = False torrent.is_finished = False
self.queued_torrents.add(torrent_id) self.queued_torrents.add(torrent_id)
# Only emit a state changed event if the state has actually changed
if torrent.state != old_state:
component.get("EventManager").emit(TorrentStateChangedEvent(torrent_id, torrent.state))
def on_alert_save_resume_data(self, alert): def on_alert_save_resume_data(self, alert):
log.debug("on_alert_save_resume_data") log.debug("on_alert_save_resume_data")
try: try: