tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Teach downloader to stop when told to stop

This commit is contained in:
David Stainton 2015-07-28 17:02:51 -07:00
parent 6e42c00c9c
commit 825e8d9e9a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/frontends/magic_folder.py
View File

@ -388,6 +388,7 @@ class Downloader(QueueMixin):
self._remote_scan_delay = 3 # XXX self._remote_scan_delay = 3 # XXX
self._download_scan_batch = {} # path -> [(filenode, metadata)] self._download_scan_batch = {} # path -> [(filenode, metadata)]
self._stopped = False
print "Downloader init" print "Downloader init"
def start_scanning(self): def start_scanning(self):
@ -397,6 +398,7 @@ class Downloader(QueueMixin):
def stop(self): def stop(self):
print "downloader stop" print "downloader stop"
self._stopped = True
d = defer.succeed(None) d = defer.succeed(None)
d.addCallback(lambda ign: self._lazy_tail) d.addCallback(lambda ign: self._lazy_tail)
def _print(res): def _print(res):
@ -469,7 +471,6 @@ class Downloader(QueueMixin):
print "name ", name print "name ", name
file_node, metadata = listing_map[name] file_node, metadata = listing_map[name]
local_version = self._get_local_latest(name) # XXX we might need to convert first? local_version = self._get_local_latest(name) # XXX we might need to convert first?
if local_version is None: if local_version is None:
return None return None
if local_version >= metadata['version']: if local_version >= metadata['version']:
@ -577,8 +578,8 @@ class Downloader(QueueMixin):
# FIXME move to QueueMixin # FIXME move to QueueMixin
def _turn_deque(self): def _turn_deque(self):
print "downloader _turn_deque" print "downloader _turn_deque"
#if self._stopped: if self._stopped:
# return return
try: try:
file_path, file_node, metadata = self._deque.pop() file_path, file_node, metadata = self._deque.pop()
except IndexError: except IndexError: