luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Frontend: Run import / index in background (cancel request)

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2019-11-17 02:11:27 +01:00
parent 98cb0b2c28
commit 53078f41a0
4 changed files with 55 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/common/api.js
View file

@ -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);
}

24
frontend/src/pages/library/import.vue
View file

@ -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) {

26
frontend/src/pages/library/index.vue
View file

@ -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) {

18
internal/photoprism/indexer.go
View file

@ -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