ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-04-07 19:04:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Teach uploader's _scan to use the deque

Browse Source
This commit is contained in:
David Stainton 2015-12-15 18:16:22 +02:00 committed by Brian Warner
parent 072d252245
commit 70f66677be
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,16 +234,13 @@ class Uploader(QueueMixin):
def start_scanning(self):
self._log("start_scanning")
self.is_ready = True
return self._full_scan()
def _full_scan(self):
print "FULL SCAN"
self._pending = self._db.get_all_relpaths()
self._log("all_files %r" % (self._pending))
d = self._scan(u"")
def _add_pending(ign):
# This adds all of the files that were in the db but not already processed
# (normally because they have been deleted on disk).
self._log("adding %r" % (self._pending))
self._deque.extend(self._pending)
d.addCallback(_add_pending)
d.addCallback(lambda ign: self._turn_deque())
return d
def _scan(self, reldir_u):
@ -268,13 +265,11 @@ class Uploader(QueueMixin):
return None
self._pending.add(relpath_u)
return relpath_u
d.addCallback(_add_pending)
# This call to _process doesn't go through the deque, and probably should.
d.addCallback(self._process)
d.addBoth(self._call_hook, 'processed')
d.addErrback(log.err)
def _add_pending(ign):
self._log("adding %r" % (self._pending))
self._deque.extend(self._pending)
d.addCallback(_add_pending)
return d
def is_pending(self, relpath_u):