ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/posts: fix skipping duplicate uploads

Browse source
This commit is contained in:
rr- 2017-01-15 14:58:29 +01:00
parent fb71b81c62
commit 8934b85c92
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
client/js/controllers/post_upload_controller.js
View file

@ -95,16 +95,20 @@ class PostUploadController {
return reverseSearchPromise.then(searchResult => { return reverseSearchPromise.then(searchResult => {
if (searchResult) { if (searchResult) {
// notify about exact duplicate // notify about exact duplicate
if (searchResult.exactPost && !skipDuplicates) { if (searchResult.exactPost) {
let error = new Error('Post already uploaded ' + if (skipDuplicates) {
`(@${searchResult.exactPost.id})`); this._view.removeUploadable(uploadable);
error.uploadable = uploadable; return Promise.resolve();
return Promise.reject(error); } else {
let error = new Error('Post already uploaded ' +
`(@${searchResult.exactPost.id})`);
error.uploadable = uploadable;
return Promise.reject(error);
}
} }
// notify about similar posts // notify about similar posts
if (!searchResult.exactPost && if (searchResult.similarPosts.length) {
searchResult.similarPosts.length) {
let error = new Error( let error = new Error(
`Found ${searchResult.similarPosts.length} similar ` + `Found ${searchResult.similarPosts.length} similar ` +
'posts.\nYou can resume or discard this upload.'); 'posts.\nYou can resume or discard this upload.');