From 54b5f0097b02147c10e743e5ac1d011454f9931f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 28 Mar 2020 13:03:49 -0700 Subject: [PATCH] Update connector and author tables --- fedireads/connectors/openlibrary.py | 2 +- .../migrations/0022_auto_20200328_2001.py | 27 +++++++++++++++++++ fedireads/models/book.py | 4 +-- 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 fedireads/migrations/0022_auto_20200328_2001.py diff --git a/fedireads/connectors/openlibrary.py b/fedireads/connectors/openlibrary.py index c52364295..7270d7bb3 100644 --- a/fedireads/connectors/openlibrary.py +++ b/fedireads/connectors/openlibrary.py @@ -162,7 +162,7 @@ def get_date(date_string): return datetime.strptime(date_string, date_format) except ValueError: pass - return False + return None def get_description(description_blob): diff --git a/fedireads/migrations/0022_auto_20200328_2001.py b/fedireads/migrations/0022_auto_20200328_2001.py new file mode 100644 index 000000000..66e58a6fb --- /dev/null +++ b/fedireads/migrations/0022_auto_20200328_2001.py @@ -0,0 +1,27 @@ +# Generated by Django 3.0.3 on 2020-03-28 20:01 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fedireads', '0021_auto_20200328_0428'), + ] + + operations = [ + migrations.RemoveField( + model_name='connector', + name='is_self', + ), + migrations.AddField( + model_name='author', + name='fedireads_key', + field=models.CharField(max_length=255, null=True, unique=True), + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255), + ), + ] diff --git a/fedireads/models/book.py b/fedireads/models/book.py index 48676a72f..e9aefa0fd 100644 --- a/fedireads/models/book.py +++ b/fedireads/models/book.py @@ -20,9 +20,6 @@ class Connector(FedireadsModel): default='openlibrary', choices=ConnectorFiles.choices ) - # is this a connector to your own database, should only be true if - # the connector_file is `fedireads` - is_self = models.BooleanField(default=False) api_key = models.CharField(max_length=255, null=True) base_url = models.CharField(max_length=255) @@ -130,6 +127,7 @@ class Edition(Book): class Author(FedireadsModel): ''' copy of an author from OL ''' openlibrary_key = models.CharField(max_length=255, null=True, unique=True) + fedireads_key = models.CharField(max_length=255, null=True, unique=True) wikipedia_link = models.CharField(max_length=255, blank=True, null=True) # idk probably other keys would be useful here? born = models.DateTimeField(null=True)