X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b2d342589a7889a3b096e7192453d53bd28eed7d..7b36a6299b5e5e2c4e0705fa1b2965a97a76aadc:/src/sponsors/models.py diff --git a/src/sponsors/models.py b/src/sponsors/models.py index 89b06ff2c..6e4ffe1f3 100644 --- a/src/sponsors/models.py +++ b/src/sponsors/models.py @@ -1,18 +1,16 @@ -# -*- 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. # import json import time -from StringIO import StringIO +from io import BytesIO +from django.core.cache import cache from django.db import models from django.utils.translation import ugettext_lazy as _ from django.template.loader import render_to_string from PIL import Image -from jsonfield import JSONField from django.core.files.base import ContentFile -from ssify import flush_ssi_includes THUMB_WIDTH = 120 THUMB_HEIGHT = 120 @@ -24,7 +22,7 @@ class Sponsor(models.Model): logo = models.ImageField(_('logo'), upload_to='sponsorzy/sponsor/logo') url = models.URLField(_('url'), blank=True) - def __unicode__(self): + def __str__(self): return self.name def description(self): @@ -36,14 +34,17 @@ class Sponsor(models.Model): class SponsorPage(models.Model): name = models.CharField(_('name'), max_length=120) - sponsors = JSONField(_('sponsors'), default={}) + sponsors = models.TextField(_('sponsors'), default='{}') _html = models.TextField(blank=True, editable=False) sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True) + def get_sponsors_json(self): + return json.loads(self.sponsors or '[]') + def populated_sponsors(self): result = [] offset = 0 - for column in self.sponsors: + for column in self.get_sponsors_json(): result_group = {'name': column['name'], 'sponsors': []} sponsor_objects = Sponsor.objects.in_bulk(column['sponsors']) for sponsor_pk in column['sponsors']: @@ -57,7 +58,7 @@ class SponsorPage(models.Model): def render_sprite(self): sponsor_ids = [] - for column in self.sponsors: + for column in self.get_sponsors_json(): sponsor_ids.extend(column['sponsors']) sponsors = Sponsor.objects.in_bulk(sponsor_ids) sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors) * THUMB_HEIGHT)) @@ -66,16 +67,16 @@ class SponsorPage(models.Model): if simg.size[0] > THUMB_WIDTH or simg.size[1] > THUMB_HEIGHT: size = ( min(THUMB_WIDTH, - simg.size[0] * THUMB_HEIGHT / simg.size[1]), + round(simg.size[0] * THUMB_HEIGHT / simg.size[1])), min(THUMB_HEIGHT, - simg.size[1] * THUMB_WIDTH / simg.size[0]) + round(simg.size[1] * THUMB_WIDTH / simg.size[0])) ) simg = simg.resize(size, Image.ANTIALIAS) sprite.paste(simg, ( - (THUMB_WIDTH - simg.size[0]) / 2, - i * THUMB_HEIGHT + (THUMB_HEIGHT - simg.size[1]) / 2, + round((THUMB_WIDTH - simg.size[0]) / 2), + round(i * THUMB_HEIGHT + (THUMB_HEIGHT - simg.size[1]) / 2), )) - imgstr = StringIO() + imgstr = BytesIO() sprite.save(imgstr, 'png') if self.sprite: @@ -88,20 +89,14 @@ class SponsorPage(models.Model): html = property(fget=html) def save(self, *args, **kwargs): - if isinstance(self.sponsors, basestring): - # Walkaround for weird jsonfield 'no-decode' optimization. - self.sponsors = json.loads(self.sponsors) self.render_sprite() self._html = render_to_string('sponsors/page.html', { 'sponsors': self.populated_sponsors(), 'page': self }) ret = super(SponsorPage, self).save(*args, **kwargs) - self.flush_includes() + cache.delete('sponsor_page:' + name) return ret - def flush_includes(self): - flush_ssi_includes(['/sponsors/page/%s.html' % self.name]) - - def __unicode__(self): + def __str__(self): return self.name