zedfrigg/bookwyrm
1
0
Fork 0
Code Activity

Merge pull request #160 from mouse-reeve/search-controls

Browse source 
Separate out local and remote search results
This commit is contained in:
Mouse Reeve 2020-05-03 18:10:01 -07:00 • committed by GitHub
commit fba1397444
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 116 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fedireads/connectors/abstract_connector.py
View file

@ -14,11 +14,14 @@ class AbstractConnector(ABC):
info = models.Connector.objects.get(identifier=identifier)
self.connector = info
self.url = info.base_url
self.base_url = info.base_url
self.books_url = info.books_url
self.covers_url = info.covers_url
self.search_url = info.search_url
self.key_name = info.key_name
self.max_query_count = info.max_query_count
self.name = info.name
self.local = info.local
def is_available(self):

6
fedireads/connectors/openlibrary.py
View file

@ -166,7 +166,7 @@ class Connector(AbstractConnector):
def load_book_data(self, olkey):
''' query openlibrary for data on a book '''
response = requests.get('%s/works/%s.json' % (self.url, olkey))
response = requests.get('%s/works/%s.json' % (self.books_url, olkey))
if not response.ok:
response.raise_for_status()
data = response.json()
@ -176,7 +176,7 @@ class Connector(AbstractConnector):
def load_edition_data(self, olkey):
''' query openlibrary for editions of a work '''
response = requests.get(
'%s/works/%s/editions.json' % (self.url, olkey))
'%s/works/%s/editions.json' % (self.books_url, olkey))
if not response.ok:
response.raise_for_status()
data = response.json()
@ -209,7 +209,7 @@ class Connector(AbstractConnector):
except models.Author.DoesNotExist:
pass
response = requests.get('%s/authors/%s.json' % (self.url, olkey))
response = requests.get('%s/authors/%s.json' % (self.base_url, olkey))
if not response.ok:
response.raise_for_status()