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

Fix not properly detecting when torrent is at end of queue

Browse source
This commit is contained in:
John Garland 2012-03-12 23:43:08 +11:00
commit 39a04aae20
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
deluge/core/torrentmanager.py
View file

@ -138,6 +138,7 @@ class TorrentManager(component.Component):
# Create the torrents dict { torrent_id: Torrent } # Create the torrents dict { torrent_id: Torrent }
self.torrents = {} self.torrents = {}
self.queued_torrents = set()
# This is a list of torrent_id when we shutdown the torrentmanager. # This is a list of torrent_id when we shutdown the torrentmanager.
# We use this list to determine if all active torrents have been paused # We use this list to determine if all active torrents have been paused
@ -476,6 +477,9 @@ class TorrentManager(component.Component):
if not options["add_paused"]: if not options["add_paused"]:
torrent.resume() torrent.resume()
# Add to queued torrents set
self.queued_torrents.add(torrent.torrent_id)
# Write the .torrent file to the state directory # Write the .torrent file to the state directory
if filedump: if filedump:
try: try:
@ -584,6 +588,10 @@ class TorrentManager(component.Component):
# Stop the looping call # Stop the looping call
self.torrents[torrent_id].prev_status_cleanup_loop.stop() self.torrents[torrent_id].prev_status_cleanup_loop.stop()
# Remove from set if it wasn't finished
if not self.torrents[torrent_id].is_finished:
self.queued_torrents.remove(torrent_id)
# Remove the torrent from deluge's session # Remove the torrent from deluge's session
try: try:
del self.torrents[torrent_id] del self.torrents[torrent_id]
@ -816,7 +824,7 @@ class TorrentManager(component.Component):
def queue_down(self, torrent_id): def queue_down(self, torrent_id):
"""Queue torrent down one position""" """Queue torrent down one position"""
if self.torrents[torrent_id].get_queue_position() == (len(self.torrents) - 1): if self.torrents[torrent_id].get_queue_position() == (len(self.queued_torrents) - 1):
return False return False
self.torrents[torrent_id].handle.queue_position_down() self.torrents[torrent_id].handle.queue_position_down()
@ -824,7 +832,7 @@ class TorrentManager(component.Component):
def queue_bottom(self, torrent_id): def queue_bottom(self, torrent_id):
"""Queue torrent to bottom""" """Queue torrent to bottom"""
if self.torrents[torrent_id].get_queue_position() == (len(self.torrents) - 1): if self.torrents[torrent_id].get_queue_position() == (len(self.queued_torrents) - 1):
return False return False
self.torrents[torrent_id].handle.queue_position_bottom() self.torrents[torrent_id].handle.queue_position_bottom()
@ -880,6 +888,9 @@ class TorrentManager(component.Component):
torrent.is_finished = True torrent.is_finished = True
torrent.update_state() torrent.update_state()
# Torrent is no longer part of the queue
self.queued_torrents.remove(torrent_id)
# Only save resume data if it was actually downloaded something. Helps # Only save resume data if it was actually downloaded something. Helps
# on startup with big queues with lots of seeding torrents. Libtorrent # on startup with big queues with lots of seeding torrents. Libtorrent
# emits alert_torrent_finished for them, but there seems like nothing # emits alert_torrent_finished for them, but there seems like nothing
@ -1010,6 +1021,7 @@ class TorrentManager(component.Component):
# Torrent may need to download data after checking. # Torrent may need to download data after checking.
if torrent.state in ('Checking', 'Checking Resume Data', 'Downloading'): if torrent.state in ('Checking', 'Checking Resume Data', 'Downloading'):
torrent.is_finished = False torrent.is_finished = False
self.queued_torrents.add(torrent_id)
# Only emit a state changed event if the state has actually changed # Only emit a state changed event if the state has actually changed
if torrent.state != old_state: if torrent.state != old_state: