Feat/improvements to goodreads import feature

bundlesize.config.json

@@ -40,10 +40,6 @@
       "path": "static/build/js/readinglog-stats.*.js",
       "maxSize": "137KB"
     },
-    {
-      "path": "static/build/js/goodreads-import.*.js",
-      "maxSize": "2KB"
-    },
     {
       "path": "static/build/js/admin.*.js",
       "maxSize": "1.3KB"

openlibrary/i18n/messages.pot

@@ -146,11 +146,12 @@ msgstr ""
 msgid "Create new list"
 msgstr ""
 
-#: CreateListModal.html EditButtons.html account/notifications.html
-#: account/password/reset.html account/privacy.html admin/imports-add.html
-#: admin/permissions.html books/add.html databarEdit.html interstitial.html
-#: merge/authors.html my_books/dropdown_content.html type/list/edit.html
-#: type/series/edit.html type/tag/form.html
+#: CreateListModal.html EditButtons.html account/import.html
+#: account/notifications.html account/password/reset.html account/privacy.html
+#: admin/imports-add.html admin/permissions.html books/add.html
+#: databarEdit.html interstitial.html merge/authors.html
+#: my_books/dropdown_content.html type/list/edit.html type/series/edit.html
+#: type/tag/form.html
 msgid "Cancel"
 msgstr ""
 
@@ -2870,15 +2871,84 @@ msgid "What are star ratings?"
 msgstr ""
 
 #: account/import.html
-msgid "Importing..."
+msgid "Import Books"
+msgstr ""
+
+#: account/import.html
+msgid "Go to My Books"
+msgstr ""
+
+#: account/import.html
+msgid "Books Ready to Import"
+msgstr ""
+
+#: account/import.html
+msgid "Note:"
+msgstr ""
+
+#: account/import.html
+msgid ""
+"Books from your 'Did Not Finish' shelf will be skipped during import as "
+"we do not currently support it. We plan to add support for this in the "
+"future."
+msgstr ""
+
+#: account/import.html
+msgid "Select all books ready to import"
 msgstr ""
 
 #: account/import.html
 msgid "Reason"
 msgstr ""
 
 #: account/import.html
-msgid "No ISBN"
+msgid "No valid books with ISBNs found to import."
+msgstr ""
+
+#: account/import.html
+msgid "Books Missing ISBNs"
+msgstr ""
+
+#: account/import.html
+msgid ""
+"Unfortunately, these books do not have ISBN codes and currently we can't "
+"import these."
+msgstr ""
+
+#: account/import.html
+msgid "Action"
+msgstr ""
+
+#: account/import.html
+msgid "Search OL"
+msgstr ""
+
+#: account/import.html
+msgid "Importing, please wait..."
+msgstr ""
+
+#: account/import.html
+msgid "Imported"
+msgstr ""
+
+#: account/import.html
+msgid "Unknown error"
+msgstr ""
+
+#: account/import.html
+msgid "Something went wrong. Try again."
+msgstr ""
+
+#: account/import.html
+msgid "Import 1 Book"
+msgstr ""
+
+#: account/import.html
+msgid "Import {count} Books"
+msgstr ""
+
+#: account/import.html
+msgid "Done - {succeeded} imported, {errors} failed"
 msgstr ""
 
 #: account/loan_history.html

openlibrary/plugins/openlibrary/js/index.js

@@ -186,11 +186,6 @@ jQuery(function () {
             });
     }
 
-    // conditionally loads Goodreads import based on class in the page
-    if (document.getElementsByClassName('import-table').length) {
-        import(/* webpackChunkName: "goodreads-import" */'./goodreads_import.js')
-            .then(module => module.initGoodreadsImport());
-    }
     // conditionally load list seed item deletion dialog functionality based on id on lists pages
     if (document.getElementById('listResults')) {
         import(/* webpackChunkName: "ListViewBody" */'./lists/ListViewBody.js');

openlibrary/plugins/upstream/account.py

@@ -858,7 +858,8 @@ def GET(self):
 
     @require_login
     def POST(self):
-        books, books_wo_isbns = process_goodreads_csv(web.input())
+        input_csv = web.input(csv={})
+        books, books_wo_isbns = process_goodreads_csv(input_csv)
         return render['account/import'](books, books_wo_isbns)
 
 
@@ -1379,8 +1380,17 @@ def g(*a, **kw):
 
 
 def process_goodreads_csv(i):
-
-    csv_payload = i.csv if isinstance(i.csv, str) else i.csv.decode()
+    if hasattr(i.csv, 'file'):
+        i.csv.file.seek(0)
+        raw_bytes = i.csv.file.read()
+    else:
+        raw_bytes = i.csv
+
+    csv_payload = (
+        raw_bytes
+        if isinstance(raw_bytes, str)
+        else raw_bytes.decode('utf-8', errors='replace')
+    )
     csv_file = csv.reader(csv_payload.splitlines(), delimiter=',', quotechar='"')
     header = next(csv_file)
     books = {}

openlibrary/plugins/upstream/code.py

@@ -29,6 +29,7 @@
     borrow,  # noqa: F401 side effects may be needed
     checkins,
     covers,
+    data_import,
     edits,
     merge_authors,
     models,
@@ -386,6 +387,7 @@ def setup():
     edits.setup()
     checkins.setup()
     yearly_reading_goals.setup()
+    data_import.setup()
 
     from openlibrary.plugins.upstream import data, jsdef