X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3e276f49505e607b72892b40d18ac2cef194497e..273bfef3914a3196102e015297c5a64d22766a85:/apps/cover/models.py diff --git a/apps/cover/models.py b/apps/cover/models.py index 87a70a80..d83dad39 100644 --- a/apps/cover/models.py +++ b/apps/cover/models.py @@ -3,15 +3,21 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -import re -from urllib2 import urlopen -from urlparse import urljoin -from django.conf import settings from django.core.files.base import ContentFile +from django.core.files.storage import FileSystemStorage from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ +from django.contrib.sites.models import Site +from cover.utils import URLOpener + + +class OverwriteStorage(FileSystemStorage): + + def get_available_name(self, name, max_length=None): + self.delete(name) + return name class Image(models.Model): @@ -19,9 +25,10 @@ class Image(models.Model): author = models.CharField(max_length=255, verbose_name=_('author')) license_name = models.CharField(max_length=255, verbose_name=_('license name')) license_url = models.URLField(max_length=255, blank=True, verbose_name=_('license URL')) - source_url = models.URLField(verbose_name=_('source URL')) - download_url = models.URLField(unique=True, verbose_name=_('image download URL')) - file = models.ImageField(upload_to='cover/image', editable=False, verbose_name=_('file')) + source_url = models.URLField(verbose_name=_('source URL'), null=True, blank=True) + download_url = models.URLField(unique=True, verbose_name=_('image download URL'), null=True, blank=True) + file = models.ImageField( + upload_to='cover/image', storage=OverwriteStorage(), editable=True, verbose_name=_('file')) class Meta: verbose_name = _('cover image') @@ -32,13 +39,14 @@ class Image(models.Model): @models.permalink def get_absolute_url(self): - return ('cover_image', [self.id]) + return 'cover_image', [self.id] + + def get_full_url(self): + return "http://%s%s" % (Site.objects.get_current().domain, self.get_absolute_url()) @receiver(post_save, sender=Image) def download_image(sender, instance, **kwargs): if instance.pk and not instance.file: - t = urlopen(instance.download_url).read() + t = URLOpener().open(instance.download_url).read() instance.file.save("%d.jpg" % instance.pk, ContentFile(t)) - - \ No newline at end of file