diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-03-21 15:10:24 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
| commit | 9226c46756430608ca458bbcfda453304d9a689a (patch) | |
| tree | d89e6ef613337db1f389be8169708e7c531f3165 | |
| parent | d23463777b92bf8c9c4058e70dc724ce96cfddc8 (diff) | |
| download | Ishtar-9226c46756430608ca458bbcfda453304d9a689a.tar.bz2 Ishtar-9226c46756430608ca458bbcfda453304d9a689a.zip | |
Simplify delayed import definition
| -rw-r--r-- | ishtar_common/models_imports.py | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 5b1493173..35cf141b0 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -847,38 +847,35 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), (settings.ALT_ENCODING, settings.ALT_ENCODING), ('utf-8', 'utf-8')] -CSV_SEPS = ((u",", u","), - (u";", u";"),) +CSV_SEPS = ((",", ","), + (";", ";"),) -delayed_import = None -delayed_check = None +@task() +def delayed_import(import_pk): + try: + imp = Import.objects.get(pk=import_pk) + except Import.DoesNotExist: + pass + imp.importation() -if settings.USE_BACKGROUND_TASK: - @task() - def delayed_import(import_pk): - try: - imp = Import.objects.get(pk=import_pk) - except Import.DoesNotExist: - pass - imp.importation() - @task() - def delayed_check(import_pk): - try: - imp = Import.objects.get(pk=import_pk) - except Import.DoesNotExist: - pass - imp.check_modified() +@task() +def delayed_check(import_pk): + try: + imp = Import.objects.get(pk=import_pk) + except Import.DoesNotExist: + pass + imp.check_modified() class Import(models.Model): user = models.ForeignKey('IshtarUser', blank=True, null=True, on_delete=models.SET_NULL) - name = models.CharField(_(u"Name"), max_length=500, null=True) + name = models.CharField(_("Name"), max_length=500, null=True) importer_type = models.ForeignKey(ImporterType) imported_file = models.FileField( - _(u"Imported file"), upload_to="upload/imports/%Y/%m/", max_length=220, + _("Imported file"), upload_to="upload/imports/%Y/%m/", max_length=220, help_text=max_size_help()) imported_images = models.FileField( _(u"Associated images (zip file)"), upload_to="upload/imports/%Y/%m/", |