cleaned migrations

Author: ehmadzubair

Diff for: home/admin.py

@@ -18,6 +18,6 @@ class ManifestSettingsAdmin(ModelAdmin):
 
 @admin.register(SVGToPNGMap)
 class SVGToPNGMapAdmin(admin.ModelAdmin):
-    list_display = ('id', 'svg_path', 'color', 'png_image_file')
+    list_display = ('id', 'svg_path', 'fill_color', 'stroke_color', 'png_image_file')
 
 

Diff for: home/migrations/0013_merge_20210920_1202.py renamed to home/migrations/0013_merge_20211004_0940.py

@@ -1,13 +1,13 @@
-# Generated by Django 3.1.13 on 2021-09-20 12:02
+# Generated by Django 3.1.13 on 2021-10-04 09:40
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('home', '0012_sitesettings_opt_in_to_google_web_light'),
         ('home', '0011_v1tov2objectmap_extra'),
+        ('home', '0012_sitesettings_opt_in_to_google_web_light'),
     ]
 
     operations = [

Diff for: home/migrations/0014_merge_20211001_1117.py

@@ -1,12 +1,12 @@
-# Generated by Django 3.1.13 on 2021-09-22 12:00
+# Generated by Django 3.1.13 on 2021-10-04 09:41
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('home', '0012_sitesettings_opt_in_to_google_web_light'),
+        ('home', '0013_merge_20211004_0940'),
     ]
 
     operations = [
@@ -15,11 +15,12 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('svg_path', models.TextField()),
-                ('color', models.TextField()),
+                ('fill_color', models.TextField(null=True)),
+                ('stroke_color', models.TextField(null=True)),
                 ('png_image_file', models.ImageField(upload_to='svg-to-png-maps/')),
             ],
             options={
-                'unique_together': {('svg_path', 'color')},
+                'unique_together': {('svg_path', 'fill_color', 'stroke_color')},
             },
         ),
     ]

Diff for: home/migrations/0013_svgtopngmap.py renamed to home/migrations/0014_svgtopngmap.py

@@ -880,21 +880,22 @@ def create_map(cls, content_object, v1_object_id, extra=None):
 
 class SVGToPNGMap(models.Model):
     svg_path = models.TextField()
-    color = models.TextField()
+    fill_color = models.TextField(null=True)
+    stroke_color = models.TextField(null=True)
     png_image_file = models.ImageField(upload_to='svg-to-png-maps/')
 
     @classmethod
-    def get_png_image(cls, svg_path, color):
+    def get_png_image(cls, svg_path, fill_color, stroke_color=None):
         try:
-            obj = cls.objects.get(svg_path=svg_path, color=color)
+            obj = cls.objects.get(svg_path=svg_path, fill_color=fill_color, stroke_color=stroke_color)
         except cls.DoesNotExist:
-            png_image = convert_svg_to_png_bytes(svg_path, fill_color=color)
-
-            obj = cls.objects.create(svg_path=svg_path, color=color, png_image_file=png_image)
+            png_image = convert_svg_to_png_bytes(svg_path, fill_color=fill_color, stroke_color=stroke_color, scale=10)
+            obj = cls.objects.create(
+                svg_path=svg_path, fill_color=fill_color, stroke_color=stroke_color, png_image_file=png_image)
         return obj.png_image_file
 
     def __str__(self):
-        return f'{self.svg_path} ({self.color}) -> {self.png_image_file}'
+        return f'{self.svg_path} (F={self.fill_color}) (S={self.stroke_color}) -> {self.png_image_file}'
 
     class Meta:
-        unique_together = ('svg_path', 'color')
+        unique_together = ('svg_path', 'fill_color', 'stroke_color')