From 53078f41a08d8be678bf12eb21f285f3d7a83940 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Sun, 17 Nov 2019 02:11:27 +0100
Subject: [PATCH] Frontend: Run import / index in background (cancel request)

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 frontend/src/common/api.js            |  4 ++++
 frontend/src/pages/library/import.vue | 24 ++++++++++++++++++++++--
 frontend/src/pages/library/index.vue  | 26 +++++++++++++++++++++++---
 internal/photoprism/indexer.go        | 18 ++++++------------
 4 files changed, 55 insertions(+), 17 deletions(-)

diff --git a/frontend/src/common/api.js b/frontend/src/common/api.js
index 8ec18c1ec..5c9c7f394 100644
--- a/frontend/src/common/api.js
+++ b/frontend/src/common/api.js
@@ -24,6 +24,10 @@ Api.interceptors.response.use(function (response) {
 }, function (error) {
     Notify.ajaxEnd();
 
+    if (Axios.isCancel(error)) {
+        return Promise.reject(error);
+    }
+
     if(console && console.log) {
         console.log(error);
     }
diff --git a/frontend/src/pages/library/import.vue b/frontend/src/pages/library/import.vue
index 9cf7297c5..a0bd27a44 100644
--- a/frontend/src/pages/library/import.vue
+++ b/frontend/src/pages/library/import.vue
@@ -27,6 +27,8 @@
 </template>
 
 <script>
+    import Api from "common/api";
+    import Axios from "axios";
     import Notify from "common/notify";
     import Event from "pubsub-js";
 
@@ -39,6 +41,7 @@
                 completed: 0,
                 subscriptionId: '',
                 fileName: '',
+                source: null,
             }
         },
         methods: {
@@ -46,25 +49,42 @@
                 // DO NOTHING
             },
             startImport() {
+                this.source = Axios.CancelToken.source();
                 this.started = Date.now();
                 this.busy = true;
                 this.completed = 0;
                 this.fileName = '';
 
                 const ctx = this;
+                Notify.blockUI();
 
-                this.$api.post('import').then(function () {
+                Api.post('import', {}, { cancelToken: this.source.token }).then(function () {
+                    Notify.unblockUI();
                     ctx.busy = false;
                     ctx.completed = 100;
                     ctx.fileName = '';
-                }).catch(function () {
+                }).catch(function (e) {
+                    Notify.unblockUI();
+
+                    if (Axios.isCancel(e)) {
+                        // run in background
+                        return
+                    }
+
                     Notify.error("Import failed");
+
                     ctx.busy = false;
                     ctx.completed = 0;
                     ctx.fileName = '';
                 });
             },
             handleEvent(ev, data) {
+                if(this.source) {
+                    this.source.cancel('run in background');
+                    this.source = null;
+                    Notify.unblockUI();
+                }
+
                 const type = ev.split('.')[1];
 
                 switch (type) {
diff --git a/frontend/src/pages/library/index.vue b/frontend/src/pages/library/index.vue
index 4f3300c15..7b062ab4a 100644
--- a/frontend/src/pages/library/index.vue
+++ b/frontend/src/pages/library/index.vue
@@ -3,7 +3,7 @@
         <v-form ref="form" class="p-photo-index" lazy-validation @submit.prevent="submit" dense>
             <v-container fluid>
                 <p class="subheading">
-                    <span v-if="fileName">Indexed {{ fileName}}...</span>
+                    <span v-if="fileName">Indexing {{ fileName }}...</span>
                     <span v-else-if="busy">Re-indexing existing files and photos...</span>
                     <span v-else-if="completed">Done.</span>
                     <span v-else>Press button to re-index existing files and photos...</span>
@@ -27,6 +27,8 @@
 </template>
 
 <script>
+    import Api from "common/api";
+    import Axios from "axios";
     import Notify from "common/notify";
     import Event from "pubsub-js";
 
@@ -39,6 +41,7 @@
                 completed: 0,
                 subscriptionId: '',
                 fileName: '',
+                source: null,
             }
         },
         methods: {
@@ -46,25 +49,42 @@
                 // DO NOTHING
             },
             startIndexing() {
+                this.source = Axios.CancelToken.source();
                 this.started = Date.now();
                 this.busy = true;
                 this.completed = 0;
                 this.fileName = '';
 
                 const ctx = this;
+                Notify.blockUI();
 
-                this.$api.post('index').then(function () {
+                Api.post('index', {}, { cancelToken: this.source.token }).then(function () {
+                    Notify.unblockUI();
                     ctx.busy = false;
                     ctx.completed = 100;
                     ctx.fileName = '';
-                }).catch(function () {
+                }).catch(function (e) {
+                    Notify.unblockUI();
+
+                    if (Axios.isCancel(e)) {
+                        // run in background
+                        return
+                    }
+
                     Notify.error("Indexing failed");
+
                     ctx.busy = false;
                     ctx.completed = 0;
                     ctx.fileName = '';
                 });
             },
             handleEvent(ev, data) {
+                if(this.source) {
+                    this.source.cancel('run in background');
+                    this.source = null;
+                    Notify.unblockUI();
+                }
+
                 const type = ev.split('.')[1];
 
                 switch (type) {
diff --git a/internal/photoprism/indexer.go b/internal/photoprism/indexer.go
index 1040d2cb0..a731bfa9e 100644
--- a/internal/photoprism/indexer.go
+++ b/internal/photoprism/indexer.go
@@ -114,6 +114,12 @@ func (i *Indexer) indexMediaFile(mediaFile *MediaFile) string {
 	fileName := mediaFile.RelativeFilename(i.originalsPath())
 	fileHash := mediaFile.Hash()
 
+	event.Publish("index.file", event.Data{
+		"fileHash": fileHash,
+		"fileName": fileName,
+		"baseName": filepath.Base(fileName),
+	})
+
 	exifData, err := mediaFile.Exif()
 
 	if err != nil {
@@ -339,18 +345,6 @@ func (i *Indexer) indexMediaFile(mediaFile *MediaFile) string {
 		file.FilePortrait = mediaFile.Width() < mediaFile.Height()
 	}
 
-	event.Publish("index.file", event.Data{
-		"photoID": file.PhotoID,
-		"filePrimary": file.FilePrimary,
-		"fileMissing":  file.FileMissing,
-		"fileName": file.FileName,
-		"baseName": filepath.Base(file.FileName),
-		"fileHash": file.FileHash,
-		"fileType": file.FileType,
-		"fileMime": file.FileMime,
-		"updated": fileQuery.Error == nil,
-	})
-
 	if fileQuery.Error == nil {
 		i.db.Unscoped().Save(&file)
 		return indexResultUpdated