From 2a4393478894df017ccffea595b94d857e64145d Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Sat, 16 Dec 2023 16:30:11 -0500 Subject: [PATCH 1/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index 90517f6..cec559b 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -2,7 +2,7 @@ import { load } from 'cheerio'; import { MovieMedia, ShowMedia } from '@/main/media'; import { flixHqBase } from '@/providers/sources/flixhq/common'; -import { compareMedia } from '@/utils/compare'; +import { compareMedia, compareTitle } from '@/utils/compare'; import { ScrapeContext } from '@/utils/context'; export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMedia): Promise { @@ -18,16 +18,18 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe const id = query.find('div.film-poster > a').attr('href')?.slice(1); const title = query.find('div.film-detail > h2 > a').attr('title'); const year = query.find('div.film-detail > div.fd-infor > span:nth-child(1)').text(); + const seasons = year.includes('SS') ? parseInt(year.split('SS')[1]) : 0; if (!id || !title || !year) return null; return { id, title, year: parseInt(year, 10), + seasons, }; }); - const matchingItem = items.find((v) => v && compareMedia(media, v.title, v.year)); + const matchingItem = items.find((v) => v && (media.type === 'movie' ? compareMedia(media, v.title, v.year) : compareTitle(media.title, v.title) && media.season.number === v.seasons || media.season.number < v.seasons || media.season.number < v.seasons + 1)); if (!matchingItem) return null; return matchingItem.id; From 8c97760dc0cb5787507d16277a79c2fbe387e6d4 Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:13:24 -0500 Subject: [PATCH 2/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index cec559b..c744c53 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -29,7 +29,11 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe }; }); - const matchingItem = items.find((v) => v && (media.type === 'movie' ? compareMedia(media, v.title, v.year) : compareTitle(media.title, v.title) && media.season.number === v.seasons || media.season.number < v.seasons || media.season.number < v.seasons + 1)); + const matchingItem = items.find( + (v) => v && + (media.type === 'movie' ? compareMedia(media, v.title, v.year) : + compareTitle(media.title, v.title) && media.season.number < v.seasons + 1) + ); if (!matchingItem) return null; return matchingItem.id; From 7fa098fb0c4c48f57ab795ea98765611a63c8f7d Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:22:46 -0500 Subject: [PATCH 3/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index c744c53..cc0ce96 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -29,11 +29,15 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe }; }); - const matchingItem = items.find( - (v) => v && - (media.type === 'movie' ? compareMedia(media, v.title, v.year) : - compareTitle(media.title, v.title) && media.season.number < v.seasons + 1) - ); + const matchingItem = items.find(v => { + if (!v) return false; + + if (media.type === 'movie') { + return compareMedia(media, v.title, v.year) + } + + return compareTitle(media.title, v.title) && media.season.number < v.seasons + 1 + }); if (!matchingItem) return null; return matchingItem.id; From d95de0b60243ccaa601be3d686de41ba8cf07756 Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 13:36:24 -0500 Subject: [PATCH 4/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index cc0ce96..9d06f60 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -33,10 +33,10 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe if (!v) return false; if (media.type === 'movie') { - return compareMedia(media, v.title, v.year) - } + return compareMedia(media, v.title, v.year); + }; - return compareTitle(media.title, v.title) && media.season.number < v.seasons + 1 + return compareTitle(media.title, v.title) && media.season.number < v.seasons + 1; }); if (!matchingItem) return null; From 9ff9cc59386512166af47f270b6f93ee870fb546 Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:02:43 -0500 Subject: [PATCH 5/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index 9d06f60..d90a9a5 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -34,7 +34,7 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe if (media.type === 'movie') { return compareMedia(media, v.title, v.year); - }; + } return compareTitle(media.title, v.title) && media.season.number < v.seasons + 1; }); From 2e3ee285036e591b9400f16ea03865b552394d37 Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:15:16 -0500 Subject: [PATCH 6/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index d90a9a5..50efaf4 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -18,18 +18,18 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe const id = query.find('div.film-poster > a').attr('href')?.slice(1); const title = query.find('div.film-detail > h2 > a').attr('title'); const year = query.find('div.film-detail > div.fd-infor > span:nth-child(1)').text(); - const seasons = year.includes('SS') ? parseInt(year.split('SS')[1]) : 0; + const seasons = year.includes('SS') ? year.split('SS')[1] : "0"; if (!id || !title || !year) return null; return { id, title, year: parseInt(year, 10), - seasons, + seasons: parseInt(seasons, 10), }; }); - const matchingItem = items.find(v => { + const matchingItem = items.find((v) => { if (!v) return false; if (media.type === 'movie') { From c711f168ae20b45504e187b17191cd4bec4fa03d Mon Sep 17 00:00:00 2001 From: erynith <135774005+erynith@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:41:59 -0500 Subject: [PATCH 7/7] Update search.ts --- src/providers/sources/flixhq/search.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/sources/flixhq/search.ts b/src/providers/sources/flixhq/search.ts index 50efaf4..d52f65a 100644 --- a/src/providers/sources/flixhq/search.ts +++ b/src/providers/sources/flixhq/search.ts @@ -18,7 +18,7 @@ export async function getFlixhqId(ctx: ScrapeContext, media: MovieMedia | ShowMe const id = query.find('div.film-poster > a').attr('href')?.slice(1); const title = query.find('div.film-detail > h2 > a').attr('title'); const year = query.find('div.film-detail > div.fd-infor > span:nth-child(1)').text(); - const seasons = year.includes('SS') ? year.split('SS')[1] : "0"; + const seasons = year.includes('SS') ? year.split('SS')[1] : '0'; if (!id || !title || !year) return null; return {