Merge pull request #425 from mouse-reeve/import-error

Fixes goodreads import failing on every book

bookwyrm/connectors/abstract_connector.py

@@ -168,7 +168,7 @@ class AbstractConnector(AbstractMinimalConnector):
         ''' every work needs at least one edition '''
 
     @abstractmethod
-    def get_work_from_edition_date(self, data):
+    def get_work_from_edition_data(self, data):
         ''' every edition needs a work '''
 
     @abstractmethod
@@ -228,6 +228,7 @@ class SearchResult:
     key: str
     author: str
     year: str
+    connector: object
     confidence: int = 1
 
     def __repr__(self):

bookwyrm/connectors/bookwyrm_connector.py

@@ -13,4 +13,5 @@ class Connector(AbstractMinimalConnector):
         return data
 
     def format_search_result(self, search_result):
+        search_result['connector'] = self
         return SearchResult(**search_result)

bookwyrm/connectors/openlibrary.py

@@ -85,7 +85,7 @@ class Connector(AbstractConnector):
         return pick_default_edition(data['entries'])
 
 
-    def get_work_from_edition_date(self, data):
+    def get_work_from_edition_data(self, data):
         try:
             key = data['works'][0]['key']
         except (IndexError, KeyError):
@@ -123,6 +123,7 @@ class Connector(AbstractConnector):
             title=search_result.get('title'),
             key=key,
             author=', '.join(author),
+            connector=self,
             year=search_result.get('first_publish_year'),
         )
 

bookwyrm/connectors/self_connector.py

@@ -51,28 +51,23 @@ class Connector(AbstractConnector):
             author=search_result.author_text,
             year=search_result.published_date.year if \
                     search_result.published_date else None,
+            connector=self,
             confidence=search_result.rank,
         )
 
 
-    def get_remote_id_from_data(self, data):
-        pass
-
     def is_work_data(self, data):
         pass
 
     def get_edition_from_work_data(self, data):
         pass
 
-    def get_work_from_edition_date(self, data):
+    def get_work_from_edition_data(self, data):
         pass
 
     def get_authors_from_data(self, data):
         return None
 
-    def get_cover_from_data(self, data):
-        return None
-
     def parse_search_data(self, data):
         ''' it's already in the right format, don't even worry about it '''
         return data

bookwyrm/models/import_job.py

@@ -76,7 +76,7 @@ class ImportItem(models.Model):
         )
         if search_result:
             # raises ConnectorException
-            return books_manager.get_or_create_book(search_result.key)
+            return search_result.connector.get_or_create_book(search_result.key)
         return None
 
 
@@ -91,7 +91,7 @@ class ImportItem(models.Model):
         )
         if search_result:
             # raises ConnectorException
-            return books_manager.get_or_create_book(search_result.key)
+            return search_result.connector.get_or_create_book(search_result.key)
         return None
 
 

bookwyrm/tests/models/test_import_model.py

@@ -1,9 +1,15 @@
 ''' testing models '''
 import datetime
+import json
+import pathlib
+from unittest.mock import patch
+
 from django.utils import timezone
 from django.test import TestCase
+import responses
 
-from bookwyrm import models
+from bookwyrm import books_manager, models
+from bookwyrm.connectors.abstract_connector import SearchResult
 
 
 class ImportJob(TestCase):
@@ -54,11 +60,11 @@ class ImportJob(TestCase):
         user = models.User.objects.create_user(
             'mouse', 'mouse@mouse.mouse', 'mouseword', local=True)
         job = models.ImportJob.objects.create(user=user)
-        models.ImportItem.objects.create(
+        self.item_1 = models.ImportItem.objects.create(
             job=job, index=1, data=currently_reading_data)
-        models.ImportItem.objects.create(
+        self.item_2 = models.ImportItem.objects.create(
             job=job, index=2, data=read_data)
-        models.ImportItem.objects.create(
+        self.item_3 = models.ImportItem.objects.create(
             job=job, index=3, data=unknown_read_data)
 
 
@@ -72,8 +78,7 @@ class ImportJob(TestCase):
     def test_shelf(self):
         ''' converts to the local shelf typology '''
         expected = 'reading'
-        item = models.ImportItem.objects.get(index=1)
+        self.assertEqual(self.item_1.shelf, expected)
-        self.assertEqual(item.shelf, expected)
 
 
     def test_date_added(self):
@@ -91,21 +96,75 @@ class ImportJob(TestCase):
 
 
     def test_currently_reading_reads(self):
+        ''' infer currently reading dates where available '''
         expected = [models.ReadThrough(
-            start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))]
+            start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
+        )]
         actual = models.ImportItem.objects.get(index=1)
         self.assertEqual(actual.reads[0].start_date, expected[0].start_date)
         self.assertEqual(actual.reads[0].finish_date, expected[0].finish_date)
 
     def test_read_reads(self):
-        actual = models.ImportItem.objects.get(index=2)
+        ''' infer read dates where available '''
-        self.assertEqual(actual.reads[0].start_date, datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))
+        actual = self.item_2
-        self.assertEqual(actual.reads[0].finish_date, datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc))
+        self.assertEqual(
+            actual.reads[0].start_date,
+            datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))
+        self.assertEqual(
+            actual.reads[0].finish_date,
+            datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc))
 
     def test_unread_reads(self):
+        ''' handle books with no read dates '''
         expected = []
         actual = models.ImportItem.objects.get(index=3)
         self.assertEqual(actual.reads, expected)
 
 
+    @responses.activate
+    def test_get_book_from_isbn(self):
+        ''' search and load books by isbn (9780356506999) '''
+        connector_info = models.Connector.objects.create(
+            identifier='openlibrary.org',
+            name='OpenLibrary',
+            connector_file='openlibrary',
+            base_url='https://openlibrary.org',
+            books_url='https://openlibrary.org',
+            covers_url='https://covers.openlibrary.org',
+            search_url='https://openlibrary.org/search?q=',
+            priority=3,
+        )
+        connector = books_manager.load_connector(connector_info)
+        result = SearchResult(
+            title='Test Result',
+            key='https://openlibrary.org/works/OL1234W',
+            author='An Author',
+            year='1980',
+            connector=connector,
+        )
 
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ol_edition.json')
+        bookdata = json.loads(datafile.read_bytes())
+        responses.add(
+            responses.GET,
+            'https://openlibrary.org/works/OL1234W',
+            json=bookdata,
+            status=200)
+        responses.add(
+            responses.GET,
+            'https://openlibrary.org//works/OL15832982W',
+            json=bookdata,
+            status=200)
+        responses.add(
+            responses.GET,
+            'https://openlibrary.org//authors/OL382982A.json',
+            json={'name': 'test author'},
+            status=200)
+
+        with patch('bookwyrm.books_manager.first_search_result') as search:
+            search.return_value = result
+            book = self.item_1.get_book_from_isbn()
+
+        self.assertEqual(book.title, 'Sabriel')