Improved AmiiboCard model

amiibofindr/apps/amiibo/management/commands/fetch_cards.py

@@ -17,9 +17,6 @@ class Command(BaseCommand):
     dice = {
         'one': 1, 'two': 2, 'three': 3, 'four': 4, 'five': 5, 'six': 6,
     }
-    rps = {
-        'rock': 1, 'paper': 2, 'scissors': 3,
-    }
 
     def handle_image(self, image_url):
         image = requests.get(image_url)
@@ -45,10 +42,10 @@ class Command(BaseCommand):
                 # amiibo.collection_number = int(item['number_number'])
                 amiibo.collection = collection
 
-                amiibo.dice = self.dice[item['dice_value'].lower()]
-                amiibo.rps = self.rps[item['rps_value'].lower()]
+                # amiibo.image = self.handle_image(item['cardphoto_link'])
 
-                amiibo.image = self.handle_image(item['cardphoto_link'])
+            amiibo.dice = self.dice[item['dice_value'].lower()]
+            amiibo.rps = item['rps_value'].lower()
 
             amiibo.card_type = item['type_value'].lower()
 

amiibofindr/apps/amiibo/migrations/0027_auto_20150910_0021.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('amiibo', '0026_auto_20150909_2331'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='amiibocard',
+            name='rps',
+            field=models.CharField(default=b'rock', max_length=1, choices=[(b'rock', b'Rock'), (b'paper', b'Paper'), (b'scissors', b'Scissors')]),
+        ),
+    ]

amiibofindr/apps/amiibo/migrations/0028_auto_20150910_0021.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('amiibo', '0027_auto_20150910_0021'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='amiibocard',
+            name='rps',
+            field=models.CharField(default=b'rock', max_length=12, choices=[(b'rock', b'Rock'), (b'paper', b'Paper'), (b'scissors', b'Scissors')]),
+        ),
+    ]

amiibofindr/apps/amiibo/models.py

@@ -201,9 +201,9 @@ class AmiiboFigure(Amiibo):
 
 
 class AmiiboCard(Amiibo):
-    ROCK = 1
-    PAPER = 2
-    SCISSORS = 3
+    ROCK = 'rock'
+    PAPER = 'paper'
+    SCISSORS = 'scissors'
     RPS_CHOICES = (
         (ROCK, 'Rock'),
         (PAPER, 'Paper'),
@@ -214,7 +214,7 @@ class AmiiboCard(Amiibo):
     card_type = models.CharField(max_length=12, default='special')
 
     dice = models.IntegerField(default=1)
-    rps = models.CharField(choices=RPS_CHOICES, default=ROCK, max_length=1)
+    rps = models.CharField(choices=RPS_CHOICES, default=ROCK, max_length=12)
 
     class Meta:
         ordering = ('collection', 'collection_number', 'name_eu', )

amiibofindr/templates/amiibo/amiibo-figure.html

@@ -134,7 +134,7 @@ AMIIBO FIGURE
                 </div>
             {% endfor %}
           </div>
-        {% else %}
+        {% else %}q
           {% trans "No shops :(" %}
         {% endif %}
       </div>