From 2188371f449be287b13c789659910fb1cc9eb27c Mon Sep 17 00:00:00 2001
From: Adam Kelly <adam@cthulahoops.org>
Date: Tue, 24 Mar 2020 16:58:11 +0000
Subject: [PATCH] Display results of import.

---
 fedireads/templates/import_results.html | 28 +++++++++++++++++++++
 fedireads/view_actions.py               | 33 +++++++++++++++++++++++--
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 fedireads/templates/import_results.html

diff --git a/fedireads/templates/import_results.html b/fedireads/templates/import_results.html
new file mode 100644
index 000000000..73996cfa8
--- /dev/null
+++ b/fedireads/templates/import_results.html
@@ -0,0 +1,28 @@
+{% extends 'layout.html' %}
+{% block content %}
+<div id="content">
+    <div>
+        <h1>Search results</h1>
+        {% for book in results %}
+        <div>
+            <a href="{{ book.absolute_id }}">
+            {% include 'snippets/book_cover.html' with book=book %}
+            </a>
+            {{ book.title }}
+            {{ book.author }}
+            {% include 'snippets/shelve_button.html' with book=book pulldown=True %}
+        </div>
+        {% endfor %}
+
+        <h1>Failures</h1>
+        <ul>
+        {% for book in failures %}
+            <li>
+            {{ book.Title }}
+            {{ book.Author }}
+            </li>
+        {% endfor %}
+        </ul>
+    </div>
+</div>
+{% endblock %}
diff --git a/fedireads/view_actions.py b/fedireads/view_actions.py
index ab63f9238..a3e2c2e59 100644
--- a/fedireads/view_actions.py
+++ b/fedireads/view_actions.py
@@ -297,20 +297,49 @@ def unquote_string(text):
     else:
         return text
 
+def construct_search_term(title, author):
+    # Strip brackets (usually series title from search term)
+    title = re.sub(r'\s*\([^)]*\)\s*', '', title)
+    # Open library doesn't like including author initials in search term.
+    author = re.sub(r'(\w\.)+\s*', '', author)
+
+    return ' '.join([title, author])
+    
 import itertools
 from io import TextIOWrapper
+from requests import HTTPError
 
 @login_required
 def import_data(request):
     form = forms.ImportForm(request.POST, request.FILES)
     if form.is_valid():
         reader = csv.DictReader(TextIOWrapper(request.FILES['csv_file'], encoding=request.encoding))
-        for line in itertools.islice(reader, 10):
+        results = []
+        failures = []
+        for line in itertools.islice(reader, 20):
             isbn = unquote_string(line['ISBN13'])
             print(line['Title'], isbn, line['Exclusive Shelf'])
             search_results = books_manager.search(isbn)
             if search_results:
                 book = books_manager.get_or_create_book(search_results[0].key)
-        return HttpResponse('thanks')
+                print(book)
+                results.append(book)
+            else:
+                try:
+                    search_term = construct_search_term(line['Title'], line['Author'])
+                    print("Search term: ", search_term)
+                    search_results = books_manager.search(search_term)
+                    if search_results:
+                        book = books_manager.get_or_create_book(search_results[0].key)
+                        print(book)
+                        results.append(book)
+                    else:
+                        failures.append(line)
+                except HTTPError:
+                    failures.append(line) # 
+        return TemplateResponse(request, 'import_results.html', {
+                'results': results,
+                'failures': failures
+            })
     else:
         return HttpResponseBadRequest()