Fixes loading remote books

- saves remote_id correctly
- loads remote books for incoming statuses

bookwyrm/connectors/abstract_connector.py

@@ -122,11 +122,11 @@ class AbstractConnector(ABC):
         # atomic so that we don't save a work with no edition for vice versa
         with transaction.atomic():
             if not work:
-                work_key = work_data.get('url')
+                work_key = self.get_remote_id_from_data(work_data)
                 work = self.create_book(work_key, work_data, models.Work)
 
             if not edition:
-                ed_key = edition_data.get('url')
+                ed_key = self.get_remote_id_from_data(edition_data)
                 edition = self.create_book(ed_key, edition_data, models.Edition)
                 edition.default = True
                 edition.parent_work = work
@@ -146,11 +146,13 @@ class AbstractConnector(ABC):
 
     def create_book(self, remote_id, data, model):
         ''' create a work or edition from data '''
+        print(remote_id)
         book = model.objects.create(
             remote_id=remote_id,
             title=data['title'],
             connector=self.connector,
         )
+        print(book.remote_id)
         return self.update_book_from_data(book, data)
 
 
@@ -161,7 +163,8 @@ class AbstractConnector(ABC):
         author_text = []
         for author in self.get_authors_from_data(data):
             book.authors.add(author)
-            author_text.append(author.display_name)
+            if author.display_name:
+                author_text.append(author.display_name)
         book.author_text = ', '.join(author_text)
         book.save()
 
@@ -215,6 +218,11 @@ class AbstractConnector(ABC):
         return None
 
 
+    @abstractmethod
+    def get_remote_id_from_data(self, data):
+        ''' otherwise we won't properly set the remote_id in the db '''
+
+
     @abstractmethod
     def is_work_data(self, data):
         ''' differentiate works and editions '''

bookwyrm/connectors/bookwyrm_connector.py

@@ -47,8 +47,12 @@ class Connector(AbstractConnector):
         ]
 
 
+    def get_remote_id_from_data(self, data):
+        return data.get('id')
+
+
     def is_work_data(self, data):
-        return data['book_type'] == 'Work'
+        return data['type'] == 'Work'
 
 
     def get_edition_from_work_data(self, data):

bookwyrm/connectors/openlibrary.py

@@ -73,6 +73,14 @@ class Connector(AbstractConnector):
 
 
 
+    def get_remote_id_from_data(self, data):
+        try:
+            key = data['key']
+        except KeyError:
+            raise ConnectorException('Invalid book data')
+        return '%s/%s' % (self.books_url, key)
+
+
     def is_work_data(self, data):
         return bool(re.match(r'^[\/\w]+OL\d+W$', data['key']))
 

bookwyrm/connectors/self_connector.py

@@ -51,6 +51,9 @@ class Connector(AbstractConnector):
         )
 
 
+    def get_remote_id_from_data(self, data):
+        pass
+
     def is_work_data(self, data):
         pass