From f30d05acfc7ada811a5a9421de4245c5266c7144 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 10:40:13 -0700 Subject: [PATCH 01/37] Update connector model to add new connector --- bookwyrm/connectors/settings.py | 2 +- .../migrations/0062_auto_20210406_1731.py | 22 +++++++++++++++++++ bookwyrm/models/connector.py | 10 --------- 3 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 bookwyrm/migrations/0062_auto_20210406_1731.py diff --git a/bookwyrm/connectors/settings.py b/bookwyrm/connectors/settings.py index f1674cf7..4cc98da7 100644 --- a/bookwyrm/connectors/settings.py +++ b/bookwyrm/connectors/settings.py @@ -1,3 +1,3 @@ """ settings book data connectors """ -CONNECTORS = ["openlibrary", "self_connector", "bookwyrm_connector"] +CONNECTORS = ["openlibrary", "inventaire", "self_connector", "bookwyrm_connector"] diff --git a/bookwyrm/migrations/0062_auto_20210406_1731.py b/bookwyrm/migrations/0062_auto_20210406_1731.py new file mode 100644 index 00000000..9ff26af3 --- /dev/null +++ b/bookwyrm/migrations/0062_auto_20210406_1731.py @@ -0,0 +1,22 @@ +# Generated by Django 3.1.6 on 2021-04-06 17:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0061_auto_20210402_1435'), + ] + + operations = [ + migrations.RemoveConstraint( + model_name='connector', + name='connector_file_valid', + ), + migrations.AlterField( + model_name='connector', + name='connector_file', + field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('inventaire', 'Inventaire'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255), + ), + ] diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py index 11bdbee2..9f9af8ae 100644 --- a/bookwyrm/models/connector.py +++ b/bookwyrm/models/connector.py @@ -31,16 +31,6 @@ class Connector(BookWyrmModel): # when to reset the query count back to 0 (ie, after 1 day) query_count_expiry = models.DateTimeField(auto_now_add=True, blank=True) - class Meta: - """ check that there's code to actually use this connector """ - - constraints = [ - models.CheckConstraint( - check=models.Q(connector_file__in=ConnectorFiles), - name="connector_file_valid", - ) - ] - def __str__(self): return "{} ({})".format( self.identifier, From 295842badd51676aaeb177fea97b6efd0c59680a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 10:40:39 -0700 Subject: [PATCH 02/37] Adds inventaire id to book data model --- bookwyrm/activitypub/book.py | 14 ++++++++------ bookwyrm/models/book.py | 3 +++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 7e552b0a..8ff1df82 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -24,9 +24,10 @@ class Book(ActivityObject): firstPublishedDate: str = "" publishedDate: str = "" - openlibraryKey: str = "" - librarythingKey: str = "" - goodreadsKey: str = "" + openlibraryKey: str = None + inventiareId: str = None + librarythingKey: str = None + goodreadsKey: str = None cover: Image = None type: str = "Book" @@ -68,8 +69,9 @@ class Author(ActivityObject): died: str = None aliases: List[str] = field(default_factory=lambda: []) bio: str = "" - openlibraryKey: str = "" - librarythingKey: str = "" - goodreadsKey: str = "" + openlibraryKey: str = None + inventiareId: str = None + librarythingKey: str = None + goodreadsKey: str = None wikipediaLink: str = "" type: str = "Author" diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 3204c603..ccbec9eb 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -19,6 +19,9 @@ class BookDataModel(ObjectMixin, BookWyrmModel): openlibrary_key = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) + inventaire_id = fields.CharField( + max_length=255, blank=True, null=True, deduplication_field=True + ) librarything_key = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) From d482c66ad4dff9152d52d257242e6d7fea178c52 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 11:58:07 -0700 Subject: [PATCH 03/37] Adds inventaire connector stub And changes formatters to accept the key as well as value --- bookwyrm/connectors/abstract_connector.py | 2 +- bookwyrm/connectors/inventaire.py | 84 +++++++++++++++++++++++ bookwyrm/connectors/openlibrary.py | 14 ++-- 3 files changed, 92 insertions(+), 8 deletions(-) create mode 100644 bookwyrm/connectors/inventaire.py diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 00b5c5c9..bbbedd70 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -296,6 +296,6 @@ class Mapping: if not value: return None try: - return self.formatter(value) + return self.formatter(value, self.remote_field) except: # pylint: disable=bare-except return None diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py new file mode 100644 index 00000000..714508ab --- /dev/null +++ b/bookwyrm/connectors/inventaire.py @@ -0,0 +1,84 @@ +""" inventaire data connector """ +from bookwyrm import models +from .abstract_connector import AbstractConnector, SearchResult, Mapping +from .abstract_connector import get_data +from .connector_manager import ConnectorException + + +class Connector(AbstractConnector): + """ instantiate a connector for OL """ + + def __init__(self, identifier): + super().__init__(identifier) + + self.book_mappings = [ + Mapping("title", remote_field="wdt:P1476", formatter=get_claim), + Mapping("id", remote_field="id"), + Mapping("cover", remote_field="image", formatter=self.get_cover_url), + Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim), + Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim), + Mapping("languages", remote_field="wdt:P407", formatter=get_language), + Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key), + Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim), + Mapping("pages", remote_field="wdt:P1104", formatter=get_claim), + Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim), + ] + + def parse_search_data(self, data): + return data.get('results') + + def format_search_result(self, search_result): + images = search_result.get("image") + cover = "{:s}/img/entities/{:s}".format( + self.covers_url, images[0] + ) if images else None + return SearchResult( + title=search_result.get("label"), + key="{:s}{:s}".format(self.books_url, search_result.get("uri")), + cover=cover, + connector=self, + ) + + def parse_isbn_search_data(self, data): + """ boop doop """ + + def format_isbn_search_result(self, search_result): + """ beep bloop """ + + def is_work_data(self, data): + return True + + def get_edition_from_work_data(self, data): + return {} + + def get_work_from_edition_data(self, data): + # P629 + return {} + + def get_authors_from_data(self, data): + return [] + + def expand_book_data(self, book): + return + + def get_cover_url(self, cover_blob, *_): + """ format the relative cover url into an absolute one: + {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"} + """ + cover_id = cover_blob[0].get("url") + if not cover_id: + return None + return "%s%s" % (self.covers_url, cover_id) + + +def get_claim(data, claim_key): + """ all the metadata is in a "claims" dict with a buncha wikidata keys """ + return data.get('claims', {}).get(claim_key) + +def get_language(wikidata_key, *_): + """ who here speaks "wd:Q150" """ + return wikidata_key # TODO + +def resolve_key(wikidata_key, *_): + """ cool, it's "wd:Q3156592" now what the heck does that mean """ + return wikidata_key # TODO diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 9be0266c..34357726 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -14,8 +14,8 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) - get_first = lambda a: a[0] - get_remote_id = lambda a: self.base_url + a + get_first = lambda a, *args: a[0] + get_remote_id = lambda a, *args: self.base_url + a self.book_mappings = [ Mapping("title"), Mapping("id", remote_field="key", formatter=get_remote_id), @@ -95,7 +95,7 @@ class Connector(AbstractConnector): url = "%s%s" % (self.base_url, author_id) yield self.get_or_create_author(url) - def get_cover_url(self, cover_blob, size="L"): + def get_cover_url(self, cover_blob, *_, size="L"): """ ask openlibrary for the cover """ if not cover_blob: return None @@ -181,19 +181,19 @@ def ignore_edition(edition_data): return True -def get_description(description_blob): +def get_description(description_blob, *_): """ descriptions can be a string or a dict """ if isinstance(description_blob, dict): return description_blob.get("value") return description_blob -def get_openlibrary_key(key): +def get_openlibrary_key(key, *_): """ convert /books/OL27320736M into OL27320736M """ return key.split("/")[-1] -def get_languages(language_blob): +def get_languages(language_blob, *_): """ /language/eng -> English """ langs = [] for lang in language_blob: @@ -201,7 +201,7 @@ def get_languages(language_blob): return langs -def pick_default_edition(options): +def pick_default_edition(options, *_): """ favor physical copies with covers in english """ if not options: return None From fba44206ac129addcf9f0b0077c0e65b835b79a2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 12:17:58 -0700 Subject: [PATCH 04/37] Adds separate view and load links for book search results --- bookwyrm/activitypub/book.py | 4 ++-- bookwyrm/connectors/abstract_connector.py | 3 ++- bookwyrm/connectors/inventaire.py | 5 ++++- bookwyrm/templates/snippets/search_result_text.html | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 8ff1df82..7a427927 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -25,7 +25,7 @@ class Book(ActivityObject): publishedDate: str = "" openlibraryKey: str = None - inventiareId: str = None + inventaireId: str = None librarythingKey: str = None goodreadsKey: str = None @@ -70,7 +70,7 @@ class Author(ActivityObject): aliases: List[str] = field(default_factory=lambda: []) bio: str = "" openlibraryKey: str = None - inventiareId: str = None + inventaireId: str = None librarythingKey: str = None goodreadsKey: str = None wikipediaLink: str = "" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index bbbedd70..378f23f7 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -263,6 +263,7 @@ class SearchResult: title: str key: str connector: object + view_link: str = None author: str = None year: str = None cover: str = None @@ -284,7 +285,7 @@ class Mapping: """ associate a local database field with a field in an external dataset """ def __init__(self, local_field, remote_field=None, formatter=None): - noop = lambda x: x + noop = lambda x, *_: x self.local_field = local_field self.remote_field = remote_field or local_field diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 714508ab..748259eb 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -11,9 +11,11 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) + get_remote_id = lambda a, *args: self.base_url + a self.book_mappings = [ Mapping("title", remote_field="wdt:P1476", formatter=get_claim), - Mapping("id", remote_field="id"), + Mapping("id", remote_field="key", formatter=get_remote_id), + Mapping("inventaireId", remote_field="id"), Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim), Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim), @@ -35,6 +37,7 @@ class Connector(AbstractConnector): return SearchResult( title=search_result.get("label"), key="{:s}{:s}".format(self.books_url, search_result.get("uri")), + view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), cover=cover, connector=self, ) diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html index 059b8e7e..2f6ba503 100644 --- a/bookwyrm/templates/snippets/search_result_text.html +++ b/bookwyrm/templates/snippets/search_result_text.html @@ -16,7 +16,7 @@

- {{ result.title }} + {{ result.title }} {% if result.author %} {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }}) From 22ebe60c0abb2badaf0d354190eee125d5278514 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 12:29:06 -0700 Subject: [PATCH 05/37] Use custom data extractor for inventaire connector --- bookwyrm/connectors/abstract_connector.py | 16 ++++++++++++---- bookwyrm/connectors/inventaire.py | 9 ++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 378f23f7..8007bb1a 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -44,7 +44,7 @@ class AbstractMinimalConnector(ABC): if min_confidence: params["min_confidence"] = min_confidence - data = get_data( + data = self.get_search_data( "%s%s" % (self.search_url, query), params=params, ) @@ -57,7 +57,7 @@ class AbstractMinimalConnector(ABC): def isbn_search(self, query): """ isbn search """ params = {} - data = get_data( + data = self.get_search_data( "%s%s" % (self.isbn_search_url, query), params=params, ) @@ -117,7 +117,7 @@ class AbstractConnector(AbstractMinimalConnector): return existing # load the json - data = get_data(remote_id) + data = self.get_book_data(remote_id) mapped_data = dict_from_mappings(data, self.book_mappings) if self.is_work_data(data): try: @@ -150,6 +150,14 @@ class AbstractConnector(AbstractMinimalConnector): load_more_data.delay(self.connector.id, work.id) return edition + def get_book_data(self, remote_id): + """ this allows connectors to override the default behavior """ + return get_data(remote_id) + + def get_search_data(self, remote_id): + """ this allows connectors to override the default behavior """ + return get_data(remote_id) + def create_edition_from_data(self, work, edition_data): """ if we already have the work, we're ready """ mapped_data = dict_from_mappings(edition_data, self.book_mappings) @@ -176,7 +184,7 @@ class AbstractConnector(AbstractMinimalConnector): if existing: return existing - data = get_data(remote_id) + data = self.get_book_data(remote_id) mapped_data = dict_from_mappings(data, self.author_mappings) activity = activitypub.Author(**mapped_data) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 748259eb..72ed8221 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,8 +1,6 @@ """ inventaire data connector """ -from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult, Mapping from .abstract_connector import get_data -from .connector_manager import ConnectorException class Connector(AbstractConnector): @@ -26,6 +24,11 @@ class Connector(AbstractConnector): Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim), ] + def get_book_data(self, remote_id): + data = get_data(remote_id) + extracted = list(data.get("entities").values()) + return extracted[0] if extracted else {} + def parse_search_data(self, data): return data.get('results') @@ -49,7 +52,7 @@ class Connector(AbstractConnector): """ beep bloop """ def is_work_data(self, data): - return True + return data.get("type") == "work" def get_edition_from_work_data(self, data): return {} From 5149c7e8c2da5766ba16c1b033e39d3da3844a3d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 13:03:22 -0700 Subject: [PATCH 06/37] Expands mappings for inventaire/wikidata properties --- bookwyrm/connectors/inventaire.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 72ed8221..b3c49772 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -9,11 +9,14 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) - get_remote_id = lambda a, *args: self.base_url + a + get_remote_id = lambda a, *args: self.books_url + a + get_remote_id_list = lambda a, *_: [get_remote_id(v) for v in a] self.book_mappings = [ Mapping("title", remote_field="wdt:P1476", formatter=get_claim), - Mapping("id", remote_field="key", formatter=get_remote_id), - Mapping("inventaireId", remote_field="id"), + Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim), + Mapping("id", remote_field="uri", formatter=get_remote_id), + Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list), + Mapping("inventaireId", remote_field="uri"), Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim), Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim), @@ -22,7 +25,14 @@ class Connector(AbstractConnector): Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim), Mapping("pages", remote_field="wdt:P1104", formatter=get_claim), Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim), + Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_claim), + Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key), + Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key), + Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_claim), + Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_claim), + Mapping("asin", remote_field="wdt:P5749", formatter=get_claim), ] + # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne def get_book_data(self, remote_id): data = get_data(remote_id) From 3158701075bf1328be9d7c5851afdf0ed1b63edf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 13:39:10 -0700 Subject: [PATCH 07/37] Gets editions for works --- bookwyrm/connectors/inventaire.py | 33 ++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index b3c49772..9987079e 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,6 +1,7 @@ """ inventaire data connector """ from .abstract_connector import AbstractConnector, SearchResult, Mapping from .abstract_connector import get_data +from .connector_manager import ConnectorException class Connector(AbstractConnector): @@ -9,12 +10,11 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) - get_remote_id = lambda a, *args: self.books_url + a - get_remote_id_list = lambda a, *_: [get_remote_id(v) for v in a] + get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a] self.book_mappings = [ Mapping("title", remote_field="wdt:P1476", formatter=get_claim), Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim), - Mapping("id", remote_field="uri", formatter=get_remote_id), + Mapping("id", remote_field="uri", formatter=self.get_remote_id), Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list), Mapping("inventaireId", remote_field="uri"), Mapping("cover", remote_field="image", formatter=self.get_cover_url), @@ -34,6 +34,10 @@ class Connector(AbstractConnector): ] # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne + def get_remote_id(self, value, *_): + """ convert an id/uri into a url """ + return '{:s}?action=by-uris&uris={:s}'.format(self.books_url, value) + def get_book_data(self, remote_id): data = get_data(remote_id) extracted = list(data.get("entities").values()) @@ -49,7 +53,9 @@ class Connector(AbstractConnector): ) if images else None return SearchResult( title=search_result.get("label"), - key="{:s}{:s}".format(self.books_url, search_result.get("uri")), + key="{:s}?action=by-uris&uris={:s}".format( + self.books_url, search_result.get("uri") + ), view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), cover=cover, connector=self, @@ -65,11 +71,24 @@ class Connector(AbstractConnector): return data.get("type") == "work" def get_edition_from_work_data(self, data): - return {} + value = data.get("uri") + url = "{:s}?action=reverse-claims&property=P629&value={:s}".format( + self.books_url, value + ) + data = get_data(url) + try: + uri = data["uris"][0] + except KeyError: + raise ConnectorException("Invalid book data") + return self.get_book_data(self.get_remote_id(uri)) def get_work_from_edition_data(self, data): - # P629 - return {} + try: + uri = data["claims"]["wdt:P629"] + except KeyError: + raise ConnectorException("Invalid book data") + return self.get_book_data(self.get_remote_id(uri)) + def get_authors_from_data(self, data): return [] From e594cd0a3619015091c654ab85de9ba85ab14a07 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 13:53:58 -0700 Subject: [PATCH 08/37] Load simple fields from inventaire --- bookwyrm/connectors/inventaire.py | 64 +++++++++++++++++-------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 9987079e..1ff834bf 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -10,47 +10,59 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) + get_first = lambda a, *args: a[0] get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a] self.book_mappings = [ - Mapping("title", remote_field="wdt:P1476", formatter=get_claim), - Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim), + Mapping("title", remote_field="wdt:P1476", formatter=get_first), + Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first), Mapping("id", remote_field="uri", formatter=self.get_remote_id), - Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list), + # Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list), Mapping("inventaireId", remote_field="uri"), Mapping("cover", remote_field="image", formatter=self.get_cover_url), - Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim), - Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim), - Mapping("languages", remote_field="wdt:P407", formatter=get_language), - Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key), - Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim), - Mapping("pages", remote_field="wdt:P1104", formatter=get_claim), - Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim), - Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_claim), - Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key), - Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key), - Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_claim), - Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_claim), - Mapping("asin", remote_field="wdt:P5749", formatter=get_claim), + Mapping("isbn13", remote_field="wdt:P212", formatter=get_first), + Mapping("isbn10", remote_field="wdt:P957", formatter=get_first), + # Mapping("languages", remote_field="wdt:P407", formatter=get_language), + # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key), + Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first), + Mapping("pages", remote_field="wdt:P1104", formatter=get_first), + Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first), + Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first), + # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key), + # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key), + Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first), + Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), + Mapping("asin", remote_field="wdt:P5749", formatter=get_first), ] # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne def get_remote_id(self, value, *_): """ convert an id/uri into a url """ - return '{:s}?action=by-uris&uris={:s}'.format(self.books_url, value) + return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value) def get_book_data(self, remote_id): data = get_data(remote_id) extracted = list(data.get("entities").values()) - return extracted[0] if extracted else {} + try: + data = extracted[0] + except KeyError: + raise ConnectorException("Invalid book data") + # flatten the data so that images, uri, and claims are on the same level + return { + **data.get("claims"), + "uri": data.get("uri"), + "image": data.get("image"), + } def parse_search_data(self, data): - return data.get('results') + return data.get("results") def format_search_result(self, search_result): images = search_result.get("image") - cover = "{:s}/img/entities/{:s}".format( - self.covers_url, images[0] - ) if images else None + cover = ( + "{:s}/img/entities/{:s}".format(self.covers_url, images[0]) + if images + else None + ) return SearchResult( title=search_result.get("label"), key="{:s}?action=by-uris&uris={:s}".format( @@ -89,7 +101,6 @@ class Connector(AbstractConnector): raise ConnectorException("Invalid book data") return self.get_book_data(self.get_remote_id(uri)) - def get_authors_from_data(self, data): return [] @@ -97,7 +108,7 @@ class Connector(AbstractConnector): return def get_cover_url(self, cover_blob, *_): - """ format the relative cover url into an absolute one: + """format the relative cover url into an absolute one: {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"} """ cover_id = cover_blob[0].get("url") @@ -106,14 +117,11 @@ class Connector(AbstractConnector): return "%s%s" % (self.covers_url, cover_id) -def get_claim(data, claim_key): - """ all the metadata is in a "claims" dict with a buncha wikidata keys """ - return data.get('claims', {}).get(claim_key) - def get_language(wikidata_key, *_): """ who here speaks "wd:Q150" """ return wikidata_key # TODO + def resolve_key(wikidata_key, *_): """ cool, it's "wd:Q3156592" now what the heck does that mean """ return wikidata_key # TODO From bfdcf611e7966ea54d051a313115c40cf35eb40b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 13:54:20 -0700 Subject: [PATCH 09/37] Adds inventaire identifier to book data fields --- .../migrations/0062_auto_20210406_1731.py | 20 +++++++++---- .../migrations/0063_auto_20210406_1738.py | 28 +++++++++++++++++++ 2 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/migrations/0063_auto_20210406_1738.py diff --git a/bookwyrm/migrations/0062_auto_20210406_1731.py b/bookwyrm/migrations/0062_auto_20210406_1731.py index 9ff26af3..5db176ec 100644 --- a/bookwyrm/migrations/0062_auto_20210406_1731.py +++ b/bookwyrm/migrations/0062_auto_20210406_1731.py @@ -6,17 +6,25 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0061_auto_20210402_1435'), + ("bookwyrm", "0061_auto_20210402_1435"), ] operations = [ migrations.RemoveConstraint( - model_name='connector', - name='connector_file_valid', + model_name="connector", + name="connector_file_valid", ), migrations.AlterField( - model_name='connector', - name='connector_file', - field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('inventaire', 'Inventaire'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255), + model_name="connector", + name="connector_file", + field=models.CharField( + choices=[ + ("openlibrary", "Openlibrary"), + ("inventaire", "Inventaire"), + ("self_connector", "Self Connector"), + ("bookwyrm_connector", "Bookwyrm Connector"), + ], + max_length=255, + ), ), ] diff --git a/bookwyrm/migrations/0063_auto_20210406_1738.py b/bookwyrm/migrations/0063_auto_20210406_1738.py new file mode 100644 index 00000000..c9f07b3c --- /dev/null +++ b/bookwyrm/migrations/0063_auto_20210406_1738.py @@ -0,0 +1,28 @@ +# Generated by Django 3.1.6 on 2021-04-06 17:38 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0062_auto_20210406_1731"), + ] + + operations = [ + migrations.AddField( + model_name="author", + name="inventaire_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + migrations.AddField( + model_name="book", + name="inventaire_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ] From 82c2f2eeb1b0d8a9fa1133c2bd1c626214dfa1d0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 17:46:06 -0700 Subject: [PATCH 10/37] Adds more author identifier fields --- bookwyrm/connectors/abstract_connector.py | 8 +-- bookwyrm/connectors/inventaire.py | 47 ++++++++++++------ bookwyrm/connectors/openlibrary.py | 10 ++-- .../migrations/0063_auto_20210406_1738.py | 28 ----------- .../migrations/0063_auto_20210407_0045.py | 49 +++++++++++++++++++ bookwyrm/models/author.py | 9 ++++ bookwyrm/models/book.py | 3 ++ 7 files changed, 103 insertions(+), 51 deletions(-) delete mode 100644 bookwyrm/migrations/0063_auto_20210406_1738.py create mode 100644 bookwyrm/migrations/0063_auto_20210407_0045.py diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 8007bb1a..f66cca7f 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -150,11 +150,11 @@ class AbstractConnector(AbstractMinimalConnector): load_more_data.delay(self.connector.id, work.id) return edition - def get_book_data(self, remote_id): + def get_book_data(self, remote_id): # pylint: disable=no-self-use """ this allows connectors to override the default behavior """ return get_data(remote_id) - def get_search_data(self, remote_id): + def get_search_data(self, remote_id): # pylint: disable=no-self-use """ this allows connectors to override the default behavior """ return get_data(remote_id) @@ -293,7 +293,7 @@ class Mapping: """ associate a local database field with a field in an external dataset """ def __init__(self, local_field, remote_field=None, formatter=None): - noop = lambda x, *_: x + noop = lambda x: x self.local_field = local_field self.remote_field = remote_field or local_field @@ -305,6 +305,6 @@ class Mapping: if not value: return None try: - return self.formatter(value, self.remote_field) + return self.formatter(value) except: # pylint: disable=bare-except return None diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 1ff834bf..6eff6508 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -10,32 +10,45 @@ class Connector(AbstractConnector): def __init__(self, identifier): super().__init__(identifier) - get_first = lambda a, *args: a[0] - get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a] + get_first = lambda a: a[0] + shared_mappings = [ + Mapping("id", remote_field="uri", formatter=self.get_remote_id), + Mapping("bnfId", remote_field="wdt:P268", formatter=get_first), + Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), + Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first), + ] self.book_mappings = [ Mapping("title", remote_field="wdt:P1476", formatter=get_first), Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first), - Mapping("id", remote_field="uri", formatter=self.get_remote_id), - # Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list), Mapping("inventaireId", remote_field="uri"), Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_first), Mapping("isbn10", remote_field="wdt:P957", formatter=get_first), + Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first), + Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first), # Mapping("languages", remote_field="wdt:P407", formatter=get_language), # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key), Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first), Mapping("pages", remote_field="wdt:P1104", formatter=get_first), - Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first), - Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first), # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key), # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key), - Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first), - Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), Mapping("asin", remote_field="wdt:P5749", formatter=get_first), - ] - # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne + ] + shared_mappings + # TODO: P136: genre, P674 characters, P950 bne - def get_remote_id(self, value, *_): + self.author_mappings = [ + Mapping("id", remote_field="uri", formatter=self.get_remote_id), + Mapping("name", remote_field="label", formatter=get_language_code), + Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first), + Mapping("isni", remote_field="wdt:P213", formatter=get_first), + Mapping("viafId", remote_field="wdt:P214", formatter=get_first), + Mapping("gutenberg_id", remote_field="wdt:P1938", formatter=get_first), + Mapping("born", remote_field="wdt:P569", formatter=get_first), + Mapping("died", remote_field="wdt:P570", formatter=get_first), + ] + shared_mappings + + + def get_remote_id(self, value): """ convert an id/uri into a url """ return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value) @@ -102,7 +115,9 @@ class Connector(AbstractConnector): return self.get_book_data(self.get_remote_id(uri)) def get_authors_from_data(self, data): - return [] + authors = data.get("wdt:P50") + for author in authors: + yield self.get_or_create_author(self.get_remote_id(author)) def expand_book_data(self, book): return @@ -117,11 +132,15 @@ class Connector(AbstractConnector): return "%s%s" % (self.covers_url, cover_id) -def get_language(wikidata_key, *_): +def get_language(wikidata_key): """ who here speaks "wd:Q150" """ return wikidata_key # TODO -def resolve_key(wikidata_key, *_): +def resolve_key(wikidata_key): """ cool, it's "wd:Q3156592" now what the heck does that mean """ return wikidata_key # TODO + +def get_language_code(options, code="en"): + """ when there are a bunch of translation but we need a single field """ + return options.get(code) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 34357726..466bf1e5 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -95,7 +95,7 @@ class Connector(AbstractConnector): url = "%s%s" % (self.base_url, author_id) yield self.get_or_create_author(url) - def get_cover_url(self, cover_blob, *_, size="L"): + def get_cover_url(self, cover_blob, size="L"): """ ask openlibrary for the cover """ if not cover_blob: return None @@ -181,19 +181,19 @@ def ignore_edition(edition_data): return True -def get_description(description_blob, *_): +def get_description(description_blob): """ descriptions can be a string or a dict """ if isinstance(description_blob, dict): return description_blob.get("value") return description_blob -def get_openlibrary_key(key, *_): +def get_openlibrary_key(key): """ convert /books/OL27320736M into OL27320736M """ return key.split("/")[-1] -def get_languages(language_blob, *_): +def get_languages(language_blob): """ /language/eng -> English """ langs = [] for lang in language_blob: @@ -201,7 +201,7 @@ def get_languages(language_blob, *_): return langs -def pick_default_edition(options, *_): +def pick_default_edition(options): """ favor physical copies with covers in english """ if not options: return None diff --git a/bookwyrm/migrations/0063_auto_20210406_1738.py b/bookwyrm/migrations/0063_auto_20210406_1738.py deleted file mode 100644 index c9f07b3c..00000000 --- a/bookwyrm/migrations/0063_auto_20210406_1738.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.1.6 on 2021-04-06 17:38 - -import bookwyrm.models.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0062_auto_20210406_1731"), - ] - - operations = [ - migrations.AddField( - model_name="author", - name="inventaire_id", - field=bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - migrations.AddField( - model_name="book", - name="inventaire_id", - field=bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ] diff --git a/bookwyrm/migrations/0063_auto_20210407_0045.py b/bookwyrm/migrations/0063_auto_20210407_0045.py new file mode 100644 index 00000000..2543193b --- /dev/null +++ b/bookwyrm/migrations/0063_auto_20210407_0045.py @@ -0,0 +1,49 @@ +# Generated by Django 3.1.6 on 2021-04-07 00:45 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0062_auto_20210406_1731'), + ] + + operations = [ + migrations.AddField( + model_name='author', + name='bnf_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='gutenberg_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='inventaire_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='isni', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='author', + name='viaf_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='bnf_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='book', + name='inventaire_id', + field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 4c5fe6c8..f7740b1d 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -14,6 +14,15 @@ class Author(BookDataModel): wikipedia_link = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) + isni = fields.CharField( + max_length=255, blank=True, null=True, deduplication_field=True + ) + viaf_id = fields.CharField( + max_length=255, blank=True, null=True, deduplication_field=True + ) + gutenberg_id = fields.CharField( + max_length=255, blank=True, null=True, deduplication_field=True + ) # idk probably other keys would be useful here? born = fields.DateTimeField(blank=True, null=True) died = fields.DateTimeField(blank=True, null=True) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index ccbec9eb..94bbe330 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -28,6 +28,9 @@ class BookDataModel(ObjectMixin, BookWyrmModel): goodreads_key = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) + bnf_id = fields.CharField( # Bibliothèque nationale de France + max_length=255, blank=True, null=True, deduplication_field=True + ) last_edited_by = models.ForeignKey("User", on_delete=models.PROTECT, null=True) From 4112862924abedb0362649b4592405b99837371c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:00:54 -0700 Subject: [PATCH 11/37] Fixes search data and new activitypub fields --- bookwyrm/activitypub/book.py | 26 +++++++++++++---------- bookwyrm/connectors/abstract_connector.py | 8 +++---- bookwyrm/connectors/inventaire.py | 7 +++--- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 7a427927..17e5b686 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -7,7 +7,17 @@ from .image import Image @dataclass(init=False) -class Book(ActivityObject): +class BookData(ActivityObject): + """ shared fields for all book data and authors""" + openlibraryKey: str = None + inventaireId: str = None + librarythingKey: str = None + goodreadsKey: str = None + bnfId: str = None + + +@dataclass(init=False) +class Book(BookData): """ serializes an edition or work, abstract """ title: str @@ -24,11 +34,6 @@ class Book(ActivityObject): firstPublishedDate: str = "" publishedDate: str = "" - openlibraryKey: str = None - inventaireId: str = None - librarythingKey: str = None - goodreadsKey: str = None - cover: Image = None type: str = "Book" @@ -61,17 +66,16 @@ class Work(Book): @dataclass(init=False) -class Author(ActivityObject): +class Author(BookData): """ author of a book """ name: str + isni: str = None + viafId: str = None + gutenbergId: str = None born: str = None died: str = None aliases: List[str] = field(default_factory=lambda: []) bio: str = "" - openlibraryKey: str = None - inventaireId: str = None - librarythingKey: str = None - goodreadsKey: str = None wikipediaLink: str = "" type: str = "Author" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index f66cca7f..43cd6aad 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -68,6 +68,10 @@ class AbstractMinimalConnector(ABC): results.append(self.format_isbn_search_result(doc)) return results + def get_search_data(self, remote_id, **kwargs): # pylint: disable=no-self-use + """ this allows connectors to override the default behavior """ + return get_data(remote_id, **kwargs) + @abstractmethod def get_or_create_book(self, remote_id): """ pull up a book record by whatever means possible """ @@ -154,10 +158,6 @@ class AbstractConnector(AbstractMinimalConnector): """ this allows connectors to override the default behavior """ return get_data(remote_id) - def get_search_data(self, remote_id): # pylint: disable=no-self-use - """ this allows connectors to override the default behavior """ - return get_data(remote_id) - def create_edition_from_data(self, work, edition_data): """ if we already have the work, we're ready """ mapped_data = dict_from_mappings(edition_data, self.book_mappings) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 6eff6508..a16bb0fd 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -14,7 +14,6 @@ class Connector(AbstractConnector): shared_mappings = [ Mapping("id", remote_field="uri", formatter=self.get_remote_id), Mapping("bnfId", remote_field="wdt:P268", formatter=get_first), - Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first), ] self.book_mappings = [ @@ -24,6 +23,7 @@ class Connector(AbstractConnector): Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_first), Mapping("isbn10", remote_field="wdt:P957", formatter=get_first), + Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first), Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first), # Mapping("languages", remote_field="wdt:P407", formatter=get_language), @@ -38,7 +38,7 @@ class Connector(AbstractConnector): self.author_mappings = [ Mapping("id", remote_field="uri", formatter=self.get_remote_id), - Mapping("name", remote_field="label", formatter=get_language_code), + Mapping("name", remote_field="labels", formatter=get_language_code), Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first), Mapping("isni", remote_field="wdt:P213", formatter=get_first), Mapping("viafId", remote_field="wdt:P214", formatter=get_first), @@ -62,8 +62,7 @@ class Connector(AbstractConnector): # flatten the data so that images, uri, and claims are on the same level return { **data.get("claims"), - "uri": data.get("uri"), - "image": data.get("image"), + **{k: data.get(k) for k in ["uri", "image", "labels"]}, } def parse_search_data(self, data): From f21aca1211a10b9efc66469c4bb8bad023bf7da0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:10:42 -0700 Subject: [PATCH 12/37] Load remote keys --- bookwyrm/connectors/inventaire.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index a16bb0fd..4be0dd5c 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -26,12 +26,14 @@ class Connector(AbstractConnector): Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first), Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first), Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first), - # Mapping("languages", remote_field="wdt:P407", formatter=get_language), - # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key), + Mapping("languages", remote_field="wdt:P407", formatter=self.resolve_keys), + Mapping("publishers", remote_field="wdt:P123", formatter=self.resolve_keys), Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first), Mapping("pages", remote_field="wdt:P1104", formatter=get_first), - # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key), - # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key), + Mapping( + "subjectPlaces", remote_field="wdt:P840", formatter=self.resolve_keys + ), + Mapping("subjects", remote_field="wdt:P921", formatter=self.resolve_keys), Mapping("asin", remote_field="wdt:P5749", formatter=get_first), ] + shared_mappings # TODO: P136: genre, P674 characters, P950 bne @@ -130,15 +132,17 @@ class Connector(AbstractConnector): return None return "%s%s" % (self.covers_url, cover_id) + def resolve_keys(self, keys): + """ cool, it's "wd:Q3156592" now what the heck does that mean """ + results = [] + for uri in keys: + try: + data = self.get_book_data(self.get_remote_id(uri)) + except ConnectorException: + continue + results.append(get_language_code(data.get("labels"))) + return results -def get_language(wikidata_key): - """ who here speaks "wd:Q150" """ - return wikidata_key # TODO - - -def resolve_key(wikidata_key): - """ cool, it's "wd:Q3156592" now what the heck does that mean """ - return wikidata_key # TODO def get_language_code(options, code="en"): """ when there are a bunch of translation but we need a single field """ From ac27111f0555fbd96ec95503d5434b05be53ee32 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:13:33 -0700 Subject: [PATCH 13/37] Adds inventaire to default connector list --- bookwyrm/management/commands/initdb.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py index d6101c87..45c81089 100644 --- a/bookwyrm/management/commands/initdb.py +++ b/bookwyrm/management/commands/initdb.py @@ -94,6 +94,18 @@ def init_connectors(): priority=2, ) + Connector.objects.create( + identifier="inventaire.io", + name="Inventaire", + connector_file="inventaire", + base_url="https://inventaire.io/entity/", + books_url="https://inventaire.io/api/entities", + covers_url="https://inventaire.io", + search_url="https://inventaire.io/api/search?types=works&types=works&search=", + isbn_search_url="https://inventaire.io/api/entities?action=by-uris&uris=isbn%3A", + priority=3, + ) + Connector.objects.create( identifier="openlibrary.org", name="OpenLibrary", From fec3d63e4623f7a47526d1648cd0232f1ef6c531 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:17:33 -0700 Subject: [PATCH 14/37] Python formatting --- bookwyrm/activitypub/book.py | 1 + bookwyrm/connectors/inventaire.py | 1 - .../migrations/0063_auto_20210407_0045.py | 58 ++++++++++++------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 17e5b686..ca4d69da 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -9,6 +9,7 @@ from .image import Image @dataclass(init=False) class BookData(ActivityObject): """ shared fields for all book data and authors""" + openlibraryKey: str = None inventaireId: str = None librarythingKey: str = None diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 4be0dd5c..2a4569b3 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -49,7 +49,6 @@ class Connector(AbstractConnector): Mapping("died", remote_field="wdt:P570", formatter=get_first), ] + shared_mappings - def get_remote_id(self, value): """ convert an id/uri into a url """ return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value) diff --git a/bookwyrm/migrations/0063_auto_20210407_0045.py b/bookwyrm/migrations/0063_auto_20210407_0045.py index 2543193b..cd87dd97 100644 --- a/bookwyrm/migrations/0063_auto_20210407_0045.py +++ b/bookwyrm/migrations/0063_auto_20210407_0045.py @@ -7,43 +7,57 @@ from django.db import migrations class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0062_auto_20210406_1731'), + ("bookwyrm", "0062_auto_20210406_1731"), ] operations = [ migrations.AddField( - model_name='author', - name='bnf_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="author", + name="bnf_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='author', - name='gutenberg_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="author", + name="gutenberg_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='author', - name='inventaire_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="author", + name="inventaire_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='author', - name='isni', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="author", + name="isni", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='author', - name='viaf_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="author", + name="viaf_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='book', - name='bnf_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="book", + name="bnf_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), migrations.AddField( - model_name='book', - name='inventaire_id', - field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True), + model_name="book", + name="inventaire_id", + field=bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), ), ] From 29e7659b76ec094f9bb3ff8659e97cdf01346080 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:34:55 -0700 Subject: [PATCH 15/37] Expand inventaire book data --- bookwyrm/connectors/inventaire.py | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 2a4569b3..465268b2 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,4 +1,5 @@ """ inventaire data connector """ +from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult, Mapping from .abstract_connector import get_data from .connector_manager import ConnectorException @@ -95,12 +96,15 @@ class Connector(AbstractConnector): def is_work_data(self, data): return data.get("type") == "work" - def get_edition_from_work_data(self, data): - value = data.get("uri") + def load_edition_data(self, work_uri): + """ get a list of editions for a work """ url = "{:s}?action=reverse-claims&property=P629&value={:s}".format( - self.books_url, value + self.books_url, work_uri ) - data = get_data(url) + return get_data(url) + + def get_edition_from_work_data(self, data): + data = self.load_edition_data(data.get("uri")) try: uri = data["uris"][0] except KeyError: @@ -120,7 +124,20 @@ class Connector(AbstractConnector): yield self.get_or_create_author(self.get_remote_id(author)) def expand_book_data(self, book): - return + work = book + # go from the edition to the work, if necessary + if isinstance(book, models.Edition): + work = book.parent_work + + try: + edition_options = self.load_edition_data(work.inventaire_id) + except ConnectorException: + # who knows, man + return + + for edition_uri in edition_options.get("uris"): + remote_id = self.get_remote_id(edition_uri) + self.get_or_create_book(remote_id) def get_cover_url(self, cover_blob, *_): """format the relative cover url into an absolute one: From 922428cab760ba324619eb64dd2a89bfe352d15c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 6 Apr 2021 18:51:43 -0700 Subject: [PATCH 16/37] Fixes error in reverse path --- bookwyrm/connectors/inventaire.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 465268b2..594fe810 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -98,7 +98,7 @@ class Connector(AbstractConnector): def load_edition_data(self, work_uri): """ get a list of editions for a work """ - url = "{:s}?action=reverse-claims&property=P629&value={:s}".format( + url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}".format( self.books_url, work_uri ) return get_data(url) @@ -119,7 +119,7 @@ class Connector(AbstractConnector): return self.get_book_data(self.get_remote_id(uri)) def get_authors_from_data(self, data): - authors = data.get("wdt:P50") + authors = data.get("wdt:P50", []) for author in authors: yield self.get_or_create_author(self.get_remote_id(author)) From 85297426e07917c20d5d5d7fed344380af5b6608 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 14:33:16 -0700 Subject: [PATCH 17/37] Adds merge migration --- ...63_auto_20210407_0045_0070_auto_20210423_0121.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py diff --git a/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py b/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py new file mode 100644 index 00000000..b6489b80 --- /dev/null +++ b/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2 on 2021-04-26 21:32 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0063_auto_20210407_0045"), + ("bookwyrm", "0070_auto_20210423_0121"), + ] + + operations = [] From 7b65291a59b6f3b5f7a64360227ce41451aec5b5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Apr 2021 14:43:29 -0700 Subject: [PATCH 18/37] Python formatting for the new Black standard --- bookwyrm/activitypub/book.py | 2 +- bookwyrm/connectors/abstract_connector.py | 4 ++-- bookwyrm/connectors/inventaire.py | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index dfe14b6f..597d7a66 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -8,7 +8,7 @@ from .image import Document @dataclass(init=False) class BookData(ActivityObject): - """ shared fields for all book data and authors""" + """shared fields for all book data and authors""" openlibraryKey: str = None inventaireId: str = None diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 14fe3cb7..fd2b2707 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -69,7 +69,7 @@ class AbstractMinimalConnector(ABC): return results def get_search_data(self, remote_id, **kwargs): # pylint: disable=no-self-use - """ this allows connectors to override the default behavior """ + """this allows connectors to override the default behavior""" return get_data(remote_id, **kwargs) @abstractmethod @@ -155,7 +155,7 @@ class AbstractConnector(AbstractMinimalConnector): return edition def get_book_data(self, remote_id): # pylint: disable=no-self-use - """ this allows connectors to override the default behavior """ + """this allows connectors to override the default behavior""" return get_data(remote_id) def create_edition_from_data(self, work, edition_data): diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 594fe810..ae6fb862 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -6,7 +6,7 @@ from .connector_manager import ConnectorException class Connector(AbstractConnector): - """ instantiate a connector for OL """ + """instantiate a connector for OL""" def __init__(self, identifier): super().__init__(identifier) @@ -51,7 +51,7 @@ class Connector(AbstractConnector): ] + shared_mappings def get_remote_id(self, value): - """ convert an id/uri into a url """ + """convert an id/uri into a url""" return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value) def get_book_data(self, remote_id): @@ -88,16 +88,16 @@ class Connector(AbstractConnector): ) def parse_isbn_search_data(self, data): - """ boop doop """ + """boop doop""" def format_isbn_search_result(self, search_result): - """ beep bloop """ + """beep bloop""" def is_work_data(self, data): return data.get("type") == "work" def load_edition_data(self, work_uri): - """ get a list of editions for a work """ + """get a list of editions for a work""" url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}".format( self.books_url, work_uri ) @@ -149,7 +149,7 @@ class Connector(AbstractConnector): return "%s%s" % (self.covers_url, cover_id) def resolve_keys(self, keys): - """ cool, it's "wd:Q3156592" now what the heck does that mean """ + """cool, it's "wd:Q3156592" now what the heck does that mean""" results = [] for uri in keys: try: @@ -161,5 +161,5 @@ class Connector(AbstractConnector): def get_language_code(options, code="en"): - """ when there are a bunch of translation but we need a single field """ + """when there are a bunch of translation but we need a single field""" return options.get(code) From 3faacffacaaa3fdd474f12c1768544393aa22970 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 13:28:07 -0700 Subject: [PATCH 19/37] Associated expanded editions with correct work --- bookwyrm/connectors/abstract_connector.py | 27 +++++++++++++---------- bookwyrm/connectors/inventaire.py | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index fd2b2707..48c05182 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -73,7 +73,7 @@ class AbstractMinimalConnector(ABC): return get_data(remote_id, **kwargs) @abstractmethod - def get_or_create_book(self, remote_id): + def get_or_create_book(self, remote_id, work=None): """pull up a book record by whatever means possible""" @abstractmethod @@ -109,7 +109,7 @@ class AbstractConnector(AbstractMinimalConnector): return False return True - def get_or_create_book(self, remote_id): + def get_or_create_book(self, remote_id, work=None): """translate arbitrary json into an Activitypub dataclass""" # first, check if we have the origin_id saved existing = models.Edition.find_existing_by_remote_id( @@ -123,6 +123,7 @@ class AbstractConnector(AbstractMinimalConnector): # load the json data = self.get_book_data(remote_id) mapped_data = dict_from_mappings(data, self.book_mappings) + work_data = edition_data = None if self.is_work_data(data): try: edition_data = self.get_edition_from_work_data(data) @@ -132,21 +133,23 @@ class AbstractConnector(AbstractMinimalConnector): edition_data = data work_data = mapped_data else: - try: - work_data = self.get_work_from_edition_data(data) - work_data = dict_from_mappings(work_data, self.book_mappings) - except (KeyError, ConnectorException): - work_data = mapped_data edition_data = data + if not work: + try: + work_data = self.get_work_from_edition_data(data) + work_data = dict_from_mappings(work_data, self.book_mappings) + except (KeyError, ConnectorException): + work_data = mapped_data - if not work_data or not edition_data: + if (not work_data and not work) or not edition_data: raise ConnectorException("Unable to load book data: %s" % remote_id) with transaction.atomic(): - # create activitypub object - work_activity = activitypub.Work(**work_data) - # this will dedupe automatically - work = work_activity.to_model(model=models.Work) + if not work: + # create activitypub object + work_activity = activitypub.Work(**work_data) + # this will dedupe automatically + work = work_activity.to_model(model=models.Work) for author in self.get_authors_from_data(data): work.authors.add(author) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index ae6fb862..c91ac937 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -137,7 +137,7 @@ class Connector(AbstractConnector): for edition_uri in edition_options.get("uris"): remote_id = self.get_remote_id(edition_uri) - self.get_or_create_book(remote_id) + self.get_or_create_book(remote_id, work=work) def get_cover_url(self, cover_blob, *_): """format the relative cover url into an absolute one: From ccf10e801279dbc8946c67337a0269758c06643d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 13:50:47 -0700 Subject: [PATCH 20/37] Fixes cover load logic --- bookwyrm/connectors/inventaire.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index c91ac937..e8416c37 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -143,7 +143,9 @@ class Connector(AbstractConnector): """format the relative cover url into an absolute one: {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"} """ - cover_id = cover_blob[0].get("url") + if isinstance(cover_blob, list) and len(cover_blob) > 0: + cover_blob = cover_blob[0] + cover_id = cover_blob.get("url") if not cover_id: return None return "%s%s" % (self.covers_url, cover_id) From 6551c59c45d74b7920c58198d4a045b7afc0dfd3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 15:19:24 -0700 Subject: [PATCH 21/37] Don't store default edition in the dataase --- bookwyrm/activitypub/book.py | 1 - bookwyrm/connectors/abstract_connector.py | 8 ++--- bookwyrm/connectors/bookwyrm_connector.py | 8 ++--- bookwyrm/connectors/self_connector.py | 29 +++++++++++++++---- .../0072_remove_work_default_edition.py | 17 +++++++++++ bookwyrm/models/book.py | 29 ++++--------------- .../connectors/test_connector_manager.py | 2 -- .../tests/connectors/test_self_connector.py | 6 ++-- bookwyrm/tests/models/test_book_model.py | 6 ---- .../tests/models/test_readthrough_model.py | 4 +-- bookwyrm/tests/views/test_readthrough.py | 2 -- bookwyrm/views/author.py | 2 +- bookwyrm/views/books.py | 2 +- bookwyrm/views/helpers.py | 2 +- 14 files changed, 56 insertions(+), 62 deletions(-) create mode 100644 bookwyrm/migrations/0072_remove_work_default_edition.py diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 597d7a66..1599b408 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -62,7 +62,6 @@ class Work(Book): """work instance of a book object""" lccn: str = "" - defaultEdition: str = "" editions: List[str] = field(default_factory=lambda: []) type: str = "Work" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 48c05182..08a0175a 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -116,8 +116,8 @@ class AbstractConnector(AbstractMinimalConnector): remote_id ) or models.Work.find_existing_by_remote_id(remote_id) if existing: - if hasattr(existing, "get_default_editon"): - return existing.get_default_editon() + if hasattr(existing, "default_edition"): + return existing.default_edition return existing # load the json @@ -170,10 +170,6 @@ class AbstractConnector(AbstractMinimalConnector): edition.connector = self.connector edition.save() - if not work.default_edition: - work.default_edition = edition - work.save() - for author in self.get_authors_from_data(edition_data): edition.authors.add(author) if not edition.authors.exists() and work.authors.exists(): diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py index 640a0bca..6b1d2f8c 100644 --- a/bookwyrm/connectors/bookwyrm_connector.py +++ b/bookwyrm/connectors/bookwyrm_connector.py @@ -6,12 +6,8 @@ from .abstract_connector import AbstractMinimalConnector, SearchResult class Connector(AbstractMinimalConnector): """this is basically just for search""" - def get_or_create_book(self, remote_id): - edition = activitypub.resolve_remote_id(remote_id, model=models.Edition) - work = edition.parent_work - work.default_edition = work.get_default_edition() - work.save() - return edition + def get_or_create_book(self, remote_id, work=None): + return activitypub.resolve_remote_id(remote_id, model=models.Edition) def parse_search_data(self, data): return data diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index 0dc922a5..6b1b349f 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -3,7 +3,7 @@ from functools import reduce import operator from django.contrib.postgres.search import SearchRank, SearchVector -from django.db.models import Count, F, Q +from django.db.models import Count, OuterRef, Subquery, F, Q from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult @@ -47,7 +47,16 @@ class Connector(AbstractConnector): # when there are multiple editions of the same work, pick the default. # it would be odd for this to happen. - results = results.filter(parent_work__default_edition__id=F("id")) or results + + default_editions = models.Edition.objects.filter( + parent_work=OuterRef("parent_work") + ).order_by("-edition_rank") + results = ( + results.annotate( + default_id=Subquery(default_editions.values("id")[:1]) + ).filter(default_id=F("id")) + or results + ) search_results = [] for result in results: @@ -112,7 +121,15 @@ def search_identifiers(query, *filters): # when there are multiple editions of the same work, pick the default. # it would be odd for this to happen. - return results.filter(parent_work__default_edition__id=F("id")) or results + default_editions = models.Edition.objects.filter( + parent_work=OuterRef("parent_work") + ).order_by("-edition_rank") + return ( + results.annotate(default_id=Subquery(default_editions.values("id")[:1])).filter( + default_id=F("id") + ) + or results + ) def search_title_author(query, min_confidence, *filters): @@ -140,10 +157,10 @@ def search_title_author(query, min_confidence, *filters): for work_id in set(editions_of_work): editions = results.filter(parent_work=work_id) - default = editions.filter(parent_work__default_edition=F("id")) - default_rank = default.first().rank if default.exists() else 0 + default = editions.order_by("-edition_rank").first() + default_rank = default.rank if default else 0 # if mutliple books have the top rank, pick the default edition if default_rank == editions.first().rank: - yield default.first() + yield default else: yield editions.first() diff --git a/bookwyrm/migrations/0072_remove_work_default_edition.py b/bookwyrm/migrations/0072_remove_work_default_edition.py new file mode 100644 index 00000000..1c05c95e --- /dev/null +++ b/bookwyrm/migrations/0072_remove_work_default_edition.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2 on 2021-04-28 22:16 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121"), + ] + + operations = [ + migrations.RemoveField( + model_name="work", + name="default_edition", + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 10ebb317..0bbae033 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -1,7 +1,7 @@ """ database schema for books and shelves """ import re -from django.db import models, transaction +from django.db import models from model_utils.managers import InheritanceManager from bookwyrm import activitypub @@ -143,10 +143,6 @@ class Work(OrderedCollectionPageMixin, Book): lccn = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) - # this has to be nullable but should never be null - default_edition = fields.ForeignKey( - "Edition", on_delete=models.PROTECT, null=True, load_remote=False - ) def save(self, *args, **kwargs): """set some fields on the edition object""" @@ -155,18 +151,10 @@ class Work(OrderedCollectionPageMixin, Book): edition.save() return super().save(*args, **kwargs) - def get_default_edition(self): + @property + def default_edition(self): """in case the default edition is not set""" - return self.default_edition or self.editions.order_by("-edition_rank").first() - - @transaction.atomic() - def reset_default_edition(self): - """sets a new default edition based on computed rank""" - self.default_edition = None - # editions are re-ranked implicitly - self.save() - self.default_edition = self.get_default_edition() - self.save() + return self.editions.order_by("-edition_rank").first() def to_edition_list(self, **kwargs): """an ordered collection of editions""" @@ -220,15 +208,8 @@ class Edition(Book): activity_serializer = activitypub.Edition name_field = "title" - def get_rank(self, ignore_default=False): + def get_rank(self): """calculate how complete the data is on this edition""" - if ( - not ignore_default - and self.parent_work - and self.parent_work.default_edition == self - ): - # default edition has the highest rank - return 20 rank = 0 rank += int(bool(self.cover)) * 3 rank += int(bool(self.isbn_13)) diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index feded616..34abbeaf 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -17,8 +17,6 @@ class ConnectorManager(TestCase): self.edition = models.Edition.objects.create( title="Example Edition", parent_work=self.work, isbn_10="0000000000" ) - self.work.default_edition = self.edition - self.work.save() self.connector = models.Connector.objects.create( identifier="test_connector", diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index eee7d00c..db97b65a 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -84,11 +84,11 @@ class SelfConnector(TestCase): title="Edition 1 Title", parent_work=work ) edition_2 = models.Edition.objects.create( - title="Edition 2 Title", parent_work=work + title="Edition 2 Title", + parent_work=work, + edition_rank=20, # that's default babey ) edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) - work.default_edition = edition_2 - work.save() # pick the best edition results = self.connector.search("Edition 1 Title") diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index c80cc4a8..cad00d43 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -84,9 +84,3 @@ class Book(TestCase): self.first_edition.description = "hi" self.first_edition.save() self.assertEqual(self.first_edition.edition_rank, 1) - - # default edition - self.work.default_edition = self.first_edition - self.work.save() - self.first_edition.refresh_from_db() - self.assertEqual(self.first_edition.edition_rank, 20) diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 93e9e654..986b739b 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -2,7 +2,7 @@ from django.test import TestCase from django.core.exceptions import ValidationError -from bookwyrm import models, settings +from bookwyrm import models class ReadThrough(TestCase): @@ -19,8 +19,6 @@ class ReadThrough(TestCase): self.edition = models.Edition.objects.create( title="Example Edition", parent_work=self.work ) - self.work.default_edition = self.edition - self.work.save() self.readthrough = models.ReadThrough.objects.create( user=self.user, book=self.edition diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index c9ebf216..882c7929 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -20,8 +20,6 @@ class ReadThrough(TestCase): self.edition = models.Edition.objects.create( title="Example Edition", parent_work=self.work ) - self.work.default_edition = self.edition - self.work.save() self.user = models.User.objects.create_user( "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 0bd7b0e0..41298161 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -27,7 +27,7 @@ class Author(View): ).distinct() data = { "author": author, - "books": [b.get_default_edition() for b in books], + "books": [b.default_edition for b in books], } return TemplateResponse(request, "author.html", data) diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index 448cf992..ee1a5e06 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -39,7 +39,7 @@ class Book(View): return ActivitypubResponse(book.to_activity()) if isinstance(book, models.Work): - book = book.get_default_edition() + book = book.default_edition if not book or not book.parent_work: return HttpResponseNotFound() diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 8a60b54c..540b578f 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -123,7 +123,7 @@ def get_edition(book_id): """look up a book in the db and return an edition""" book = models.Book.objects.select_subclasses().get(id=book_id) if isinstance(book, models.Work): - book = book.get_default_edition() + book = book.default_edition return book From 8eec3eca5ba6c748c7d98a488cebf30c1d5ae5cf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 16:33:40 -0700 Subject: [PATCH 22/37] Don't spin out infinite load data tasks --- bookwyrm/connectors/abstract_connector.py | 27 ++++++++++------------- bookwyrm/connectors/inventaire.py | 7 +++++- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 08a0175a..76718823 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -73,7 +73,7 @@ class AbstractMinimalConnector(ABC): return get_data(remote_id, **kwargs) @abstractmethod - def get_or_create_book(self, remote_id, work=None): + def get_or_create_book(self, remote_id): """pull up a book record by whatever means possible""" @abstractmethod @@ -109,7 +109,7 @@ class AbstractConnector(AbstractMinimalConnector): return False return True - def get_or_create_book(self, remote_id, work=None): + def get_or_create_book(self, remote_id): """translate arbitrary json into an Activitypub dataclass""" # first, check if we have the origin_id saved existing = models.Edition.find_existing_by_remote_id( @@ -123,7 +123,6 @@ class AbstractConnector(AbstractMinimalConnector): # load the json data = self.get_book_data(remote_id) mapped_data = dict_from_mappings(data, self.book_mappings) - work_data = edition_data = None if self.is_work_data(data): try: edition_data = self.get_edition_from_work_data(data) @@ -134,22 +133,20 @@ class AbstractConnector(AbstractMinimalConnector): work_data = mapped_data else: edition_data = data - if not work: - try: - work_data = self.get_work_from_edition_data(data) - work_data = dict_from_mappings(work_data, self.book_mappings) - except (KeyError, ConnectorException): - work_data = mapped_data + try: + work_data = self.get_work_from_edition_data(data) + work_data = dict_from_mappings(work_data, self.book_mappings) + except (KeyError, ConnectorException): + work_data = mapped_data - if (not work_data and not work) or not edition_data: + if not work_data or not edition_data: raise ConnectorException("Unable to load book data: %s" % remote_id) with transaction.atomic(): - if not work: - # create activitypub object - work_activity = activitypub.Work(**work_data) - # this will dedupe automatically - work = work_activity.to_model(model=models.Work) + # create activitypub object + work_activity = activitypub.Work(**work_data) + # this will dedupe automatically + work = work_activity.to_model(model=models.Work) for author in self.get_authors_from_data(data): work.authors.add(author) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index e8416c37..cd14c253 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -137,7 +137,12 @@ class Connector(AbstractConnector): for edition_uri in edition_options.get("uris"): remote_id = self.get_remote_id(edition_uri) - self.get_or_create_book(remote_id, work=work) + try: + data = self.get_book_data(remote_id) + except ConnectorException: + # who, indeed, knows + continue + self.create_edition_from_data(work, data) def get_cover_url(self, cover_blob, *_): """format the relative cover url into an absolute one: From 95fce963d1ae7555daec75afcaa794dd23784f6e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 17:18:14 -0700 Subject: [PATCH 23/37] Images may already be absolute paths --- bookwyrm/connectors/inventaire.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index cd14c253..ebbe8d51 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,4 +1,6 @@ """ inventaire data connector """ +import re + from bookwyrm import models from .abstract_connector import AbstractConnector, SearchResult, Mapping from .abstract_connector import get_data @@ -148,11 +150,15 @@ class Connector(AbstractConnector): """format the relative cover url into an absolute one: {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"} """ + # covers may or may not be a list if isinstance(cover_blob, list) and len(cover_blob) > 0: cover_blob = cover_blob[0] cover_id = cover_blob.get("url") if not cover_id: return None + # cover may or may not be an absolute url already + if re.match(r"^http", cover_id): + return cover_id return "%s%s" % (self.covers_url, cover_id) def resolve_keys(self, keys): From 5e5392c007ea746b7714aa2ef16e65085376cf87 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 28 Apr 2021 17:20:14 -0700 Subject: [PATCH 24/37] Adds test file --- .../connectors/test_inventaire_connector.py | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 bookwyrm/tests/connectors/test_inventaire_connector.py diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py new file mode 100644 index 00000000..a124f35b --- /dev/null +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -0,0 +1,47 @@ +""" testing book data connectors """ +from django.test import TestCase +import responses + +from bookwyrm import models +from bookwyrm.connectors.inventaire import Connector + + +class Inventaire(TestCase): + """test loading data from inventaire.io""" + + def setUp(self): + """creates the connector we'll use""" + models.Connector.objects.create( + identifier="inventaire.io", + name="Inventaire", + connector_file="inventaire", + base_url="https://inventaire.io", + books_url="https://inventaire.io", + covers_url="https://covers.inventaire.io", + search_url="https://inventaire.io/search?q=", + isbn_search_url="https://inventaire.io/isbn", + ) + self.connector = Connector("inventaire.io") + + @responses.activate + def test_get_book_data(self): + """flattens the default structure to make it easier to parse""" + responses.add( + responses.GET, + "https://test.url/ok", + json={ + "entities": { + "isbn:9780375757853": { + "claims": { + "wdt:P31": ["wd:Q3331189"], + }, + "uri": "isbn:9780375757853", + } + }, + "redirects": {}, + }, + ) + + result = self.connector.get_book_data("https://test.url/ok") + self.assertEqual(result["wdt:P31"], ["wd:Q3331189"]) + self.assertEqual(result["uri"], "isbn:9780375757853") From fc095a087c5637d58cdd645ad9505cc60ecfcc22 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 08:35:37 -0700 Subject: [PATCH 25/37] Adds search result test --- .../connectors/test_inventaire_connector.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index a124f35b..2b1d9bdf 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -1,4 +1,6 @@ """ testing book data connectors """ +import json +import pathlib from django.test import TestCase import responses @@ -45,3 +47,22 @@ class Inventaire(TestCase): result = self.connector.get_book_data("https://test.url/ok") self.assertEqual(result["wdt:P31"], ["wd:Q3331189"]) self.assertEqual(result["uri"], "isbn:9780375757853") + + def test_format_search_result(self): + """json to search result objs""" + search_file = pathlib.Path(__file__).parent.joinpath( + "../data/inventaire_search.json" + ) + search_results = json.loads(search_file.read_bytes()) + + results = self.connector.parse_search_data(search_results) + formatted = self.connector.format_search_result(results[0]) + + self.assertEqual(formatted.title, "The Stories of Vladimir Nabokov") + self.assertEqual( + formatted.key, "https://inventaire.io?action=by-uris&uris=wd:Q7766679" + ) + self.assertEqual( + formatted.cover, + "https://covers.inventaire.io/img/entities/ddb32e115a28dcc0465023869ba19f6868ec4042", + ) From 0a415035725a2bd5f9f7ec76f57e47b67ebaa062 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 09:06:17 -0700 Subject: [PATCH 26/37] Adds a couple more tests and test data --- .../connectors/test_inventaire_connector.py | 70 ++++++++ bookwyrm/tests/data/inventaire_edition.json | 45 +++++ bookwyrm/tests/data/inventaire_search.json | 111 +++++++++++++ bookwyrm/tests/data/inventaire_work.json | 155 ++++++++++++++++++ 4 files changed, 381 insertions(+) create mode 100644 bookwyrm/tests/data/inventaire_edition.json create mode 100644 bookwyrm/tests/data/inventaire_search.json create mode 100644 bookwyrm/tests/data/inventaire_work.json diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 2b1d9bdf..a37382c5 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -66,3 +66,73 @@ class Inventaire(TestCase): formatted.cover, "https://covers.inventaire.io/img/entities/ddb32e115a28dcc0465023869ba19f6868ec4042", ) + + def test_get_cover_url(self): + """figure out where the cover image is""" + cover_blob = {"url": "/img/entities/d46a8"} + result = self.connector.get_cover_url(cover_blob) + self.assertEqual(result, "https://covers.inventaire.io/img/entities/d46a8") + + cover_blob = { + "url": "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000", + "file": "The Moonstone 1st ed.jpg", + "credits": { + "text": "Wikimedia Commons", + "url": "https://commons.wikimedia.org/wiki/File:The Moonstone 1st ed.jpg", + }, + } + + result = self.connector.get_cover_url(cover_blob) + self.assertEqual( + result, + "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000", + ) + + @responses.activate + def test_resolve_keys(self): + """makes an http request""" + responses.add( + responses.GET, + "https://inventaire.io?action=by-uris&uris=wd:Q465821", + json={ + "entities": { + "wd:Q465821": { + "type": "genre", + "labels": { + "nl": "briefroman", + "en": "epistolary novel", + "de-ch": "Briefroman", + "en-ca": "Epistolary novel", + "nb": "brev- og dagbokroman", + }, + "descriptions": { + "en": "novel written as a series of documents", + "es": "novela escrita como una serie de documentos", + "eo": "romano en la formo de serio de leteroj", + }, + }, + "redirects": {}, + } + }, + ) + responses.add( + responses.GET, + "https://inventaire.io?action=by-uris&uris=wd:Q208505", + json={ + "entities": { + "wd:Q208505": { + "type": "genre", + "labels": { + "en": "crime novel", + }, + }, + } + }, + ) + + keys = [ + "wd:Q465821", + "wd:Q208505", + ] + result = self.connector.resolve_keys(keys) + self.assertEqual(result, ["epistolary novel", "crime novel"]) diff --git a/bookwyrm/tests/data/inventaire_edition.json b/bookwyrm/tests/data/inventaire_edition.json new file mode 100644 index 00000000..1150bc9b --- /dev/null +++ b/bookwyrm/tests/data/inventaire_edition.json @@ -0,0 +1,45 @@ +{ + "entities": { + "isbn:9780375757853": { + "_id": "7beee121a8d9ac345cdf4e9128577723", + "_rev": "2-ac318b04b953ca3894deb77fee28211c", + "type": "edition", + "labels": {}, + "claims": { + "wdt:P31": [ + "wd:Q3331189" + ], + "wdt:P212": [ + "978-0-375-75785-3" + ], + "wdt:P957": [ + "0-375-75785-6" + ], + "wdt:P407": [ + "wd:Q1860" + ], + "wdt:P1476": [ + "The Moonstone" + ], + "wdt:P577": [ + "2001" + ], + "wdt:P629": [ + "wd:Q2362563" + ], + "invp:P2": [ + "d46a8eac7555afa479b8bbb5149f35858e8e19c4" + ] + }, + "created": 1495452670475, + "updated": 1541032981834, + "version": 3, + "uri": "isbn:9780375757853", + "originalLang": "en", + "image": { + "url": "/img/entities/d46a8eac7555afa479b8bbb5149f35858e8e19c4" + } + } + }, + "redirects": {} +} diff --git a/bookwyrm/tests/data/inventaire_search.json b/bookwyrm/tests/data/inventaire_search.json new file mode 100644 index 00000000..e80e593a --- /dev/null +++ b/bookwyrm/tests/data/inventaire_search.json @@ -0,0 +1,111 @@ +{ + "results": [ + { + "id": "Q7766679", + "type": "works", + "uri": "wd:Q7766679", + "label": "The Stories of Vladimir Nabokov", + "description": "book by Vladimir Nabokov", + "image": [ + "ddb32e115a28dcc0465023869ba19f6868ec4042" + ], + "_score": 25.180836, + "_popularity": 4 + }, + { + "id": "Q47407212", + "type": "works", + "uri": "wd:Q47407212", + "label": "Conversations with Vladimir Nabokov", + "description": "book edited by Robert Golla", + "image": [], + "_score": 24.41498, + "_popularity": 2 + }, + { + "id": "Q6956987", + "type": "works", + "uri": "wd:Q6956987", + "label": "Nabokov's Congeries", + "description": "book by Vladimir Nabokov", + "image": [], + "_score": 22.343866, + "_popularity": 2 + }, + { + "id": "Q6956986", + "type": "works", + "uri": "wd:Q6956986", + "label": "Nabokov's Butterflies", + "description": "book by Brian Boyd", + "image": [], + "_score": 22.343866, + "_popularity": 2 + }, + { + "id": "Q47472170", + "type": "works", + "uri": "wd:Q47472170", + "label": "A Reader's Guide to Nabokov's \"Lolita\"", + "description": "book by Julian W. Connolly", + "image": [], + "_score": 19.482553, + "_popularity": 2 + }, + { + "id": "Q7936323", + "type": "works", + "uri": "wd:Q7936323", + "label": "Visiting Mrs Nabokov: And Other Excursions", + "description": "book by Martin Amis", + "image": [], + "_score": 18.684965, + "_popularity": 2 + }, + { + "id": "1732d81bf7376e04da27568a778561a4", + "type": "works", + "uri": "inv:1732d81bf7376e04da27568a778561a4", + "label": "Nabokov's Dark Cinema", + "image": [ + "7512805a53da569b11bf29cc3fb272c969619749" + ], + "_score": 16.56681, + "_popularity": 1 + }, + { + "id": "00f118336b02219e1bddc8fa93c56050", + "type": "works", + "uri": "inv:00f118336b02219e1bddc8fa93c56050", + "label": "The Cambridge Companion to Nabokov", + "image": [ + "0683a059fb95430cfa73334f9eff2ef377f3ae3d" + ], + "_score": 15.502292, + "_popularity": 1 + }, + { + "id": "6e59f968a1cd00dbedeb1964dec47507", + "type": "works", + "uri": "inv:6e59f968a1cd00dbedeb1964dec47507", + "label": "Vladimir Nabokov : selected letters, 1940-1977", + "image": [ + "e3ce8c0ee89d576adf2651a6e5ce55fc6d9f8cb3" + ], + "_score": 15.019735, + "_popularity": 1 + }, + { + "id": "Q127149", + "type": "works", + "uri": "wd:Q127149", + "label": "Lolita", + "description": "novel by Vladimir Nabokov", + "image": [ + "51cbfdbf7257b1a6bb3ea3fbb167dbce1fb44a0e" + ], + "_score": 13.458428, + "_popularity": 32 + } + ] +} diff --git a/bookwyrm/tests/data/inventaire_work.json b/bookwyrm/tests/data/inventaire_work.json new file mode 100644 index 00000000..635c52f3 --- /dev/null +++ b/bookwyrm/tests/data/inventaire_work.json @@ -0,0 +1,155 @@ +{ + "entities": { + "wd:Q2362563": { + "type": "work", + "labels": { + "zh-hans": "月亮宝石", + "zh-hant": "月亮寶石", + "zh-hk": "月光石", + "zh-tw": "月光石", + "cy": "The Moonstone", + "ml": "ദ മൂൺസ്റ്റോൺ", + "ja": "月長石", + "te": "ది మూన్ స్టోన్", + "ru": "Лунный камень", + "fr": "La Pierre de lune", + "en": "The Moonstone", + "es": "La piedra lunar", + "it": "La Pietra di Luna", + "zh": "月亮宝石", + "pl": "Kamień Księżycowy", + "sr": "2 Јн", + "ta": "moon stone", + "ar": "حجر القمر", + "fa": "ماه‌الماس", + "uk": "Місячний камінь", + "nl": "The Moonstone", + "de": "Der Monddiamant", + "sl": "Diamant", + "sv": "Månstenen", + "he": "אבן הירח", + "eu": "Ilargi-harriak", + "bg": "Лунният камък", + "ka": "მთვარის ქვა", + "eo": "La Lunŝtono", + "hy": "Լուսնաքար", + "ro": "Piatra Lunii", + "ca": "The Moonstone", + "is": "The Moonstone" + }, + "descriptions": { + "it": "romanzo scritto da Wilkie Collins", + "en": "novel by Wilkie Collins", + "de": "Buch von Wilkie Collins", + "nl": "boek van Wilkie Collins", + "ru": "роман Уилки Коллинза", + "he": "רומן מאת וילקי קולינס", + "ar": "رواية من تأليف ويلكي كولينز", + "fr": "livre de Wilkie Collins", + "es": "libro de Wilkie Collins", + "bg": "роман на Уилки Колинс", + "ka": "უილკი კოლინსის რომანი", + "eo": "angalingva romano far Wilkie Collins", + "ro": "roman de Wilkie Collins" + }, + "aliases": { + "zh": [ + "月光石" + ], + "ml": [ + "The Moonstone" + ], + "fr": [ + "The Moonstone" + ], + "it": [ + "Il diamante indiano", + "La pietra della luna", + "La maledizione del diamante indiano" + ], + "ro": [ + "The Moonstone" + ] + }, + "claims": { + "wdt:P18": [ + "The Moonstone 1st ed.jpg" + ], + "wdt:P31": [ + "wd:Q7725634" + ], + "wdt:P50": [ + "wd:Q210740" + ], + "wdt:P123": [ + "wd:Q4457856" + ], + "wdt:P136": [ + "wd:Q465821", + "wd:Q208505", + "wd:Q10992055" + ], + "wdt:P156": [ + "wd:Q7228798" + ], + "wdt:P268": [ + "12496407z" + ], + "wdt:P407": [ + "wd:Q7979" + ], + "wdt:P577": [ + "1868" + ], + "wdt:P1433": [ + "wd:Q21" + ], + "wdt:P1476": [ + "The Moonstone" + ], + "wdt:P1680": [ + "A Romance" + ], + "wdt:P2034": [ + "155" + ] + }, + "sitelinks": { + "arwiki": "حجر القمر (رواية)", + "bgwiki": "Лунният камък (роман)", + "cywiki": "The Moonstone", + "dewiki": "Der Monddiamant", + "enwiki": "The Moonstone", + "enwikisource": "The Moonstone", + "eswiki": "La piedra lunar", + "euwiki": "Ilargi-harria", + "fawiki": "ماه‌الماس", + "frwiki": "La Pierre de lune (roman de Wilkie Collins)", + "hewiki": "אבן הירח", + "hywiki": "Լուսնաքար", + "iswiki": "The Moonstone", + "itwiki": "La pietra di Luna", + "jawiki": "月長石 (小説)", + "mlwiki": "ദ മൂൺസ്റ്റോൺ", + "plwiki": "Kamień Księżycowy (powieść)", + "ruwiki": "Лунный камень (роман)", + "slwiki": "Diamant (roman)", + "srwikisource": "Нови завјет (Караџић) / 2. Јованова", + "svwiki": "Månstenen", + "tewiki": "ది మూన్‌స్టోన్", + "ukwiki": "Місячний камінь (роман)", + "zhwiki": "月亮宝石" + }, + "uri": "wd:Q2362563", + "image": { + "url": "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000", + "file": "The Moonstone 1st ed.jpg", + "credits": { + "text": "Wikimedia Commons", + "url": "https://commons.wikimedia.org/wiki/File:The Moonstone 1st ed.jpg" + } + } + } + }, + "redirects": {} +} From f4800307b44ac8f0c55b659dcc64e1aef4139b34 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 09:54:42 -0700 Subject: [PATCH 27/37] Adds isbn search --- bookwyrm/connectors/inventaire.py | 22 +++++++-- .../connectors/test_inventaire_connector.py | 19 ++++++++ .../tests/data/inventaire_isbn_search.json | 48 +++++++++++++++++++ bookwyrm/views/books.py | 1 - 4 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/tests/data/inventaire_isbn_search.json diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index ebbe8d51..fe01ddda 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -81,19 +81,31 @@ class Connector(AbstractConnector): ) return SearchResult( title=search_result.get("label"), - key="{:s}?action=by-uris&uris={:s}".format( - self.books_url, search_result.get("uri") - ), + key=self.get_remote_id(search_result.get("uri")), view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), cover=cover, connector=self, ) def parse_isbn_search_data(self, data): - """boop doop""" + """got some daaaata""" + results = data.get('entities') + if not results: + return [] + return list(results.values()) def format_isbn_search_result(self, search_result): - """beep bloop""" + """totally different format than a regular search result""" + title = search_result.get("claims", {}).get("wdt:P1476", []) + if not title: + return None + return SearchResult( + title=title[0], + key=self.get_remote_id(search_result.get("uri")), + view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), + cover=self.get_cover_url(search_result.get("image")), + connector=self + ) def is_work_data(self, data): return data.get("type") == "work" diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index a37382c5..90018534 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -136,3 +136,22 @@ class Inventaire(TestCase): ] result = self.connector.resolve_keys(keys) self.assertEqual(result, ["epistolary novel", "crime novel"]) + + def test_isbn_search(self): + """ another search type """ + search_file = pathlib.Path(__file__).parent.joinpath( + "../data/inventaire_isbn_search.json" + ) + search_results = json.loads(search_file.read_bytes()) + + results = self.connector.parse_isbn_search_data(search_results) + formatted = self.connector.format_isbn_search_result(results[0]) + + self.assertEqual(formatted.title, "L'homme aux cercles bleus") + self.assertEqual( + formatted.key, "https://inventaire.io?action=by-uris&uris=isbn:9782290349229" + ) + self.assertEqual( + formatted.cover, + "https://covers.inventaire.io/img/entities/12345", + ) diff --git a/bookwyrm/tests/data/inventaire_isbn_search.json b/bookwyrm/tests/data/inventaire_isbn_search.json new file mode 100644 index 00000000..7328a78f --- /dev/null +++ b/bookwyrm/tests/data/inventaire_isbn_search.json @@ -0,0 +1,48 @@ +{ + "entities": { + "isbn:9782290349229": { + "_id": "d59e3e64f92c6340fbb10c5dcf7c0abf", + "_rev": "3-079ed51158a001dc74caafb21cff1c22", + "type": "edition", + "labels": {}, + "claims": { + "wdt:P31": [ + "wd:Q3331189" + ], + "wdt:P212": [ + "978-2-290-34922-9" + ], + "wdt:P957": [ + "2-290-34922-4" + ], + "wdt:P407": [ + "wd:Q150" + ], + "wdt:P1476": [ + "L'homme aux cercles bleus" + ], + "wdt:P629": [ + "wd:Q3203603" + ], + "wdt:P123": [ + "wd:Q3156592" + ], + "invp:P2": [ + "57883743aa7c6ad25885a63e6e94349ec4f71562" + ], + "wdt:P577": [ + "2005-05-01" + ] + }, + "created": 1485023383338, + "updated": 1609171008418, + "version": 5, + "uri": "isbn:9782290349229", + "originalLang": "fr", + "image": { + "url": "/img/entities/12345" + } + } + }, + "redirects": {} +} diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py index ee1a5e06..6005c9fd 100644 --- a/bookwyrm/views/books.py +++ b/bookwyrm/views/books.py @@ -156,7 +156,6 @@ class EditBook(View): ), } ) - print(data["author_matches"]) # we're creating a new book if not book: From 8d38d1c9d1bd51b7d4622845f6d3e242ba6e9c1d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 09:56:35 -0700 Subject: [PATCH 28/37] Python formatting --- bookwyrm/connectors/inventaire.py | 4 ++-- bookwyrm/tests/connectors/test_inventaire_connector.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index fe01ddda..e972950f 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -89,7 +89,7 @@ class Connector(AbstractConnector): def parse_isbn_search_data(self, data): """got some daaaata""" - results = data.get('entities') + results = data.get("entities") if not results: return [] return list(results.values()) @@ -104,7 +104,7 @@ class Connector(AbstractConnector): key=self.get_remote_id(search_result.get("uri")), view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), cover=self.get_cover_url(search_result.get("image")), - connector=self + connector=self, ) def is_work_data(self, data): diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 90018534..4058b067 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -138,7 +138,7 @@ class Inventaire(TestCase): self.assertEqual(result, ["epistolary novel", "crime novel"]) def test_isbn_search(self): - """ another search type """ + """another search type""" search_file = pathlib.Path(__file__).parent.joinpath( "../data/inventaire_isbn_search.json" ) @@ -149,7 +149,8 @@ class Inventaire(TestCase): self.assertEqual(formatted.title, "L'homme aux cercles bleus") self.assertEqual( - formatted.key, "https://inventaire.io?action=by-uris&uris=isbn:9782290349229" + formatted.key, + "https://inventaire.io?action=by-uris&uris=isbn:9782290349229", ) self.assertEqual( formatted.cover, From cfd2c05ae2b5638cdc26ca7aadb0c613983b8fa9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 10:12:56 -0700 Subject: [PATCH 29/37] Safely handle absent claims field --- bookwyrm/connectors/inventaire.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index e972950f..e6fb6826 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -65,7 +65,7 @@ class Connector(AbstractConnector): raise ConnectorException("Invalid book data") # flatten the data so that images, uri, and claims are on the same level return { - **data.get("claims"), + **data.get("claims", {}), **{k: data.get(k) for k in ["uri", "image", "labels"]}, } From ca86af22ce3a968212ce21e04ba619b406e4537c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 10:30:38 -0700 Subject: [PATCH 30/37] Get inventaire entity descriptions --- bookwyrm/connectors/inventaire.py | 20 ++++++++++++++++++-- bookwyrm/management/commands/initdb.py | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index e6fb6826..a50a2584 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -23,6 +23,7 @@ class Connector(AbstractConnector): Mapping("title", remote_field="wdt:P1476", formatter=get_first), Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first), Mapping("inventaireId", remote_field="uri"), + Mapping("description", remote_field="sitelinks", formatter=self.get_description), Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_first), Mapping("isbn10", remote_field="wdt:P957", formatter=get_first), @@ -44,6 +45,7 @@ class Connector(AbstractConnector): self.author_mappings = [ Mapping("id", remote_field="uri", formatter=self.get_remote_id), Mapping("name", remote_field="labels", formatter=get_language_code), + Mapping("bio", remote_field="sitelinks", formatter=self.get_description), Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first), Mapping("isni", remote_field="wdt:P213", formatter=get_first), Mapping("viafId", remote_field="wdt:P214", formatter=get_first), @@ -82,7 +84,7 @@ class Connector(AbstractConnector): return SearchResult( title=search_result.get("label"), key=self.get_remote_id(search_result.get("uri")), - view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), + view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")), cover=cover, connector=self, ) @@ -102,7 +104,7 @@ class Connector(AbstractConnector): return SearchResult( title=title[0], key=self.get_remote_id(search_result.get("uri")), - view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")), + view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")), cover=self.get_cover_url(search_result.get("image")), connector=self, ) @@ -184,6 +186,20 @@ class Connector(AbstractConnector): results.append(get_language_code(data.get("labels"))) return results + def get_description(self, links): + """ grab an extracted except from wikipedia """ + link = links.get("enwiki") + if not link: + return "" + url = "{:s}/api/data?action=wp-extract&lang=en&title={:s}".format( + self.base_url, link + ) + try: + data = get_data(url) + except ConnectorException: + return "" + return data.get("extract") + def get_language_code(options, code="en"): """when there are a bunch of translation but we need a single field""" diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py index 07071a2e..9033249d 100644 --- a/bookwyrm/management/commands/initdb.py +++ b/bookwyrm/management/commands/initdb.py @@ -98,7 +98,7 @@ def init_connectors(): identifier="inventaire.io", name="Inventaire", connector_file="inventaire", - base_url="https://inventaire.io/entity/", + base_url="https://inventaire.io", books_url="https://inventaire.io/api/entities", covers_url="https://inventaire.io", search_url="https://inventaire.io/api/search?types=works&types=works&search=", From b1c38d291c432f196107a27af8dc26bc00179c10 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 10:40:49 -0700 Subject: [PATCH 31/37] Set preferred language --- .env.dev.example | 3 +++ .env.prod.example | 3 +++ bookwyrm/connectors/inventaire.py | 14 ++++++++++---- bookwyrm/models/book.py | 10 +++++++++- bookwyrm/settings.py | 1 + 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index 5e605d74..538d1611 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -7,6 +7,9 @@ DEBUG=true DOMAIN=your.domain.here #EMAIL=your@email.here +# Used for deciding which editions to prefer +DEFAULT_LANGUAGE="English" + ## Leave unset to allow all hosts # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]" diff --git a/.env.prod.example b/.env.prod.example index 0013bf9d..ac9fe70f 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -7,6 +7,9 @@ DEBUG=false DOMAIN=your.domain.here EMAIL=your@email.here +# Used for deciding which editions to prefer +DEFAULT_LANGUAGE="English" + ## Leave unset to allow all hosts # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]" diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index a50a2584..ca84338d 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -23,7 +23,9 @@ class Connector(AbstractConnector): Mapping("title", remote_field="wdt:P1476", formatter=get_first), Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first), Mapping("inventaireId", remote_field="uri"), - Mapping("description", remote_field="sitelinks", formatter=self.get_description), + Mapping( + "description", remote_field="sitelinks", formatter=self.get_description + ), Mapping("cover", remote_field="image", formatter=self.get_cover_url), Mapping("isbn13", remote_field="wdt:P212", formatter=get_first), Mapping("isbn10", remote_field="wdt:P957", formatter=get_first), @@ -84,7 +86,9 @@ class Connector(AbstractConnector): return SearchResult( title=search_result.get("label"), key=self.get_remote_id(search_result.get("uri")), - view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")), + view_link="{:s}/entity/{:s}".format( + self.base_url, search_result.get("uri") + ), cover=cover, connector=self, ) @@ -104,7 +108,9 @@ class Connector(AbstractConnector): return SearchResult( title=title[0], key=self.get_remote_id(search_result.get("uri")), - view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")), + view_link="{:s}/entity/{:s}".format( + self.base_url, search_result.get("uri") + ), cover=self.get_cover_url(search_result.get("image")), connector=self, ) @@ -187,7 +193,7 @@ class Connector(AbstractConnector): return results def get_description(self, links): - """ grab an extracted except from wikipedia """ + """grab an extracted except from wikipedia""" link = links.get("enwiki") if not link: return "" diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 0bbae033..10af9b5b 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -5,7 +5,7 @@ from django.db import models from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin from .base_model import BookWyrmModel @@ -211,7 +211,15 @@ class Edition(Book): def get_rank(self): """calculate how complete the data is on this edition""" rank = 0 + # big ups for havinga cover rank += int(bool(self.cover)) * 3 + # is it in the instance's preferred language? + rank += int(bool(DEFAULT_LANGUAGE in self.languages)) + print(DEFAULT_LANGUAGE) + # prefer print editions + rank += int(bool(self.physical_format.lower() in ['paperback', 'hardcover'])) + + # does it have metadata? rank += int(bool(self.isbn_13)) rank += int(bool(self.isbn_10)) rank += int(bool(self.oclc_number)) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b679e2d4..1bc3c587 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -11,6 +11,7 @@ DOMAIN = env("DOMAIN") VERSION = "0.0.1" PAGE_LENGTH = env("PAGE_LENGTH", 15) +DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") # celery CELERY_BROKER = env("CELERY_BROKER") From 7853610a205a5d6e8ed42d766df65f617972cf3a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 10:54:36 -0700 Subject: [PATCH 32/37] Load descriptions correctly --- bookwyrm/connectors/inventaire.py | 4 ++-- bookwyrm/models/book.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index ca84338d..896f84af 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -70,7 +70,7 @@ class Connector(AbstractConnector): # flatten the data so that images, uri, and claims are on the same level return { **data.get("claims", {}), - **{k: data.get(k) for k in ["uri", "image", "labels"]}, + **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks"]}, } def parse_search_data(self, data): @@ -193,7 +193,7 @@ class Connector(AbstractConnector): return results def get_description(self, links): - """grab an extracted except from wikipedia""" + """grab an extracted excerpt from wikipedia""" link = links.get("enwiki") if not link: return "" diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 10af9b5b..e7c95759 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -215,9 +215,8 @@ class Edition(Book): rank += int(bool(self.cover)) * 3 # is it in the instance's preferred language? rank += int(bool(DEFAULT_LANGUAGE in self.languages)) - print(DEFAULT_LANGUAGE) # prefer print editions - rank += int(bool(self.physical_format.lower() in ['paperback', 'hardcover'])) + rank += int(bool(self.physical_format.lower() in ["paperback", "hardcover"])) # does it have metadata? rank += int(bool(self.isbn_13)) From d1b5f3b6f0d98fc0076da1f16a5fc465d4877433 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 11:04:14 -0700 Subject: [PATCH 33/37] Fixes ranks and normalizes isbns --- bookwyrm/models/book.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index e7c95759..0539414a 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -216,7 +216,10 @@ class Edition(Book): # is it in the instance's preferred language? rank += int(bool(DEFAULT_LANGUAGE in self.languages)) # prefer print editions - rank += int(bool(self.physical_format.lower() in ["paperback", "hardcover"])) + if self.physical_format: + rank += int( + bool(self.physical_format.lower() in ["paperback", "hardcover"]) + ) # does it have metadata? rank += int(bool(self.isbn_13)) @@ -236,6 +239,10 @@ class Edition(Book): if self.isbn_10 and not self.isbn_13: self.isbn_13 = isbn_10_to_13(self.isbn_10) + # normalize isbn format + self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10) + self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13) + # set rank self.edition_rank = self.get_rank() From d1b788b61fbfbaa129c7f8d19cea4eeaa154214b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 11:14:20 -0700 Subject: [PATCH 34/37] Adds inventaire link to book page --- bookwyrm/templates/book/book.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 97f105bf..abe50145 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -81,6 +81,9 @@ {% if book.openlibrary_key %}

{% trans "View on OpenLibrary" %}

{% endif %} + {% if book.inventaire_id %} +

{% trans "View on Inventaire" %}

+ {% endif %}
From 095b60bff107ab36370ce1743fb585a38598e904 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 11:22:09 -0700 Subject: [PATCH 35/37] Show search result context for inventaire results --- bookwyrm/connectors/inventaire.py | 2 ++ bookwyrm/templates/snippets/search_result_text.html | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 896f84af..dc27f2c0 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -86,6 +86,7 @@ class Connector(AbstractConnector): return SearchResult( title=search_result.get("label"), key=self.get_remote_id(search_result.get("uri")), + author=search_result.get("description"), view_link="{:s}/entity/{:s}".format( self.base_url, search_result.get("uri") ), @@ -108,6 +109,7 @@ class Connector(AbstractConnector): return SearchResult( title=title[0], key=self.get_remote_id(search_result.get("uri")), + author=search_result.get("description"), view_link="{:s}/entity/{:s}".format( self.base_url, search_result.get("uri") ), diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html index 2f6ba503..26623c05 100644 --- a/bookwyrm/templates/snippets/search_result_text.html +++ b/bookwyrm/templates/snippets/search_result_text.html @@ -18,8 +18,13 @@ {{ result.title }} +

+

{% if result.author %} - {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }}) + {{ result.author }} + {% endif %} + {% if result.year %} + ({{ result.year }}) {% endif %}

From a31d05c6947d2469d4adc9a22975d6155082e8dd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 11:31:01 -0700 Subject: [PATCH 36/37] Don't crash on books with no isbn --- bookwyrm/models/book.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 0539414a..869ff04d 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -240,8 +240,10 @@ class Edition(Book): self.isbn_13 = isbn_10_to_13(self.isbn_10) # normalize isbn format - self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10) - self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13) + if self.isbn_10: + self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10) + if self.isbn_13: + self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13) # set rank self.edition_rank = self.get_rank() From 0dcd7853f7ad4e94dc70104c7f8484f05a4f1844 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 29 Apr 2021 11:38:51 -0700 Subject: [PATCH 37/37] Updates locales --- locale/de_DE/LC_MESSAGES/django.mo | Bin 25779 -> 25234 bytes locale/de_DE/LC_MESSAGES/django.po | 73 ++++++++++++++------------- locale/en_US/LC_MESSAGES/django.po | 67 ++++++++++++------------ locale/es/LC_MESSAGES/django.mo | Bin 42362 -> 65330 bytes locale/es/LC_MESSAGES/django.po | 73 ++++++++++++++------------- locale/fr_FR/LC_MESSAGES/django.mo | Bin 42851 -> 41556 bytes locale/fr_FR/LC_MESSAGES/django.po | 73 ++++++++++++++------------- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 38418 -> 37261 bytes locale/zh_Hans/LC_MESSAGES/django.po | 73 ++++++++++++++------------- 9 files changed, 189 insertions(+), 170 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index dca726855f8f9060958660f8ab5bae1e36db3fd9..3f41eda575696af9585b5df60f4b09c991259496 100644 GIT binary patch delta 7645 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 P?qvmoyxhMQ?)UsZj4dN2 delta 8133 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 Di1DHT diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 7acc3f96..bbdd1327 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-26 09:56-0700\n" +"POT-Creation-Date: 2021-04-29 11:36-0700\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -100,23 +100,23 @@ msgstr "Username" msgid "A user with that username already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/settings.py:152 +#: bookwyrm/settings.py:155 msgid "English" msgstr "Englisch" -#: bookwyrm/settings.py:153 +#: bookwyrm/settings.py:156 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:154 +#: bookwyrm/settings.py:157 msgid "Spanish" msgstr "Spanisch" -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:158 msgid "French" msgstr "Französisch" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:159 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" @@ -178,24 +178,30 @@ msgstr "Laden fehlgeschlagen" msgid "View on OpenLibrary" msgstr "In OpenLibrary ansehen" -#: bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on Inventaire" +msgstr "In OpenLibrary ansehen" + +#: bookwyrm/templates/book/book.html:105 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s Bewertung)" msgstr[1] "(%(review_count)s Bewertungen)" -#: bookwyrm/templates/book/book.html:114 +#: bookwyrm/templates/book/book.html:117 msgid "Add Description" msgstr "Beschreibung hinzufügen" -#: bookwyrm/templates/book/book.html:121 +#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/edit_book.html:107 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Beschreibung:" -#: bookwyrm/templates/book/book.html:125 +#: bookwyrm/templates/book/book.html:128 #: bookwyrm/templates/book/edit_book.html:240 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -210,7 +216,7 @@ msgstr "Beschreibung:" msgid "Save" msgstr "Speichern" -#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:241 #: bookwyrm/templates/edit_author.html:79 @@ -226,19 +232,19 @@ msgstr "Speichern" msgid "Cancel" msgstr "Abbrechen" -#: bookwyrm/templates/book/book.html:135 +#: bookwyrm/templates/book/book.html:138 #, fuzzy, python-format #| msgid "%(title)s by " msgid "%(count)s editions" msgstr "%(title)s von" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, fuzzy, python-format #| msgid "Direct Messages with %(username)s" msgid "This edition is on your %(shelf_name)s shelf." msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/book/book.html:149 +#: bookwyrm/templates/book/book.html:152 #, fuzzy, python-format #| msgid "" #| " added %(book_title)s to your list " @@ -250,74 +256,74 @@ msgstr "" "hat %(book_title)s zu deiner Liste " "\"%(list_name)s\" Hinzugefügt" -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:161 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:163 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "You don't have any reading activity for this book." msgstr "Du hast keine Leseaktivität für dieses Buch." -#: bookwyrm/templates/book/book.html:172 +#: bookwyrm/templates/book/book.html:175 msgid "Create" msgstr "Erstellen" -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:197 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:209 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65 +#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:231 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Zur Liste" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:241 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:133 msgid "Add" msgstr "Hinzufügen" -#: bookwyrm/templates/book/book.html:254 +#: bookwyrm/templates/book/book.html:257 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "Bewerten" -#: bookwyrm/templates/book/book.html:259 +#: bookwyrm/templates/book/book.html:262 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "Deine Regale" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:268 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "Dein Account" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:274 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "Deine Bücher" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:308 msgid "rated it" msgstr "bewertet" @@ -2728,12 +2734,7 @@ msgstr "kommentierte" msgid "quoted" msgstr "zitierte" -#: bookwyrm/templates/snippets/search_result_text.html:22 -#, python-format -msgid "by %(author)s" -msgstr "von %(author)s" - -#: bookwyrm/templates/snippets/search_result_text.html:30 +#: bookwyrm/templates/snippets/search_result_text.html:35 msgid "Import book" msgstr "Buch importieren" @@ -4495,6 +4496,10 @@ msgctxt "stick" msgid "club" msgstr "" +#, python-format +#~ msgid "by %(author)s" +#~ msgstr "von %(author)s" + #~ msgid "Deactivate user" #~ msgstr "Nutzer:in deaktivieren" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 6685605a..3637bb77 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-26 09:56-0700\n" +"POT-Creation-Date: 2021-04-29 11:36-0700\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -90,23 +90,23 @@ msgstr "" msgid "A user with that username already exists." msgstr "" -#: bookwyrm/settings.py:152 +#: bookwyrm/settings.py:155 msgid "English" msgstr "" -#: bookwyrm/settings.py:153 +#: bookwyrm/settings.py:156 msgid "German" msgstr "" -#: bookwyrm/settings.py:154 +#: bookwyrm/settings.py:157 msgid "Spanish" msgstr "" -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:158 msgid "French" msgstr "" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:159 msgid "Simplified Chinese" msgstr "" @@ -166,24 +166,28 @@ msgstr "" msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:85 +msgid "View on Inventaire" +msgstr "" + +#: bookwyrm/templates/book/book.html:105 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:114 +#: bookwyrm/templates/book/book.html:117 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:121 +#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/edit_book.html:107 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:125 +#: bookwyrm/templates/book/book.html:128 #: bookwyrm/templates/book/edit_book.html:240 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -198,7 +202,7 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:241 #: bookwyrm/templates/edit_author.html:79 @@ -214,81 +218,81 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book/book.html:135 +#: bookwyrm/templates/book/book.html:138 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:149 +#: bookwyrm/templates/book/book.html:152 #, python-format msgid "" "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:161 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:163 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:172 +#: bookwyrm/templates/book/book.html:175 msgid "Create" msgstr "" -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:197 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:209 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65 +#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:231 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:241 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:133 msgid "Add" msgstr "" -#: bookwyrm/templates/book/book.html:254 +#: bookwyrm/templates/book/book.html:257 msgid "Reviews" msgstr "" -#: bookwyrm/templates/book/book.html:259 +#: bookwyrm/templates/book/book.html:262 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:268 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:274 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:308 msgid "rated it" msgstr "" @@ -2481,12 +2485,7 @@ msgstr "" msgid "quoted" msgstr "" -#: bookwyrm/templates/snippets/search_result_text.html:22 -#, python-format -msgid "by %(author)s" -msgstr "" - -#: bookwyrm/templates/snippets/search_result_text.html:30 +#: bookwyrm/templates/snippets/search_result_text.html:35 msgid "Import book" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 64baee4f2fb999e55a052d3f2f25e231cbdc0e16..1fb1ae530173b3a63652ee8d1e2face2a044ffc5 100644 GIT binary patch literal 65330 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 O_<{5vd27 delta 14241 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\n" "Language-Team: LANGUAGE \n" @@ -90,23 +90,23 @@ msgstr "nombre de usuario" msgid "A user with that username already exists." msgstr "Ya existe un usuario con ese nombre." -#: bookwyrm/settings.py:152 +#: bookwyrm/settings.py:155 msgid "English" msgstr "Inglés" -#: bookwyrm/settings.py:153 +#: bookwyrm/settings.py:156 msgid "German" msgstr "Aléman" -#: bookwyrm/settings.py:154 +#: bookwyrm/settings.py:157 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:158 msgid "French" msgstr "Francés" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:159 msgid "Simplified Chinese" msgstr "Chino simplificado" @@ -166,24 +166,30 @@ msgstr "No se pudo cargar la portada" msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" -#: bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on Inventaire" +msgstr "Ver en OpenLibrary" + +#: bookwyrm/templates/book/book.html:105 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s reseña)" msgstr[1] "(%(review_count)s reseñas)" -#: bookwyrm/templates/book/book.html:114 +#: bookwyrm/templates/book/book.html:117 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:121 +#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/edit_book.html:107 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:125 +#: bookwyrm/templates/book/book.html:128 #: bookwyrm/templates/book/edit_book.html:240 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -198,7 +204,7 @@ msgstr "Descripción:" msgid "Save" msgstr "Guardar" -#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:241 #: bookwyrm/templates/edit_author.html:79 @@ -214,18 +220,18 @@ msgstr "Guardar" msgid "Cancel" msgstr "Cancelar" -#: bookwyrm/templates/book/book.html:135 +#: bookwyrm/templates/book/book.html:138 #, python-format msgid "%(count)s editions" msgstr "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" "Esta edición está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:149 +#: bookwyrm/templates/book/book.html:152 #, python-format msgid "" "A different edition of this book is on your edición diferente de este libro está en tu " "%(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:161 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:163 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "You don't have any reading activity for this book." msgstr "No tienes ninguna actividad de lectura para este libro." -#: bookwyrm/templates/book/book.html:172 +#: bookwyrm/templates/book/book.html:175 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:197 msgid "Subjects" msgstr "Sujetos" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:209 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65 +#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:231 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:241 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:133 msgid "Add" msgstr "Agregar" -#: bookwyrm/templates/book/book.html:254 +#: bookwyrm/templates/book/book.html:257 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "Reseña" -#: bookwyrm/templates/book/book.html:259 +#: bookwyrm/templates/book/book.html:262 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "Tus estantes" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:268 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "Tu cuenta" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:274 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "Tus libros" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:308 msgid "rated it" msgstr "lo calificó con" @@ -2571,12 +2577,7 @@ msgstr "comentó en" msgid "quoted" msgstr "citó" -#: bookwyrm/templates/snippets/search_result_text.html:22 -#, python-format -msgid "by %(author)s" -msgstr "por %(author)s" - -#: bookwyrm/templates/snippets/search_result_text.html:30 +#: bookwyrm/templates/snippets/search_result_text.html:35 msgid "Import book" msgstr "Importar libro" @@ -4299,6 +4300,10 @@ msgctxt "stick" msgid "club" msgstr "garrote" +#, python-format +#~ msgid "by %(author)s" +#~ msgstr "por %(author)s" + #, python-format #~ msgid "%(rating)s star" #~ msgid_plural "%(rating)s stars" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index b91a542dbfb13e56f1baff5aeab3b9c4a3088116..b88e6e3e553d7ff3d88570f27eff191e6a57ad71 100644 GIT binary patch delta 12040 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 A*#H0l diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index ee2f7936..ee7a5534 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-26 09:56-0700\n" +"POT-Creation-Date: 2021-04-29 11:36-0700\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -96,23 +96,23 @@ msgstr "nom du compte :" msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/settings.py:152 +#: bookwyrm/settings.py:155 msgid "English" msgstr "English" -#: bookwyrm/settings.py:153 +#: bookwyrm/settings.py:156 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:154 +#: bookwyrm/settings.py:157 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:158 msgid "French" msgstr "Français" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:159 msgid "Simplified Chinese" msgstr "简化字" @@ -172,24 +172,30 @@ msgstr "La couverture n’a pu être chargée" msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" -#: bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on Inventaire" +msgstr "Voir sur OpenLibrary" + +#: bookwyrm/templates/book/book.html:105 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s critique)" msgstr[1] "(%(review_count)s critiques)" -#: bookwyrm/templates/book/book.html:114 +#: bookwyrm/templates/book/book.html:117 msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book/book.html:121 +#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/edit_book.html:107 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Description :" -#: bookwyrm/templates/book/book.html:125 +#: bookwyrm/templates/book/book.html:128 #: bookwyrm/templates/book/edit_book.html:240 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -204,7 +210,7 @@ msgstr "Description :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:241 #: bookwyrm/templates/edit_author.html:79 @@ -220,18 +226,18 @@ msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book/book.html:135 +#: bookwyrm/templates/book/book.html:138 #, python-format msgid "%(count)s editions" msgstr "%(count)s éditions" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" "Cette édition est sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:149 +#: bookwyrm/templates/book/book.html:152 #, python-format msgid "" "A different edition of this book is on your édition différente de ce livre existe sur " "votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:161 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:163 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "You don't have any reading activity for this book." msgstr "Vous n’avez aucune activité de lecture pour ce livre" -#: bookwyrm/templates/book/book.html:172 +#: bookwyrm/templates/book/book.html:175 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:197 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:209 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65 +#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:231 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:241 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:133 msgid "Add" msgstr "Ajouter" -#: bookwyrm/templates/book/book.html:254 +#: bookwyrm/templates/book/book.html:257 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "Critique" -#: bookwyrm/templates/book/book.html:259 +#: bookwyrm/templates/book/book.html:262 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "Vos étagères" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:268 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "Votre compte" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:274 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "Vos livres" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:308 msgid "rated it" msgstr "l’a noté" @@ -2605,12 +2611,7 @@ msgstr "a commenté" msgid "quoted" msgstr "a cité" -#: bookwyrm/templates/snippets/search_result_text.html:22 -#, python-format -msgid "by %(author)s" -msgstr "par %(author)s" - -#: bookwyrm/templates/snippets/search_result_text.html:30 +#: bookwyrm/templates/snippets/search_result_text.html:35 msgid "Import book" msgstr "Importer le livre" @@ -4341,6 +4342,10 @@ msgctxt "stick" msgid "club" msgstr "" +#, python-format +#~ msgid "by %(author)s" +#~ msgstr "par %(author)s" + #~ msgid "Deactivate user" #~ msgstr "Désactiver le compte" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 07b8d63ca2e7a940d4feb0d0a94892b7a708e8b5..765ee77f337dbac59fdba575943504652b01f890 100644 GIT binary patch delta 11940 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 delta 12587 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 V7QeP{8O!@`c=dzzbg=N^{{de=0A diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 789960cc..af3bc59b 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-04-26 09:56-0700\n" +"POT-Creation-Date: 2021-04-29 11:36-0700\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -96,23 +96,23 @@ msgstr "用户名" msgid "A user with that username already exists." msgstr "已经存在使用该用户名的用户。" -#: bookwyrm/settings.py:152 +#: bookwyrm/settings.py:155 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:153 +#: bookwyrm/settings.py:156 msgid "German" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:154 +#: bookwyrm/settings.py:157 msgid "Spanish" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:155 +#: bookwyrm/settings.py:158 msgid "French" msgstr "Français（法语）" -#: bookwyrm/settings.py:156 +#: bookwyrm/settings.py:159 msgid "Simplified Chinese" msgstr "简体中文" @@ -172,23 +172,29 @@ msgstr "加载封面失败" msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" -#: bookwyrm/templates/book/book.html:102 +#: bookwyrm/templates/book/book.html:85 +#, fuzzy +#| msgid "View on OpenLibrary" +msgid "View on Inventaire" +msgstr "在 OpenLibrary 查看" + +#: bookwyrm/templates/book/book.html:105 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:114 +#: bookwyrm/templates/book/book.html:117 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:121 +#: bookwyrm/templates/book/book.html:124 #: bookwyrm/templates/book/edit_book.html:107 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:125 +#: bookwyrm/templates/book/book.html:128 #: bookwyrm/templates/book/edit_book.html:240 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 @@ -203,7 +209,7 @@ msgstr "描述:" msgid "Save" msgstr "保存" -#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:241 #: bookwyrm/templates/edit_author.html:79 @@ -219,17 +225,17 @@ msgstr "保存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:135 +#: bookwyrm/templates/book/book.html:138 #, python-format msgid "%(count)s editions" msgstr "%(count)s 个版本" -#: bookwyrm/templates/book/book.html:143 +#: bookwyrm/templates/book/book.html:146 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:149 +#: bookwyrm/templates/book/book.html:152 #, python-format msgid "" "A different edition of this book is on your 另一个版本 在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:161 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:160 +#: bookwyrm/templates/book/book.html:163 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:172 +#: bookwyrm/templates/book/book.html:175 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book/book.html:194 +#: bookwyrm/templates/book/book.html:197 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:209 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65 +#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search_results.html:91 #: bookwyrm/templates/user/user_layout.html:62 msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:231 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:241 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:133 msgid "Add" msgstr "添加" -#: bookwyrm/templates/book/book.html:254 +#: bookwyrm/templates/book/book.html:257 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "书评" -#: bookwyrm/templates/book/book.html:259 +#: bookwyrm/templates/book/book.html:262 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "你的书架" -#: bookwyrm/templates/book/book.html:265 +#: bookwyrm/templates/book/book.html:268 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "你的帐号" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:274 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "你的书目" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:308 msgid "rated it" msgstr "评价了" @@ -2570,12 +2576,7 @@ msgstr "评论了" msgid "quoted" msgstr "引用了" -#: bookwyrm/templates/snippets/search_result_text.html:22 -#, python-format -msgid "by %(author)s" -msgstr "由 %(author)s 所著" - -#: bookwyrm/templates/snippets/search_result_text.html:30 +#: bookwyrm/templates/snippets/search_result_text.html:35 msgid "Import book" msgstr "导入书目" @@ -4292,6 +4293,10 @@ msgctxt "stick" msgid "club" msgstr "" +#, python-format +#~ msgid "by %(author)s" +#~ msgstr "由 %(author)s 所著" + #~ msgid "Deactivate user" #~ msgstr "停用用户"