From f4ca435657ae3882ce28fb3f427f9e0874733282 Mon Sep 17 00:00:00 2001 From: Ruin0x11 Date: Fri, 7 May 2021 23:02:59 -0700 Subject: [PATCH 1/3] If one post fails to upload, don't prevent the rest from uploading --- .../js/controllers/post_upload_controller.js | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js index d317be5..cfebb0a 100644 --- a/client/js/controllers/post_upload_controller.js +++ b/client/js/controllers/post_upload_controller.js @@ -12,7 +12,7 @@ const PostUploadView = require("../views/post_upload_view.js"); const EmptyView = require("../views/empty_view.js"); const genericErrorMessage = - "One of the posts needs your attention; " + + "One or more posts needs your attention; " + 'click "resume upload" when you\'re ready.'; class PostUploadController { @@ -55,6 +55,7 @@ class PostUploadController { _evtSubmit(e) { this._view.disableForm(); this._view.clearMessages(); + let anyFailures = false; e.detail.uploadables .reduce( @@ -64,37 +65,43 @@ class PostUploadController { uploadable, e.detail.skipDuplicates ) + .catch((error) => { + anyFailures = true; + if (error.uploadable) { + if (error.similarPosts) { + error.uploadable.lookalikes = error.similarPosts; + this._view.updateUploadable(error.uploadable); + this._view.showInfo( + error.message, + error.uploadable + ); + } else { + this._view.showError( + error.message, + error.uploadable + ); + } + } else { + this._view.showError( + error.message, + error.uploadable + ); + } + }) ), Promise.resolve() ) .then( () => { - this._view.clearMessages(); - misc.disableExitConfirmation(); - const ctx = router.show(uri.formatClientLink("posts")); - ctx.controller.showSuccess("Posts uploaded."); - }, - (error) => { - if (error.uploadable) { - if (error.similarPosts) { - error.uploadable.lookalikes = error.similarPosts; - this._view.updateUploadable(error.uploadable); - this._view.showInfo(genericErrorMessage); - this._view.showInfo( - error.message, - error.uploadable - ); - } else { - this._view.showError(genericErrorMessage); - this._view.showError( - error.message, - error.uploadable - ); - } + if (anyFailures) { + this._view.showError(genericErrorMessage); + this._view.enableForm(); } else { - this._view.showError(error.message); + this._view.clearMessages(); + misc.disableExitConfirmation(); + const ctx = router.show(uri.formatClientLink("posts")); + ctx.controller.showSuccess("Posts uploaded."); } - this._view.enableForm(); } ); } From 516b3a51a754ee7f0e4ec30ac1a08db99eb8731b Mon Sep 17 00:00:00 2001 From: Ruin0x11 Date: Fri, 7 May 2021 23:11:29 -0700 Subject: [PATCH 2/3] Option to always upload similar posts instead of confirming every time --- client/css/post-upload.styl | 5 +++++ client/html/post_upload.tpl | 8 ++++++++ client/js/controllers/post_upload_controller.js | 9 +++++---- client/js/views/post_upload_view.js | 5 +++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/client/css/post-upload.styl b/client/css/post-upload.styl index aa36e0a..3836293 100644 --- a/client/css/post-upload.styl +++ b/client/css/post-upload.styl @@ -13,8 +13,10 @@ $cancel-button-color = tomato &.inactive input[type=submit], &.inactive .skip-duplicates + &.inactive .always-upload-similar &.uploading input[type=submit], &.uploading .skip-duplicates, + &.uploading .always-upload-similar &:not(.uploading) .cancel display: none @@ -39,6 +41,9 @@ $cancel-button-color = tomato .skip-duplicates margin-left: 1em + .always-upload-similar + margin-left: 1em + form>.messages margin-top: 1em diff --git a/client/html/post_upload.tpl b/client/html/post_upload.tpl index f1ed88f..6374fe8 100644 --- a/client/html/post_upload.tpl +++ b/client/html/post_upload.tpl @@ -13,6 +13,14 @@ }) %> + + <%= ctx.makeCheckbox({ + text: 'Always upload similar', + name: 'always-upload-similar', + checked: false, + }) %> + + diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js index cfebb0a..83ec271 100644 --- a/client/js/controllers/post_upload_controller.js +++ b/client/js/controllers/post_upload_controller.js @@ -63,7 +63,8 @@ class PostUploadController { promise.then(() => this._uploadSinglePost( uploadable, - e.detail.skipDuplicates + e.detail.skipDuplicates, + e.detail.alwaysUploadSimilar ) .catch((error) => { anyFailures = true; @@ -84,7 +85,7 @@ class PostUploadController { } else { this._view.showError( error.message, - error.uploadable + uploadable ); } }) @@ -106,7 +107,7 @@ class PostUploadController { ); } - _uploadSinglePost(uploadable, skipDuplicates) { + _uploadSinglePost(uploadable, skipDuplicates, alwaysUploadSimilar) { progress.start(); let reverseSearchPromise = Promise.resolve(); if (!uploadable.lookalikesConfirmed) { @@ -135,7 +136,7 @@ class PostUploadController { } // notify about similar posts - if (searchResult.similarPosts.length) { + if (searchResult.similarPosts.length && !alwaysUploadSimilar) { let error = new Error( `Found ${searchResult.similarPosts.length} similar ` + "posts.\nYou can resume or discard this upload." diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js index 7daf4fb..49aab7f 100644 --- a/client/js/views/post_upload_view.js +++ b/client/js/views/post_upload_view.js @@ -350,6 +350,7 @@ class PostUploadView extends events.EventTarget { detail: { uploadables: this._uploadables, skipDuplicates: this._skipDuplicatesCheckboxNode.checked, + alwaysUploadSimilar: this._alwaysUploadSimilarCheckboxNode.checked, }, }) ); @@ -413,6 +414,10 @@ class PostUploadView extends events.EventTarget { return this._hostNode.querySelector("form [name=skip-duplicates]"); } + get _alwaysUploadSimilarCheckboxNode() { + return this._hostNode.querySelector("form [name=always-upload-similar]"); + } + get _submitButtonNode() { return this._hostNode.querySelector("form [type=submit]"); } From f5338ca508bdcc0a2b30fe98dd3734f6343d407e Mon Sep 17 00:00:00 2001 From: Shyam Sunder Date: Mon, 13 Sep 2021 13:26:57 -0400 Subject: [PATCH 3/3] Fix style --- .../js/controllers/post_upload_controller.js | 37 ++++++++++--------- client/js/views/post_upload_view.js | 7 +++- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/client/js/controllers/post_upload_controller.js b/client/js/controllers/post_upload_controller.js index 83ec271..a54baec 100644 --- a/client/js/controllers/post_upload_controller.js +++ b/client/js/controllers/post_upload_controller.js @@ -65,13 +65,15 @@ class PostUploadController { uploadable, e.detail.skipDuplicates, e.detail.alwaysUploadSimilar - ) - .catch((error) => { + ).catch((error) => { anyFailures = true; if (error.uploadable) { if (error.similarPosts) { - error.uploadable.lookalikes = error.similarPosts; - this._view.updateUploadable(error.uploadable); + error.uploadable.lookalikes = + error.similarPosts; + this._view.updateUploadable( + error.uploadable + ); this._view.showInfo( error.message, error.uploadable @@ -92,19 +94,17 @@ class PostUploadController { ), Promise.resolve() ) - .then( - () => { - if (anyFailures) { - this._view.showError(genericErrorMessage); - this._view.enableForm(); - } else { - this._view.clearMessages(); - misc.disableExitConfirmation(); - const ctx = router.show(uri.formatClientLink("posts")); - ctx.controller.showSuccess("Posts uploaded."); - } + .then(() => { + if (anyFailures) { + this._view.showError(genericErrorMessage); + this._view.enableForm(); + } else { + this._view.clearMessages(); + misc.disableExitConfirmation(); + const ctx = router.show(uri.formatClientLink("posts")); + ctx.controller.showSuccess("Posts uploaded."); } - ); + }); } _uploadSinglePost(uploadable, skipDuplicates, alwaysUploadSimilar) { @@ -136,7 +136,10 @@ class PostUploadController { } // notify about similar posts - if (searchResult.similarPosts.length && !alwaysUploadSimilar) { + if ( + searchResult.similarPosts.length && + !alwaysUploadSimilar + ) { let error = new Error( `Found ${searchResult.similarPosts.length} similar ` + "posts.\nYou can resume or discard this upload." diff --git a/client/js/views/post_upload_view.js b/client/js/views/post_upload_view.js index 49aab7f..0e8489b 100644 --- a/client/js/views/post_upload_view.js +++ b/client/js/views/post_upload_view.js @@ -350,7 +350,8 @@ class PostUploadView extends events.EventTarget { detail: { uploadables: this._uploadables, skipDuplicates: this._skipDuplicatesCheckboxNode.checked, - alwaysUploadSimilar: this._alwaysUploadSimilarCheckboxNode.checked, + alwaysUploadSimilar: this._alwaysUploadSimilarCheckboxNode + .checked, }, }) ); @@ -415,7 +416,9 @@ class PostUploadView extends events.EventTarget { } get _alwaysUploadSimilarCheckboxNode() { - return this._hostNode.querySelector("form [name=always-upload-similar]"); + return this._hostNode.querySelector( + "form [name=always-upload-similar]" + ); } get _submitButtonNode() {