From 1569e189ed84d9855ac1a9b4ee0e0eaae74f5890 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 30 Oct 2021 09:15:39 +0530 Subject: [PATCH 1/2] update migrate thumbnail copies --- src/utils/strings/englishConstants.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index fbf1bca96..2182765ca 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -588,7 +588,7 @@ const englishConstants = { ), REPLACE_THUMBNAIL_COMPLETED: () => ( - <>successfully compressed all thumbnails + <>you have no thumbnails that can be compressed further ), REPLACE_THUMBNAIL_COMPLETED_WITH_ERROR: () => ( <>could not compress some of your thumbnails, please retry From f4097effd22420fb03ff99ef03831784fed171ae Mon Sep 17 00:00:00 2001 From: Abhinav Date: Sat, 30 Oct 2021 18:02:13 +0530 Subject: [PATCH 2/2] adds new NOOP state for for when no files present to be compressed and use Completed when fix completes --- src/components/FixLargeThumbnail.tsx | 14 +++++++++++--- src/utils/strings/englishConstants.tsx | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/FixLargeThumbnail.tsx b/src/components/FixLargeThumbnail.tsx index 12de7731b..bc9f6f2c2 100644 --- a/src/components/FixLargeThumbnail.tsx +++ b/src/components/FixLargeThumbnail.tsx @@ -24,6 +24,7 @@ interface Props { export enum FIX_STATE { NOT_STARTED, FIX_LATER, + NOOP, RUNNING, COMPLETED, COMPLETED_WITH_ERRORS, @@ -38,6 +39,9 @@ function Message(props: { fixState: FIX_STATE }) { case FIX_STATE.COMPLETED: message = constants.REPLACE_THUMBNAIL_COMPLETED(); break; + case FIX_STATE.NOOP: + message = constants.REPLACE_THUMBNAIL_NOOP(); + break; case FIX_STATE.COMPLETED_WITH_ERRORS: message = constants.REPLACE_THUMBNAIL_COMPLETED_WITH_ERROR(); break; @@ -64,6 +68,10 @@ export default function FixLargeThumbnails(props: Props) { fixState = FIX_STATE.NOT_STARTED; updateFixState(fixState); } + if (fixState === FIX_STATE.COMPLETED) { + fixState = FIX_STATE.NOOP; + updateFixState(fixState); + } setFixState(fixState); return fixState; }; @@ -83,14 +91,14 @@ export default function FixLargeThumbnails(props: Props) { props.show(); } if ( - fixState === FIX_STATE.COMPLETED && + (fixState === FIX_STATE.COMPLETED || fixState === FIX_STATE.NOOP) && largeThumbnailFiles.length > 0 ) { updateFixState(FIX_STATE.NOT_STARTED); logError(Error(), 'large thumbnail files left after migration'); } - if (largeThumbnailFiles.length === 0) { - updateFixState(FIX_STATE.COMPLETED); + if (largeThumbnailFiles.length === 0 && fixState !== FIX_STATE.NOOP) { + updateFixState(FIX_STATE.NOOP); } }; useEffect(() => { diff --git a/src/utils/strings/englishConstants.tsx b/src/utils/strings/englishConstants.tsx index 2182765ca..03a5b4544 100644 --- a/src/utils/strings/englishConstants.tsx +++ b/src/utils/strings/englishConstants.tsx @@ -588,6 +588,9 @@ const englishConstants = { ), REPLACE_THUMBNAIL_COMPLETED: () => ( + <>successfully compressed all thumbnails + ), + REPLACE_THUMBNAIL_NOOP: () => ( <>you have no thumbnails that can be compressed further ), REPLACE_THUMBNAIL_COMPLETED_WITH_ERROR: () => (