From 6792b3d7b8fc29e96f4e420766b91a5bdc603e71 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 5 Nov 2022 14:44:09 -0700
Subject: [PATCH] adds button to stop job

---
 bookwyrm/templates/import/import_status.html | 7 +++++++
 bookwyrm/urls.py                             | 5 +++++
 bookwyrm/views/__init__.py                   | 2 +-
 bookwyrm/views/imports/import_status.py      | 6 +++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/import/import_status.html b/bookwyrm/templates/import/import_status.html
index 03d7601c4..757ed49a9 100644
--- a/bookwyrm/templates/import/import_status.html
+++ b/bookwyrm/templates/import/import_status.html
@@ -66,6 +66,13 @@
     </div>
     {% endif %}
 
+    {% if not job.complete %}
+    <form name="stop-import" action="{% url 'import-stop' job.id %}" method="POST">
+        {% csrf_token %}
+        <button class="button is-danger" type="submit">{% trans "Stop import" %}</button>
+    </form>
+    {% endif %}
+
     {% if manual_review_count and not legacy %}
     <div class="notification">
         {% blocktrans trimmed count counter=manual_review_count with display_counter=manual_review_count|intcomma %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 95857faa4..16683e52d 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -353,6 +353,11 @@ urlpatterns = [
         views.ImportStatus.as_view(),
         name="import-status",
     ),
+    re_path(
+        r"^import/(?P<job_id>\d+)/stop/?$",
+        views.stop_import,
+        name="import-stop",
+    ),
     re_path(
         r"^import/(?P<job_id>\d+)/retry/(?P<item_id>\d+)/?$",
         views.retry_item,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index dadb813a8..c900ab175 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -74,7 +74,7 @@ from .shelf.shelf_actions import shelve, unshelve
 
 # csv import
 from .imports.import_data import Import
-from .imports.import_status import ImportStatus, retry_item
+from .imports.import_status import ImportStatus, retry_item, stop_import
 from .imports.troubleshoot import ImportTroubleshoot
 from .imports.manually_review import (
     ImportManualReview,
diff --git a/bookwyrm/views/imports/import_status.py b/bookwyrm/views/imports/import_status.py
index 09b2d1fe5..87adbb454 100644
--- a/bookwyrm/views/imports/import_status.py
+++ b/bookwyrm/views/imports/import_status.py
@@ -78,8 +78,8 @@ def retry_item(request, job_id, item_id):
 
 @login_required
 @require_POST
-def cancel_import(request, job_id):
+def stop_import(request, job_id):
     """scrap that"""
-    job = get_object_or_404(models.ImportJob, id=job_id, job__user=request.user)
-    job.stop()
+    job = get_object_or_404(models.ImportJob, id=job_id, user=request.user)
+    job.stop_job()
     return redirect("import-status", job_id)