Remove machina, remove default cache config, add some upgrades and compatibility...

[wolnelektury.git] / src / picture / tasks.py

diff --git a/src/picture/tasks.py b/src/picture/tasks.py
index e80b0fc..ff9aa13 100644 (file)
--- a/src/picture/tasks.py
+++ b/src/picture/tasks.py
@@ -1,27 +1,28 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+import json

 from traceback import print_exc
 
 from traceback import print_exc
 

-from celery.task import task
+from celery import shared_task

 from django.core.files.base import ContentFile
 from django.template.loader import render_to_string
 
 
 from django.core.files.base import ContentFile
 from django.template.loader import render_to_string
 
 

-@task
+@shared_task

 def generate_picture_html(picture_id):
     import picture.models
     pic = picture.models.Picture.objects.get(pk=picture_id)
 def generate_picture_html(picture_id):
     import picture.models
     pic = picture.models.Picture.objects.get(pk=picture_id)

+    areas_json = json.loads(pic.areas_json)

 
     html_text = render_to_string('picture/picture_info.html', {
 
     html_text = render_to_string('picture/picture_info.html', {

-                'things': pic.areas_json['things'],
-                'themes': pic.areas_json['themes'],
+                'things': areas_json['things'],
+                'themes': areas_json['themes'],

                 })
     pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text))
 
 
                 })
     pic.html_file.save("%s.html" % pic.slug, ContentFile(html_text))
 
 

-@task
+@shared_task

 def index_picture(picture_id, picture_info=None, **kwargs):
     from picture.models import Picture
     try:
 def index_picture(picture_id, picture_info=None, **kwargs):
     from picture.models import Picture
     try: