+
+
{% trans "Matching Books" %}
+
+ {% if not results %}
+ {% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}
+ {% else %}
+
+ {% endif %}
+
+
+
+
+
+{% endwith %}
+{% endblock %}
diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 6e912858..1b382104 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -42,6 +42,10 @@ class AbstractConnector(TestCase):
return search_result
def parse_search_data(self, data):
return data
+ def format_isbn_search_result(self, search_result):
+ return search_result
+ def parse_isbn_search_data(self, data):
+ return data
def is_work_data(self, data):
return data['type'] == 'work'
def get_edition_from_work_data(self, data):
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index 0c6d2535..9b939067 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -18,6 +18,7 @@ class AbstractConnector(TestCase):
books_url='https://example.com/books',
covers_url='https://example.com/covers',
search_url='https://example.com/search?q=',
+ isbn_search_url='https://example.com/isbn',
)
class TestConnector(abstract_connector.AbstractMinimalConnector):
@@ -28,6 +29,10 @@ class AbstractConnector(TestCase):
pass
def parse_search_data(self, data):
return data
+ def format_isbn_search_result(self, search_result):
+ return search_result
+ def parse_isbn_search_data(self, data):
+ return data
self.test_connector = TestConnector('example.com')
@@ -39,6 +44,7 @@ class AbstractConnector(TestCase):
self.assertEqual(connector.books_url, 'https://example.com/books')
self.assertEqual(connector.covers_url, 'https://example.com/covers')
self.assertEqual(connector.search_url, 'https://example.com/search?q=')
+ self.assertEqual(connector.isbn_search_url, 'https://example.com/isbn')
self.assertIsNone(connector.name)
self.assertEqual(connector.identifier, 'example.com')
self.assertIsNone(connector.max_query_count)
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index 576e353b..a174300a 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -27,6 +27,7 @@ class Openlibrary(TestCase):
books_url='https://openlibrary.org',
covers_url='https://covers.openlibrary.org',
search_url='https://openlibrary.org/search?q=',
+ isbn_search_url='https://openlibrary.org/isbn',
)
self.connector = Connector('openlibrary.org')
@@ -149,6 +150,34 @@ class Openlibrary(TestCase):
self.assertEqual(result.connector, self.connector)
+ def test_parse_isbn_search_result(self):
+ ''' extract the results from the search json response '''
+ datafile = pathlib.Path(__file__).parent.joinpath(
+ '../data/ol_isbn_search.json')
+ search_data = json.loads(datafile.read_bytes())
+ result = self.connector.parse_isbn_search_data(search_data)
+ self.assertIsInstance(result, list)
+ self.assertEqual(len(result), 1)
+
+
+ def test_format_isbn_search_result(self):
+ ''' translate json from openlibrary into SearchResult '''
+ datafile = pathlib.Path(__file__).parent.joinpath(
+ '../data/ol_isbn_search.json')
+ search_data = json.loads(datafile.read_bytes())
+ results = self.connector.parse_isbn_search_data(search_data)
+ self.assertIsInstance(results, list)
+
+ result = self.connector.format_isbn_search_result(results[0])
+ self.assertIsInstance(result, SearchResult)
+ self.assertEqual(result.title, 'Les ombres errantes')
+ self.assertEqual(
+ result.key, 'https://openlibrary.org/books/OL16262504M')
+ self.assertEqual(result.author, 'Pascal Quignard')
+ self.assertEqual(result.year, '2002')
+ self.assertEqual(result.connector, self.connector)
+
+
@responses.activate
def test_load_edition_data(self):
''' format url from key and make request '''
diff --git a/bookwyrm/tests/data/ol_isbn_search.json b/bookwyrm/tests/data/ol_isbn_search.json
new file mode 100644
index 00000000..8516ff06
--- /dev/null
+++ b/bookwyrm/tests/data/ol_isbn_search.json
@@ -0,0 +1,45 @@
+{
+ "ISBN:9782070427796": {
+ "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
+ "key": "/books/OL16262504M",
+ "title": "Les ombres errantes",
+ "authors": [
+ {
+ "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
+ "name": "Pascal Quignard"
+ }
+ ],
+ "by_statement": "Pascal Quignard.",
+ "identifiers": {
+ "goodreads": [
+ "1835483"
+ ],
+ "librarything": [
+ "983474"
+ ],
+ "isbn_10": [
+ "207042779X"
+ ],
+ "openlibrary": [
+ "OL16262504M"
+ ]
+ },
+ "classifications": {
+ "dewey_decimal_class": [
+ "848/.91403"
+ ]
+ },
+ "publishers": [
+ {
+ "name": "Gallimard"
+ }
+ ],
+ "publish_places": [
+ {
+ "name": "Paris"
+ }
+ ],
+ "publish_date": "2002",
+ "notes": "Hardback published Grasset, 2002."
+ }
+}
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
new file mode 100644
index 00000000..1966702b
--- /dev/null
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -0,0 +1,54 @@
+''' test for app action functionality '''
+import json
+from unittest.mock import patch
+
+from django.http import JsonResponse
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.connectors import abstract_connector
+from bookwyrm.settings import DOMAIN
+
+
+class IsbnViews(TestCase):
+ ''' tag views'''
+ def setUp(self):
+ ''' we need basic test data and mocks '''
+ self.factory = RequestFactory()
+ self.local_user = models.User.objects.create_user(
+ 'mouse@local.com', 'mouse@mouse.com', 'mouseword',
+ local=True, localname='mouse',
+ remote_id='https://example.com/users/mouse',
+ )
+ self.work = models.Work.objects.create(title='Test Work')
+ self.book = models.Edition.objects.create(
+ title='Test Book',
+ isbn_13='1234567890123',
+ remote_id='https://example.com/book/1',
+ parent_work=self.work
+ )
+ models.Connector.objects.create(
+ identifier='self',
+ connector_file='self_connector',
+ local=True
+ )
+ models.SiteSettings.objects.create()
+
+
+ def test_isbn_json_response(self):
+ ''' searches local data only and returns book data in json format '''
+ view = views.Isbn.as_view()
+ request = self.factory.get('')
+ with patch('bookwyrm.views.isbn.is_api_request') as is_api:
+ is_api.return_value = True
+ response = view(request, isbn='1234567890123')
+ self.assertIsInstance(response, JsonResponse)
+
+ data = json.loads(response.content)
+ self.assertEqual(len(data), 1)
+ self.assertEqual(data[0]['title'], 'Test Book')
+ self.assertEqual(
+ data[0]['key'], 'https://%s/book/%d' % (DOMAIN, self.book.id))
+
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 655b4563..5d7109e7 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -64,6 +64,10 @@ class ShelfViews(TestCase):
pass
def parse_search_data(self, data):
pass
+ def format_isbn_search_result(self, search_result):
+ return search_result
+ def parse_isbn_search_data(self, data):
+ return data
models.Connector.objects.create(
identifier='example.com',
connector_file='openlibrary',
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a741088a..1c3da301 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -135,6 +135,9 @@ urlpatterns = [
re_path(r'^resolve-book/?$', views.resolve_book),
re_path(r'^switch-edition/?$', views.switch_edition),
+ # isbn
+ re_path(r'^isbn/(?P
\d+)(.json)?/?$', views.Isbn.as_view()),
+
# author
re_path(r'^author/(?P\d+)(.json)?/?$', views.Author.as_view()),
re_path(r'^author/(?P\d+)/edit/?$', views.EditAuthor.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c7cdc46..dd601b28 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -31,3 +31,4 @@ from .site import Site
from .status import CreateStatus, DeleteStatus
from .updates import Updates
from .user import User, EditUser, Followers, Following
+from .isbn import Isbn
diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py
new file mode 100644
index 00000000..e5539ba3
--- /dev/null
+++ b/bookwyrm/views/isbn.py
@@ -0,0 +1,29 @@
+''' isbn search view '''
+from django.http import HttpResponseNotFound
+from django.http import JsonResponse
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+from bookwyrm.connectors import connector_manager
+from .helpers import is_api_request
+
+# pylint: disable= no-self-use
+class Isbn(View):
+ ''' search a book by isbn '''
+ def get(self, request, isbn):
+ ''' info about a book '''
+ book_results = connector_manager.isbn_local_search(isbn)
+
+ if is_api_request(request):
+ return JsonResponse([r.json() for r in book_results], safe=False)
+
+ data = {
+ 'title': 'ISBN Search Results',
+ 'results': book_results,
+ 'query': isbn,
+ }
+ return TemplateResponse(request, 'isbn_search_results.html', data)