Remove books manager at long last

bookwyrm/connectors/__init__.py

@@ -1,4 +1,6 @@
 ''' bring connectors into the namespace '''
 from .settings import CONNECTORS
-from .abstract_connector import ConnectorException, load_connector
+from .abstract_connector import ConnectorException
 from .abstract_connector import get_data, get_image
+
+from .connector_manager import search, local_search, first_search_result

bookwyrm/connectors/abstract_connector.py

@@ -1,24 +1,18 @@
 ''' functionality outline for a book data connector '''
 from abc import ABC, abstractmethod
 from dataclasses import asdict, dataclass
-import importlib
 import logging
 from urllib3.exceptions import RequestError
 
 from django.db import transaction
 import requests
-from requests import HTTPError
 from requests.exceptions import SSLError
 
 from bookwyrm import activitypub, models, settings
-from bookwyrm.tasks import app
+from .connector_manager import load_more_data, ConnectorException
 
 
 logger = logging.getLogger(__name__)
-class ConnectorException(HTTPError):
-    ''' when the connector can't do what was asked '''
-
-
 class AbstractMinimalConnector(ABC):
     ''' just the bare bones, for other bookwyrm instances '''
     def __init__(self, identifier):
@@ -192,23 +186,6 @@ class AbstractConnector(AbstractMinimalConnector):
         ''' get more info on a book '''
 
 
-@app.task
-def load_more_data(connector_id, book_id):
-    ''' background the work of getting all 10,000 editions of LoTR '''
-    connector_info = models.Connector.objects.get(id=connector_id)
-    connector = load_connector(connector_info)
-    book = models.Book.objects.select_subclasses().get(id=book_id)
-    connector.expand_book_data(book)
-
-
-def load_connector(connector_info):
-    ''' instantiate the connector class '''
-    connector = importlib.import_module(
-        'bookwyrm.connectors.%s' % connector_info.connector_file
-    )
-    return connector.Connector(connector_info.identifier)
-
-
 def dict_from_mappings(data, mappings):
     ''' create a dict in Activitypub format, using mappings supplies by
     the subclass '''

bookwyrm/connectors/connector_manager.py

@@ -0,0 +1,96 @@
+''' interface with whatever connectors the app has '''
+import importlib
+from urllib.parse import urlparse
+
+from requests import HTTPError
+
+from bookwyrm import models
+from bookwyrm.tasks import app
+
+
+class ConnectorException(HTTPError):
+    ''' when the connector can't do what was asked '''
+
+
+def search(query, min_confidence=0.1):
+    ''' find books based on arbitary keywords '''
+    results = []
+    dedup_slug = lambda r: '%s/%s/%s' % (r.title, r.author, r.year)
+    result_index = set()
+    for connector in get_connectors():
+        try:
+            result_set = connector.search(query, min_confidence=min_confidence)
+        except (HTTPError, ConnectorException):
+            continue
+
+        result_set = [r for r in result_set \
+                if dedup_slug(r) not in result_index]
+        # `|=` concats two sets. WE ARE GETTING FANCY HERE
+        result_index |= set(dedup_slug(r) for r in result_set)
+        results.append({
+            'connector': connector,
+            'results': result_set,
+        })
+
+    return results
+
+
+def local_search(query, min_confidence=0.1):
+    ''' only look at local search results '''
+    connector = load_connector(models.Connector.objects.get(local=True))
+    return connector.search(query, min_confidence=min_confidence)
+
+
+def first_search_result(query, min_confidence=0.1):
+    ''' search until you find a result that fits '''
+    for connector in get_connectors():
+        result = connector.search(query, min_confidence=min_confidence)
+        if result:
+            return result[0]
+    return None
+
+
+def get_connectors():
+    ''' load all connectors '''
+    for info in models.Connector.objects.order_by('priority').all():
+        yield load_connector(info)
+
+
+def get_or_create_connector(remote_id):
+    ''' get the connector related to the author's server '''
+    url = urlparse(remote_id)
+    identifier = url.netloc
+    if not identifier:
+        raise ValueError('Invalid remote id')
+
+    try:
+        connector_info = models.Connector.objects.get(identifier=identifier)
+    except models.Connector.DoesNotExist:
+        connector_info = models.Connector.objects.create(
+            identifier=identifier,
+            connector_file='bookwyrm_connector',
+            base_url='https://%s' % identifier,
+            books_url='https://%s/book' % identifier,
+            covers_url='https://%s/images/covers' % identifier,
+            search_url='https://%s/search?q=' % identifier,
+            priority=2
+        )
+
+    return load_connector(connector_info)
+
+
+@app.task
+def load_more_data(connector_id, book_id):
+    ''' background the work of getting all 10,000 editions of LoTR '''
+    connector_info = models.Connector.objects.get(id=connector_id)
+    connector = load_connector(connector_info)
+    book = models.Book.objects.select_subclasses().get(id=book_id)
+    connector.expand_book_data(book)
+
+
+def load_connector(connector_info):
+    ''' instantiate the connector class '''
+    connector = importlib.import_module(
+        'bookwyrm.connectors.%s' % connector_info.connector_file
+    )
+    return connector.Connector(connector_info.identifier)

bookwyrm/connectors/openlibrary.py

@@ -3,7 +3,7 @@ import re
 
 from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
-from .abstract_connector import ConnectorException, get_data
+from .connector_manager import ConnectorException, get_data
 from .openlibrary_languages import languages