From ca26a712c3c52e68189f3f6fcb6892e56ce5a99a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 31 Mar 2020 10:19:44 -0700
Subject: [PATCH] Simplify default edition logic

---
 fedireads/activitypub/book.py       |  2 +-
 fedireads/connectors/openlibrary.py | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/fedireads/activitypub/book.py b/fedireads/activitypub/book.py
index 49338ee05..a1a0a637f 100644
--- a/fedireads/activitypub/book.py
+++ b/fedireads/activitypub/book.py
@@ -44,7 +44,7 @@ def get_book(book):
         'published_date': book.published_date.isoformat() if \
                 book.published_date else None,
         'parent_work': book.parent_work.absolute_id if \
-                book.parent_work else None,
+                hasattr(book, 'parent_work') else None,
     }
     for field in fields:
         if hasattr(book, field):
diff --git a/fedireads/connectors/openlibrary.py b/fedireads/connectors/openlibrary.py
index 0261fa901..842d31d40 100644
--- a/fedireads/connectors/openlibrary.py
+++ b/fedireads/connectors/openlibrary.py
@@ -190,26 +190,19 @@ class Connector(AbstractConnector):
 def set_default_edition(work):
     ''' pick one edition to be what gets shown by default '''
     # check for an existing default work, in which case we're done
-    # favor recent, hardcover, english editions
+    if models.Edition.objects.filter(
+            parent_work=work,
+            default=True
+        ).count():
+        return
     editions = models.Edition.objects.filter(
         parent_work=work,
     ).all()
     options = [e for e in editions if 'English' in e.languages] or editions
-    format_prefs = {
-        'hardcover': 0,
-        'paperback': 1,
-        'mass market paperback': 2,
-    }
+    options = [e for e in options if e.cover] or options
     options = sorted(
         options,
-        key=lambda e: format_prefs.get(str(e.physical_format).lower(), 3)
-    )
-    if options[0].physical_format in format_prefs:
-        options = [e for e in options if \
-            e.physical_format == options[0].physical_format]
-    options = sorted(
-        options,
-        key=lambda e: -1 * e.published_date.year
+        key=lambda e: e.published_date.year if e.published_date else None
     )
     options[0].default = True
     options[0].save()