From 8a3155999bc880e9c22d4c3ddce73f6d0fa32ab9 Mon Sep 17 00:00:00 2001 From: capak07 <69026837+capak07@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:16:33 -0400 Subject: [PATCH 1/4] Updated compare function to check a edge case --- src/utils/compare.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/utils/compare.ts b/src/utils/compare.ts index cceffb8..53afe8c 100644 --- a/src/utils/compare.ts +++ b/src/utils/compare.ts @@ -1,11 +1,14 @@ import { CommonMedia } from '@/entrypoint/utils/media'; export function normalizeTitle(title: string): string { - return title - .trim() + let titleTrimmed = title.trim(); + if (titleTrimmed !== "The Movie" && titleTrimmed.endsWith("The Movie")) { + titleTrimmed = titleTrimmed.replace("The Movie", ""); + } + return titleTrimmed .toLowerCase() - .replace(/['":]/g, '') - .replace(/[^a-zA-Z0-9]+/g, '_'); + .replace(/['":]/g, "") + .replace(/[^a-zA-Z0-9]+/g, "_"); } export function compareTitle(a: string, b: string): boolean { From bbb39a3aa7f22eac2a338000bfe16d1bb1f4c0bc Mon Sep 17 00:00:00 2001 From: capak07 <69026837+capak07@users.noreply.github.com> Date: Mon, 4 Mar 2024 21:30:02 -0400 Subject: [PATCH 2/4] Addressed comments --- src/utils/compare.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/compare.ts b/src/utils/compare.ts index 53afe8c..db75338 100644 --- a/src/utils/compare.ts +++ b/src/utils/compare.ts @@ -1,12 +1,12 @@ import { CommonMedia } from '@/entrypoint/utils/media'; export function normalizeTitle(title: string): string { - let titleTrimmed = title.trim(); - if (titleTrimmed !== "The Movie" && titleTrimmed.endsWith("The Movie")) { - titleTrimmed = titleTrimmed.replace("The Movie", ""); + let titleTrimmed = title.trim().toLowerCase(); + if (((titleTrimmed !== "the movie" && titleTrimmed.endsWith("the movie")) || + (titleTrimmed !== "the series" && titleTrimmed.endsWith("the series")))) { + titleTrimmed = titleTrimmed.replace("the movie", ""); } return titleTrimmed - .toLowerCase() .replace(/['":]/g, "") .replace(/[^a-zA-Z0-9]+/g, "_"); } From bbd88fd966a7867cc960c5ade6d71a53210baef8 Mon Sep 17 00:00:00 2001 From: capak07 <69026837+capak07@users.noreply.github.com> Date: Thu, 7 Mar 2024 13:20:19 -0400 Subject: [PATCH 3/4] Fixed if condition --- src/utils/compare.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils/compare.ts b/src/utils/compare.ts index db75338..370735f 100644 --- a/src/utils/compare.ts +++ b/src/utils/compare.ts @@ -2,10 +2,12 @@ import { CommonMedia } from '@/entrypoint/utils/media'; export function normalizeTitle(title: string): string { let titleTrimmed = title.trim().toLowerCase(); - if (((titleTrimmed !== "the movie" && titleTrimmed.endsWith("the movie")) || - (titleTrimmed !== "the series" && titleTrimmed.endsWith("the series")))) { + if (((titleTrimmed !== "the movie" && titleTrimmed.endsWith("the movie")))) { titleTrimmed = titleTrimmed.replace("the movie", ""); } + if (((titleTrimmed !== "the series" && titleTrimmed.endsWith("the series")))) { + titleTrimmed = titleTrimmed.replace("the series", ""); + } return titleTrimmed .replace(/['":]/g, "") .replace(/[^a-zA-Z0-9]+/g, "_"); From 7a2c255ea8151d03781a880b94004c82647b7e71 Mon Sep 17 00:00:00 2001 From: Jorrin Date: Thu, 14 Mar 2024 21:44:00 +0100 Subject: [PATCH 4/4] prettier fix --- src/utils/compare.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/utils/compare.ts b/src/utils/compare.ts index 370735f..7db784e 100644 --- a/src/utils/compare.ts +++ b/src/utils/compare.ts @@ -2,15 +2,13 @@ import { CommonMedia } from '@/entrypoint/utils/media'; export function normalizeTitle(title: string): string { let titleTrimmed = title.trim().toLowerCase(); - if (((titleTrimmed !== "the movie" && titleTrimmed.endsWith("the movie")))) { - titleTrimmed = titleTrimmed.replace("the movie", ""); + if (titleTrimmed !== 'the movie' && titleTrimmed.endsWith('the movie')) { + titleTrimmed = titleTrimmed.replace('the movie', ''); } - if (((titleTrimmed !== "the series" && titleTrimmed.endsWith("the series")))) { - titleTrimmed = titleTrimmed.replace("the series", ""); + if (titleTrimmed !== 'the series' && titleTrimmed.endsWith('the series')) { + titleTrimmed = titleTrimmed.replace('the series', ''); } - return titleTrimmed - .replace(/['":]/g, "") - .replace(/[^a-zA-Z0-9]+/g, "_"); + return titleTrimmed.replace(/['":]/g, '').replace(/[^a-zA-Z0-9]+/g, '_'); } export function compareTitle(a: string, b: string): boolean {