codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-28 20:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue when saving resume data fails.

Browse Source 
Clean up resume data deferred code a bit.
This commit is contained in:
Chase Sterling 2012-12-10 20:10:37 -05:00
parent 3bf023e4df
commit ca1a5d33f4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deluge/core/torrentmanager.py
View File

@ -41,7 +41,6 @@ import os
import shutil import shutil
import operator import operator
import logging import logging
from collections import defaultdict
from twisted.internet.task import LoopingCall from twisted.internet.task import LoopingCall
from twisted.internet.defer import Deferred, DeferredList from twisted.internet.defer import Deferred, DeferredList
@ -153,7 +152,7 @@ class TorrentManager(component.Component):
# This is a map of torrent_ids to Deferreds used to track needed resume data. # This is a map of torrent_ids to Deferreds used to track needed resume data.
# The Deferreds will be completed when resume data has been saved. # The Deferreds will be completed when resume data has been saved.
self.waiting_on_resume_data = defaultdict(list) self.waiting_on_resume_data = {}
# Keeps track of resume data # Keeps track of resume data
self.resume_data = {} self.resume_data = {}
@ -765,8 +764,10 @@ class TorrentManager(component.Component):
self.waiting_on_resume_data.pop(torrent_id, None) self.waiting_on_resume_data.pop(torrent_id, None)
for torrent_id in torrent_ids: for torrent_id in torrent_ids:
d = Deferred().addBoth(on_torrent_resume_save, torrent_id) d = self.waiting_on_resume_data.get(torrent_id)
self.waiting_on_resume_data[torrent_id].append(d) if not d:
d = Deferred().addBoth(on_torrent_resume_save, torrent_id)
self.waiting_on_resume_data[torrent_id] = d
deferreds.append(d) deferreds.append(d)
self.torrents[torrent_id].save_resume_data() self.torrents[torrent_id].save_resume_data()
@ -1043,12 +1044,11 @@ class TorrentManager(component.Component):
self.resume_data[torrent_id] = lt.bencode(alert.resume_data) self.resume_data[torrent_id] = lt.bencode(alert.resume_data)
if torrent_id in self.waiting_on_resume_data: if torrent_id in self.waiting_on_resume_data:
for d in self.waiting_on_resume_data[torrent_id]: self.waiting_on_resume_data[torrent_id].callback(None)
d.callback(None)
def on_alert_save_resume_data_failed(self, alert): def on_alert_save_resume_data_failed(self, alert):
log.debug("on_alert_save_resume_data_failed: %s", alert.message()) log.debug("on_alert_save_resume_data_failed: %s", alert.message())
torrent_id = alert.handle.info_hash() torrent_id = str(alert.handle.info_hash())
if torrent_id in self.waiting_on_resume_data: if torrent_id in self.waiting_on_resume_data:
self.waiting_on_resume_data[torrent_id].errback(Exception(alert.message())) self.waiting_on_resume_data[torrent_id].errback(Exception(alert.message()))