remove mismatched html tags

[redakcja.git] / apps / cover / models.py

diff --git a/apps/cover/models.py b/apps/cover/models.py
index 14026ac..c7657f3 100644 (file)
--- a/apps/cover/models.py
+++ b/apps/cover/models.py
@@ -3,16 +3,13 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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.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 django.core.files.base import ContentFile
 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 Image(models.Model):
 
 
 class Image(models.Model):


@@ -20,9 +17,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'))
     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')
 
     class Meta:
         verbose_name = _('cover image')


@@ -33,7 +30,7 @@ class Image(models.Model):
 
     @models.permalink
     def get_absolute_url(self):
 
     @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())
 
     def get_full_url(self):
         return "http://%s%s" % (Site.objects.get_current().domain, self.get_absolute_url())


@@ -42,7 +39,5 @@ class Image(models.Model):
 @receiver(post_save, sender=Image)
 def download_image(sender, instance, **kwargs):
     if instance.pk and not instance.file:
 @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))
         instance.file.save("%d.jpg" % instance.pk, ContentFile(t))

-        
-        
\ No newline at end of file