ynerant
/
nk20-scripts
mirror of https://gitlab.crans.org/bde/nk20-scripts
1
0
Fork 0
Code Issues Releases Wiki Activity

more cleaning

This commit is contained in:
Pierre-antoine Comby 2020-05-25 12:15:48 +02:00
parent 8758cb5238
commit 2996c9702f
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
management/commands/_import_utils.py
View File

@ -82,13 +82,12 @@ class BulkCreateManager(object):
model_key = model_class._meta.label model_key = model_class._meta.label
# check for mutli-table inheritance it happens # check for mutli-table inheritance it happens
# if model_class is a grand-child of PolymorphicModel # if model_class is a grand-child of PolymorphicModel
if model_class.__base__ is not PolymorphicModel and model_class.__base__.__base__ is PolymorphicModel: if model_class.__base__.__base__ is PolymorphicModel:
self._commit(model_class.__base__) self._commit(model_class.__base__)
with transaction.atomic(): with transaction.atomic():
for obj in self._create_queues[model_key]: for obj in self._create_queues[model_key]:
obj.save_base(raw=True) obj.save_base(raw=True)
else: else:
# ensure that parents models exists
model_class.objects.bulk_create(self._create_queues[model_key]) model_class.objects.bulk_create(self._create_queues[model_key])
self._create_queues[model_key] = [] self._create_queues[model_key] = []

2
management/commands/import_account.py
View File

@ -176,10 +176,10 @@ class Command(ImportCommand):
bulk_mgr = BulkCreateManager(chunk_size=chunk_size) bulk_mgr = BulkCreateManager(chunk_size=chunk_size)
pk_alias = Alias.objects.order_by('-id').first().id + 1 pk_alias = Alias.objects.order_by('-id').first().id + 1
for idx, row in enumerate(cur): for idx, row in enumerate(cur):
self.update_line(idx, n, row["alias"])
alias_name = row["alias"] alias_name = row["alias"]
alias_name = (alias_name[:252] + '...') if len(alias_name) > 255 else alias_name alias_name = (alias_name[:252] + '...') if len(alias_name) > 255 else alias_name
alias_norm = Alias.normalize(alias_name) alias_norm = Alias.normalize(alias_name)
self.update_line(idx, n, alias_norm)
# clean pseudo (normalized pseudo must be unique) # clean pseudo (normalized pseudo must be unique)
if alias_norm in ALIAS_SET: if alias_norm in ALIAS_SET:
continue continue