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)

4
oml/nodes.py
View file

@ -332,6 +332,10 @@ 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)
if not t.added:
# transfer was canceled
return False
else:
t.progress = len(content) / item.info['size'] t.progress = len(content) / item.info['size']
t.save() t.save()
trigger_event('transfer', { trigger_event('transfer', {