X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/73804022c58b91d618e477fd8a4a4148cefe3613..fd6cf046f53bdd89d6cf49cd4f7387c3e9ff86ad:/apps/sponsors/models.py?ds=inline diff --git a/apps/sponsors/models.py b/apps/sponsors/models.py index d91c8f420..2d18d1664 100644 --- a/apps/sponsors/models.py +++ b/apps/sponsors/models.py @@ -2,6 +2,7 @@ # 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 django.db import models @@ -9,25 +10,18 @@ from django.utils.translation import ugettext_lazy as _ from django.template.loader import render_to_string from PIL import Image -from sorl.thumbnail.fields import ImageWithThumbnailsField -from sponsors.fields import JSONField +from jsonfield import JSONField from django.core.files.base import ContentFile -THUMB_WIDTH=120 -THUMB_HEIGHT=120 +THUMB_WIDTH = 120 +THUMB_HEIGHT = 120 + class Sponsor(models.Model): name = models.CharField(_('name'), max_length=120) _description = models.CharField(_('description'), blank=True, max_length=255) - logo = ImageWithThumbnailsField( - _('logo'), - upload_to='sponsorzy/sponsor/logo', - thumbnail={ - 'size': (THUMB_WIDTH, THUMB_HEIGHT), - 'extension': 'png', - 'options': ['pad', 'detail'], - }) - url = models.URLField(_('url'), blank=True, verify_exists=False) + logo = models.ImageField(_('logo'), upload_to='sponsorzy/sponsor/logo') + url = models.URLField(_('url'), blank=True) def __unicode__(self): return self.name @@ -41,14 +35,14 @@ class Sponsor(models.Model): class SponsorPage(models.Model): name = models.CharField(_('name'), max_length=120) - sponsors = JSONField(_('sponsors'), default={}) + sponsors = JSONField(_('sponsors'), default='{}') _html = models.TextField(blank=True, editable=False) sprite = models.ImageField(upload_to='sponsorzy/sprite', blank=True) def populated_sponsors(self): result = [] offset = 0 - for column in self.get_sponsors_value(): + for column in self.sponsors: result_group = {'name': column['name'], 'sponsors': []} sponsor_objects = Sponsor.objects.in_bulk(column['sponsors']) for sponsor_pk in column['sponsors']: @@ -62,13 +56,24 @@ class SponsorPage(models.Model): def render_sprite(self): sponsor_ids = [] - for column in self.get_sponsors_value(): + for column in self.sponsors: sponsor_ids.extend(column['sponsors']) sponsors = Sponsor.objects.in_bulk(sponsor_ids) - sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors)*THUMB_HEIGHT)) + sprite = Image.new('RGBA', (THUMB_WIDTH, len(sponsors) * THUMB_HEIGHT)) for i, sponsor_id in enumerate(sponsor_ids): - simg = Image.open(sponsors[sponsor_id].logo.thumbnail.dest) - sprite.paste(simg, (0, i*THUMB_HEIGHT)) + simg = Image.open(sponsors[sponsor_id].logo.path) + if simg.size[0] > THUMB_WIDTH or simg.size[1] > THUMB_HEIGHT: + size = ( + min(THUMB_WIDTH, + simg.size[0] * THUMB_HEIGHT / simg.size[1]), + min(THUMB_HEIGHT, + 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, + )) imgstr = StringIO() sprite.save(imgstr, 'png') @@ -81,6 +86,9 @@ 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(),