citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

More fixes in objects to be downloaded

Browse Source
This commit is contained in:
Peter Šurda 2017-01-15 23:07:11 +01:00
parent bd1aead46e
commit 12205ee7ba
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/inventory.py
View File

@ -121,23 +121,22 @@ class Missing(object):
def pull(self, count=1): def pull(self, count=1):
if count < 1: if count < 1:
raise ValueError("Must be at least one") raise ValueError("Must be at least one")
with self.lock: objectHashes = []
objectHashes = [] try:
try: for objectHash in self.hashes.keys():
for objectHash in self.hashes.keys(): if self.hashes[objectHash]['requested'] < time.time() - self.frequency:
if self.hashes[objectHash]['requested'] < time.time() - self.frequency: if len(self.hashes[objectHash]['peers']) == 0:
if len(self.hashes[objectHash]['peers']) == 0: self.removeObjectFromCurrentThread(objectHash)
self.removeObjectFromCurrentThread(objectHash) continue
continue if current_thread().peer in self.hashes[objectHash]['peers']:
if current_thread().peer in self.hashes[objectHash]['peers']: objectHashes.append(objectHash)
objectHashes.append(objectHash) self.removeObjectFromCurrentThread(objectHash)
self.removeObjectFromCurrentThread(objectHash) if len(objectHashes) >= count:
if len(objectHashes) >= count: break
break except (RuntimeError, KeyError, ValueError):
except RuntimeError: # the for cycle sometimes breaks if you remove elements
# the for cycle sometimes breaks if you remove elements pass
pass return objectHashes
return objectHashes
def delete(self, objectHash): def delete(self, objectHash):
with self.lock: with self.lock: