X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/feee71de06ace01f793c2c8adf9cce65b9df2cec..b7d092eeaf7403386bfba7ed85b8abeb2109ada8:/apps/cover/management/commands/refresh_covers.py?ds=sidebyside

diff --git a/apps/cover/management/commands/refresh_covers.py b/apps/cover/management/commands/refresh_covers.py
index 59c68d2a..cc0ef31c 100644
--- a/apps/cover/management/commands/refresh_covers.py
+++ b/apps/cover/management/commands/refresh_covers.py
@@ -4,31 +4,45 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import urllib2 as urllib
+from optparse import make_option
 
 from django.core.files.base import ContentFile
-from django.core.management.base import NoArgsCommand
+from django.core.management import BaseCommand
 
 from cover.models import Image
 from cover.utils import get_flickr_data, URLOpener, FlickrError
 
 
-class Command(NoArgsCommand):
-    def handle_noargs(self, **options):
-        for image in Image.objects.exclude(book=None).order_by('id'):
+class Command(BaseCommand):
+    option_list = BaseCommand.option_list + (
+        make_option('--from', dest='from_id', type=int, default=1),
+    )
+
+    def handle(self, *args, **options):
+        from_id = options.get('from_id', 1)
+        images = Image.objects.filter(id__gte=from_id).exclude(book=None).order_by('id')
+        images = images.filter(source_url__contains='flickr.com').exclude(download_url__endswith='_o.jpg')
+        for image in images:
             print image.id
-            if 'flickr.com' in image.source_url:
+            try:
+                flickr_data = get_flickr_data(image.source_url)
+                print flickr_data
+            except FlickrError as e:
+                print 'Flickr analysis failed: %s' % e
+            else:
+                flickr_url = flickr_data['download_url']
+                if flickr_url != image.download_url:
+                    same_url = Image.objects.filter(download_url=flickr_url)
+                    if same_url:
+                        print 'Download url already present in image %s' % same_url.get().id
+                        continue
                 try:
-                    flickr_data = get_flickr_data(image.source_url)
-                except FlickrError as e:
-                    print 'Flickr analysis failed: %s' % e
+                    t = URLOpener().open(flickr_url).read()
+                except urllib.URLError:
+                    print 'Broken download url'
+                except IOError:
+                    print 'Connection failed'
                 else:
-                    try:
-                        t = URLOpener().open(image.download_url).read()
-                    except urllib.URLError:
-                        print 'Broken download url'
-                    except IOError:
-                        print 'Connection failed'
-                    else:
-                        image.download_url = flickr_data['download_url']
-                        image.file.save(image.file.name, ContentFile(t))
-                        image.save()
+                    image.download_url = flickr_url
+                    image.file.save(image.file.name, ContentFile(t))
+                    image.save()