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

cleanup in progress apply_changes on peer removal

Browse source
This commit is contained in:
j 2016-01-14 19:06:07 +05:30
parent ec50a04097
commit 8e3d8b5f8e
3 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oml/changelog.py
View file

@ -82,6 +82,10 @@ class Changelog(db.Model):
def apply_changes(cls, user, changes): def apply_changes(cls, user, changes):
trigger = changes trigger = changes
for change in changes: for change in changes:
if user.id in state.removepeer:
user.cleanup()
del state.removepeer[user.id]
return False
if not cls.apply_change(user, change, trigger=False): if not cls.apply_change(user, change, trigger=False):
logger.debug('FAIL %s', change) logger.debug('FAIL %s', change)
trigger = False trigger = False

1
oml/state.py
View file

@ -12,6 +12,7 @@ update = False
websockets = [] websockets = []
activity = {} activity = {}
removepeer = {}
def user(): def user():
import settings import settings

18
oml/user/models.py
View file

@ -113,12 +113,24 @@ class User(db.Model):
Changelog.record(state.user(), 'addpeer', self.id, self.nickname) Changelog.record(state.user(), 'addpeer', self.id, self.nickname)
self.peered = True self.peered = True
self.save() self.save()
if self.id in state.removepeer:
del state.removepeer[self.id]
else: else:
self.pending = '' self.pending = ''
self.peered = False self.peered = False
self.queued = False self.queued = False
self.update_name() self.update_name()
self.save() self.save()
if self.name in settings.ui['showFolder']:
del settings.ui['showFolder'][self.name]
settings.ui._save()
self.cleanup()
if was_peering:
Changelog.record(state.user(), 'removepeer', self.id)
state.removepeer[self.id] = True
self.save()
def cleanup(self):
List.query.filter_by(user_id=self.id).delete() List.query.filter_by(user_id=self.id).delete()
for i in self.items: for i in self.items:
i.users.remove(self) i.users.remove(self)
@ -126,12 +138,6 @@ class User(db.Model):
i.delete() i.delete()
Changelog.query.filter_by(user_id=self.id).delete() Changelog.query.filter_by(user_id=self.id).delete()
Metadata.query.filter_by(user_id=self.id).delete() Metadata.query.filter_by(user_id=self.id).delete()
if self.name in settings.ui['showFolder']:
del settings.ui['showFolder'][self.name]
settings.ui._save()
self.save()
if was_peering:
Changelog.record(state.user(), 'removepeer', self.id)
self.save() self.save()
def update_name(self): def update_name(self):