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

Properly count active torrents in the queue and correctly do queueing.

This commit is contained in:
Alex Dedul 2007-08-04 15:55:45 +00:00
parent e40398652c
commit 842b54523b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core.py
View File

@ -524,10 +524,21 @@ class Manager:
self.removed_unique_ids[unique_ID] = 1 self.removed_unique_ids[unique_ID] = 1
self.remove_torrent(unique_ID, False, True) self.remove_torrent(unique_ID, False, True)
# Counter for currently active torrent in the queue. Paused in core
# but having self.is_user_paused(unique_ID) == False is
# also considered active.
active_torrent_cnt = 0
# Pause and resume torrents # Pause and resume torrents
for index, unique_ID in enumerate(self.state.queue): for unique_ID in self.state.queue:
torrent_state = self.get_core_torrent_state(unique_ID) torrent_state = self.get_core_torrent_state(unique_ID)
if (index < self.get_pref('max_active_torrents') or \
if not torrent_state['is_paused'] or \
(torrent_state['is_paused'] and not \
self.is_user_paused(unique_ID)):
active_torrent_cnt += 1
if (active_torrent_cnt <= self.get_pref('max_active_torrents') or \
self.get_pref('max_active_torrents') == -1) and \ self.get_pref('max_active_torrents') == -1) and \
torrent_state['is_paused'] and not \ torrent_state['is_paused'] and not \
self.is_user_paused(unique_ID): self.is_user_paused(unique_ID):
@ -549,7 +560,7 @@ class Manager:
else: #We're using compact allocation so lets just resume else: #We're using compact allocation so lets just resume
deluge_core.resume(unique_ID) deluge_core.resume(unique_ID)
elif not torrent_state['is_paused'] and \ elif not torrent_state['is_paused'] and \
((index >= self.get_pref('max_active_torrents') and \ ((active_torrent_cnt > self.get_pref('max_active_torrents') and \
self.get_pref('max_active_torrents') != -1) or \ self.get_pref('max_active_torrents') != -1) or \
self.is_user_paused(unique_ID)): self.is_user_paused(unique_ID)):
deluge_core.pause(unique_ID) deluge_core.pause(unique_ID)