diff --git a/acros/migrations/0042_auto_20200718_2017.py b/acros/migrations/0042_auto_20200718_2017.py new file mode 100644 index 0000000..0f6941b --- /dev/null +++ b/acros/migrations/0042_auto_20200718_2017.py @@ -0,0 +1,23 @@ +# Generated by Django 3.0.8 on 2020-07-18 20:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('acros', '0041_auto_20200718_1937'), + ] + + operations = [ + migrations.AlterField( + model_name='wikipediaimage', + name='credit', + field=models.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name='wikipediaimage', + name='thumbnail', + field=models.ImageField(blank=True, null=True, upload_to='wikipedia_images/'), + ), + ] diff --git a/acros/models/WikipediaImage.py b/acros/models/WikipediaImage.py index b52dcb4..2753f00 100644 --- a/acros/models/WikipediaImage.py +++ b/acros/models/WikipediaImage.py @@ -15,7 +15,7 @@ class WikipediaImage(models.Model): thumb_height = models.IntegerField(blank=True, editable=False, null=True) imageurl = models.URLField() caption = models.CharField(max_length=1000, null=True, blank=True) - credit = models.TextField() + credit = models.TextField(null=True, blank=True) artist = models.TextField() license_short_name = models.TextField() attribution = models.TextField(null=True, blank=True) diff --git a/acros/utils/apis.py b/acros/utils/apis.py index 71e86f3..852bd39 100644 --- a/acros/utils/apis.py +++ b/acros/utils/apis.py @@ -101,9 +101,9 @@ class WikipediaImageAPIObject: return clean_html(self.extmetadata["ImageDescription"]["value"]) @property - def credit(self) -> str: - print(self.extmetadata["Credit"]) - return clean_html(self.extmetadata["Credit"]["value"]) + def credit(self) -> Optional[str]: + if "Credit" in self.extmetadata: + return clean_html(self.extmetadata["Credit"]["value"]) @property def artist(self) -> str: