From 8c8aae2c92b0eb2bdb26f8ba71d79b339aa2aa92 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 2 Jan 2021 11:59:14 -0800
Subject: [PATCH] Check if a book is already shelved after import

---
 bookwyrm/connectors/abstract_connector.py |  2 +-
 bookwyrm/outgoing.py                      | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 82b99378f..d63bd135e 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -205,7 +205,7 @@ def get_data(url):
                 'User-Agent': settings.USER_AGENT,
             },
         )
-    except RequestError:
+    except (RequestError, SSLError):
         raise ConnectorException()
     if not resp.ok:
         resp.raise_for_status()
diff --git a/bookwyrm/outgoing.py b/bookwyrm/outgoing.py
index fd4dff8f2..172563bbb 100644
--- a/bookwyrm/outgoing.py
+++ b/bookwyrm/outgoing.py
@@ -166,22 +166,24 @@ def handle_imported_book(user, item, include_reviews, privacy):
     if not item.book:
         return
 
-    if item.shelf:
+    existing_shelf = models.ShelfBook.objects.filter(
+        book=item.book, added_by=user).exists()
+
+    # shelve the book if it hasn't been shelved already
+    if item.shelf and not existing_shelf:
         desired_shelf = models.Shelf.objects.get(
             identifier=item.shelf,
             user=user
         )
-        # shelve the book if it hasn't been shelved already
-        shelf_book, created = models.ShelfBook.objects.get_or_create(
+        shelf_book = models.ShelfBook.objects.create(
             book=item.book, shelf=desired_shelf, added_by=user)
-        if created:
-            broadcast(user, shelf_book.to_add_activity(user), privacy=privacy)
+        broadcast(user, shelf_book.to_add_activity(user), privacy=privacy)
 
-            # only add new read-throughs if the item isn't already shelved
-            for read in item.reads:
-                read.book = item.book
-                read.user = user
-                read.save()
+        # only add new read-throughs if the item isn't already shelved
+        for read in item.reads:
+            read.book = item.book
+            read.user = user
+            read.save()
 
     if include_reviews and (item.rating or item.review):
         review_title = 'Review of {!r} on Goodreads'.format(