Added easy thumbnails, images now in admin

amiibofindr/apps/amiibo/migrations/0017_auto_20150625_1806.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import os
+
+from django.conf import settings
+from django.core.files import File
+from django.db import models, migrations
+
+import amiibofindr.apps.amiibo.models
+
+
+def update_images(apps, schema_editor):
+    # We can't import the Person model directly as it may be a newer
+    # version than this migration expects. We use the historical version.
+    Person = apps.get_model("amiibo", "Amiibo")
+    for amiibo in Amiibo.objects.all():
+        amiibo.statue = File(open(os.path.join(settings.MEDIA_ROOT, 'amiibos', amiibo.collection.slug, '{}.png'.format(amiibo.slug))))
+        amiibo.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('amiibo', '0016_auto_20150624_0121'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='amiibo',
+            name='box',
+            field=models.ImageField(null=True, upload_to=amiibofindr.apps.amiibo.models.image_box_upload, blank=True),
+        ),
+        migrations.AddField(
+            model_name='amiibo',
+            name='statue',
+            field=models.ImageField(default='amiibos/noimage.png', upload_to=amiibofindr.apps.amiibo.models.image_statue_upload),
+            preserve_default=False,
+        ),
+        migrations.RunPython(update_images),
+    ]

amiibofindr/apps/amiibo/models.py

@@ -18,7 +18,7 @@ from amiibofindr.apps.shop.crawlers import Crawler
 # Upload_to helpers
 def image_statue_upload(self, filename):
     name, extension = os.path.splitext(filename)
-    return 'amiibos/{}/{}-statue{}'.format(
+    return 'amiibos/{}/{}{}'.format(
         self.collection.slug, self.slug, extension)
 
 def image_box_upload(self, filename):
@@ -59,6 +59,9 @@ class Amiibo(models.Model):
 
     slug = models.SlugField(max_length=64)
 
+    statue = models.ImageField(upload_to=image_statue_upload)
+    box = models.ImageField(upload_to=image_box_upload, blank=True, null=True)
+
     name_eu = models.CharField(max_length=64, blank=True, null=True)
     name_jp = models.CharField(max_length=64, blank=True, null=True)
     name_us = models.CharField(max_length=64, blank=True, null=True)

amiibofindr/settings/base.py

@@ -41,6 +41,7 @@ INSTALLED_APPS = (
     # third party
     'reversion',
     'import_export',
+    'easy_thumbnails',
 
     # own apps
     'amiibofindr.apps.core',

amiibofindr/templates/amiibo/widgets/amiibo-card.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load staticfiles thumbnail %}
 <div class="special card">
 	<div class="dimmable image">
     <div class="ui dimmer">
@@ -8,7 +8,7 @@
         </div>
       </div>
     </div>
-		<img src="{% static amiibo.image_statue %}">
+		<img src="{% thumbnail amiibo.statue 150x150 %}">
   </div>
   <div class="content">
     <a class="header">{{ amiibo.name }}</a>

requirements/base.txt

@@ -20,6 +20,7 @@ redis==2.10.3
 
 # Images
 Pillow==2.8.2
+easy-thumbnails==2.2
 
 # HTTP
 requests==2.7.0