X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/bff8ff8102fe26b61205c444d29024cdf6c9f6e7..30f09936467f85de2fc76debdd43a6d6ff38f7f3:/apps/cover/models.py?ds=sidebyside diff --git a/apps/cover/models.py b/apps/cover/models.py index 14026ac7..d4432c2c 100644 --- a/apps/cover/models.py +++ b/apps/cover/models.py @@ -4,7 +4,6 @@ # 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 @@ -13,6 +12,7 @@ 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 Image(models.Model): @@ -20,9 +20,9 @@ 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) + download_url = models.URLField(unique=True, verbose_name=_('image download URL'), null = True) + file = models.ImageField(upload_to='cover/image', editable=True, verbose_name=_('file')) class Meta: verbose_name = _('cover image') @@ -42,7 +42,7 @@ class Image(models.Model): @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