0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

cancel active download and reset state if downloading again, fixes #187

Browse source
This commit is contained in:
j 2016-01-18 12:30:40 +05:30
parent cef4ce23e1
commit 52bc986260
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oml/item/models.py
View file

@ -378,6 +378,10 @@ class Item(db.Model):
u = state.user() u = state.user()
if not u in self.users: if not u in self.users:
t = Transfer.get_or_create(self.id) t = Transfer.get_or_create(self.id)
if not t.added:
t.added = datetime.utcnow()
t.progress = 0
t.save()
logger.debug('queue %s for download', self.id) logger.debug('queue %s for download', self.id)
self.add_user(u) self.add_user(u)

20
oml/nodes.py
View file

@ -332,14 +332,18 @@ class Node(Thread):
if since_ct > 1: if since_ct > 1:
ct = datetime.utcnow() ct = datetime.utcnow()
t = Transfer.get(item.id) t = Transfer.get(item.id)
t.progress = len(content) / item.info['size'] if not t.added:
t.save() # transfer was canceled
trigger_event('transfer', { return False
'id': item.id, 'progress': t.progress else:
}) t.progress = len(content) / item.info['size']
if state.bandwidth: t.save()
state.bandwidth.download(size/since_ct) trigger_event('transfer', {
size = 0 'id': item.id, 'progress': t.progress
})
if state.bandwidth:
state.bandwidth.download(size/since_ct)
size = 0
''' '''
content = fileobj.read() content = fileobj.read()
''' '''