From 543cc29ee19cfb4aedfb98e0845b49d813af667f Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Tue, 28 Apr 2020 14:59:48 +0100
Subject: [PATCH 1/3] Increase limit to 500 entries and warn about limit.

---
 fedireads/goodreads_import.py   | 4 ++--
 fedireads/templates/import.html | 2 ++
 fedireads/views.py              | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fedireads/goodreads_import.py b/fedireads/goodreads_import.py
index 7d4abdd5..5bbf6319 100644
--- a/fedireads/goodreads_import.py
+++ b/fedireads/goodreads_import.py
@@ -7,8 +7,8 @@ from fedireads.tasks import app
 from fedireads.models import ImportJob, ImportItem
 from fedireads.status import create_notification
 
-# TODO: remove or notify about this in the UI
-MAX_ENTRIES = 20
+# TODO: remove or increase once we're confident it's not causing problems.
+MAX_ENTRIES = 500
 
 
 def create_job(user, csv_file):
diff --git a/fedireads/templates/import.html b/fedireads/templates/import.html
index c73c095f..6ea032a3 100644
--- a/fedireads/templates/import.html
+++ b/fedireads/templates/import.html
@@ -8,6 +8,8 @@
         {{ import_form.as_p }}
         <button type="submit">Import</button>
     </form>
+    <p>
+    Imports are limited in size, and only the first {{ limit }} items will be imported.
 
     <h2>Recent Imports</h2>
     <ul>
diff --git a/fedireads/views.py b/fedireads/views.py
index ff76166a..7b158895 100644
--- a/fedireads/views.py
+++ b/fedireads/views.py
@@ -9,6 +9,7 @@ from django.views.decorators.csrf import csrf_exempt
 
 from fedireads import activitypub
 from fedireads import forms, models, books_manager
+from fedireads import goodreads_import
 from fedireads.tasks import app
 
 
@@ -162,6 +163,7 @@ def import_page(request):
         'import_form': forms.ImportForm(),
         'jobs': models.ImportJob.
                 objects.filter(user=request.user).order_by('-created_date'),
+        'limit': goodreads_import.MAX_ENTRIES,
     })
 
 

From 9ffab814afe7f3d2a2df768decc00874ed8b0ca2 Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Tue, 28 Apr 2020 15:16:41 +0100
Subject: [PATCH 2/3] Don't crash if we don't recognise the exclusive shelf.

---
 fedireads/models/import_job.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedireads/models/import_job.py b/fedireads/models/import_job.py
index 2465fe12..28555c0f 100644
--- a/fedireads/models/import_job.py
+++ b/fedireads/models/import_job.py
@@ -89,7 +89,7 @@ class ImportItem(models.Model):
     def shelf(self):
         ''' the goodreads shelf field '''
         if self.data['Exclusive Shelf']:
-            return GOODREADS_SHELVES[self.data['Exclusive Shelf']]
+            return GOODREADS_SHELVES.get(self.data['Exclusive Shelf'])
 
     @property
     def review(self):

From 64f9e12b1dfa156945943115dc8bdbffb3b8a556 Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Tue, 28 Apr 2020 15:27:06 +0100
Subject: [PATCH 3/3] Isbns aren't necessarily always unique.

---
 fedireads/models/import_job.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedireads/models/import_job.py b/fedireads/models/import_job.py
index 28555c0f..1c35282e 100644
--- a/fedireads/models/import_job.py
+++ b/fedireads/models/import_job.py
@@ -61,7 +61,7 @@ class ImportItem(models.Model):
     def get_book_from_db_isbn(self):
         ''' see if we already know about the book '''
         try:
-            return Edition.objects.get(isbn=self.isbn)
+            return Edition.objects.filter(isbn=self.isbn).first()
         except Edition.DoesNotExist:
             return None