Show more data about books in search

This commit is contained in:
Mouse Reeve 2021-03-13 13:55:20 -08:00
parent 611e7870e7
commit 05fcfbc66f
7 changed files with 50 additions and 27 deletions

View file

@ -262,9 +262,10 @@ class SearchResult:
title: str
key: str
author: str
year: str
connector: object
author: str = None
year: str = None
cover: str = None
confidence: int = 1
def __repr__(self):

View file

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

View file

@ -95,10 +95,12 @@ 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):
def get_cover_url(self, cover_blob, size='L'):
""" ask openlibrary for the cover """
if not cover_blob:
return None
cover_id = cover_blob[0]
image_name = "%s-L.jpg" % cover_id
image_name = "%s-%s.jpg" % (cover_id, size)
return "%s/b/id/%s" % (self.covers_url, image_name)
def parse_search_data(self, data):
@ -108,12 +110,15 @@ class Connector(AbstractConnector):
# build the remote id from the openlibrary key
key = self.books_url + search_result["key"]
author = search_result.get("author_name") or ["Unknown"]
cover_blob = search_result.get("cover_i")
cover = self.get_cover_url([cover_blob], size='M') if cover_blob else None
return SearchResult(
title=search_result.get("title"),
key=key,
author=", ".join(author),
connector=self,
year=search_result.get("first_publish_year"),
cover=cover,
)
def parse_isbn_search_data(self, data):

View file

@ -67,20 +67,12 @@ class Connector(AbstractConnector):
if search_result.published_date
else None,
connector=self,
cover='%s%s' % (self.covers_url, search_result.cover),
confidence=search_result.rank if hasattr(search_result, "rank") else 1,
)
def format_isbn_search_result(self, search_result):
return SearchResult(
title=search_result.title,
key=search_result.remote_id,
author=search_result.author_text,
year=search_result.published_date.year
if search_result.published_date
else None,
connector=self,
confidence=search_result.rank if hasattr(search_result, "rank") else 1,
)
return self.format_search_result(search_result)
def is_work_data(self, data):
pass

View file

@ -76,7 +76,7 @@ def init_connectors():
connector_file="self_connector",
base_url="https://%s" % DOMAIN,
books_url="https://%s/book" % DOMAIN,
covers_url="https://%s/images/covers" % DOMAIN,
covers_url="https://%s/images/" % DOMAIN,
search_url="https://%s/search?q=" % DOMAIN,
isbn_search_url="https://%s/isbn/" % DOMAIN,
priority=1,
@ -88,7 +88,7 @@ def init_connectors():
connector_file="bookwyrm_connector",
base_url="https://bookwyrm.social",
books_url="https://bookwyrm.social/book",
covers_url="https://bookwyrm.social/images/covers",
covers_url="https://bookwyrm.social/images/",
search_url="https://bookwyrm.social/search?q=",
isbn_search_url="https://bookwyrm.social/isbn/",
priority=2,

View file

@ -19,7 +19,7 @@
<ul>
{% for result in local_results.results %}
<li class="pd-4">
<a href="{{ result.key }}">{% include 'snippets/search_result_text.html' with result=result link=True %}</a>
{% include 'snippets/search_result_text.html' with result=result %}
</li>
{% endfor %}
</ul>
@ -50,12 +50,7 @@
<ul>
{% for result in result_set.results %}
<li class="pb-4">
<form action="/resolve-book" method="POST">
{% csrf_token %}
<input type="hidden" name="remote_id" value="{{ result.key }}">
<div>{% include 'snippets/search_result_text.html' with result=result link=False %}</div>
<button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
</form>
{% include 'snippets/search_result_text.html' with result=result remote_result=True %}
</li>
{% endfor %}
</ul>

View file

@ -1,3 +1,34 @@
{% load i18n %}
<strong>{% if link %}<a href="{{ result.key }}">{{ result.title }}</a>{% else %}{{ result.title }}{% endif %}</strong>
{% if result.author %} {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }}){% endif %}
<div class="columns is-mobile">
<div class="cover-container is-small column is-2">
{% if result.cover %}
<img src="{{ result.cover }}" class="book-cover" aria-hidden="true">
{% else %}
<div class="no-cover book-cover">
<img class="book-cover" src="/static/images/no_cover.jpg" aria-hidden="true">
<div>
<p>{% trans "No cover" %}</p>
</div>
</div>
{% endif %}
</div>
<div class="column">
<p>
<strong>
<a href="{{ result.key }}"{% if remote_result %} rel=”noopener” target="_blank"{% endif %}>{{ result.title }}</a>
</strong>
{% if result.author %}
{% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }})
{% endif %}
</p>
{% if remote_result %}
<form action="/resolve-book" method="POST">
{% csrf_token %}
<input type="hidden" name="remote_id" value="{{ result.key }}">
<button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
</form>
{% endif %}
</div>
</div>