codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-12 04:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2303 : Torrent state not updated until after emitting TorrentFinishedEvent

Browse Source
This commit is contained in:
Calum Lind 2013-05-22 19:07:13 +01:00
parent 45f898870f
commit 77cb794e4d
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
deluge/core/torrentmanager.py
View File

@ -935,29 +935,28 @@ class TorrentManager(component.Component):
def on_alert_torrent_finished(self, alert): def on_alert_torrent_finished(self, alert):
log.debug("on_alert_torrent_finished") log.debug("on_alert_torrent_finished")
try: try:
torrent = self.torrents[str(alert.handle.info_hash())]
torrent_id = str(alert.handle.info_hash()) torrent_id = str(alert.handle.info_hash())
except: torrent = self.torrents[torrent_id]
except (RuntimeError, KeyError):
return return
log.debug("%s is finished..", torrent_id) log.debug("Finished %s ", torrent_id)
# Get the total_download and if it's 0, do not move.. It's likely # If total_download is 0, do not move, it's likely the torrent wasn't downloaded, but just added.
# that the torrent wasn't downloaded, but just added.
total_download = torrent.get_status(["total_payload_download"])["total_payload_download"] total_download = torrent.get_status(["total_payload_download"])["total_payload_download"]
log.debug("Torrent settings: is_finished: %s, total_download: %s, move_completed: %s, move_path: %s",
torrent.is_finished, total_download, torrent.options["move_completed"],
torrent.options["move_completed_path"])
# Move completed download to completed folder if needed # Move completed download to completed folder if needed
if not torrent.is_finished and total_download: if not torrent.is_finished and total_download and torrent.options["move_completed"]:
move_path = None if torrent.options["download_location"] != torrent.options["move_completed_path"]:
torrent.move_storage(torrent.options["move_completed_path"])
if torrent.options["move_completed"]:
move_path = torrent.options["move_completed_path"]
if torrent.options["download_location"] != move_path:
torrent.move_storage(move_path)
component.get("EventManager").emit(TorrentFinishedEvent(torrent_id))
torrent.is_finished = True
torrent.update_state() torrent.update_state()
if not torrent.is_finished and total_download:
component.get("EventManager").emit(TorrentFinishedEvent(torrent_id))
torrent.is_finished = True
# Torrent is no longer part of the queue # Torrent is no longer part of the queue
try: try: