From 69da27d6dca12b2c0497952fb9521fd933204650 Mon Sep 17 00:00:00 2001 From: Joris te Dorsthorst <6518350+Joristdh@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:19:02 +0100 Subject: [PATCH 1/2] Strip native language suffix from caption label --- src/providers/embeds/upcloud.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/providers/embeds/upcloud.ts b/src/providers/embeds/upcloud.ts index 0f86cd0..663bb3d 100644 --- a/src/providers/embeds/upcloud.ts +++ b/src/providers/embeds/upcloud.ts @@ -110,7 +110,7 @@ export const upcloudScraper = makeEmbed({ if (track.kind !== 'captions') return; const type = getCaptionTypeFromUrl(track.file); if (!type) return; - const language = labelToLanguageCode(track.label); + const language = labelToLanguageCode(track.label.split(' ')[0]); if (!language) return; captions.push({ id: track.file, From b2f372fbb979fe9ef03fb0a5dc20317f73cb5c03 Mon Sep 17 00:00:00 2001 From: Jorrin <43169049+JorrinKievit@users.noreply.github.com> Date: Wed, 28 Feb 2024 00:02:21 +0100 Subject: [PATCH 2/2] fix ridomovies not working for some sources --- package-lock.json | 4 ++-- src/providers/sources/ridomovies/index.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1fc4ea9..3b07825 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@movie-web/providers", - "version": "2.2.0", + "version": "2.2.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@movie-web/providers", - "version": "2.2.0", + "version": "2.2.1", "license": "MIT", "dependencies": { "cheerio": "^1.0.0-rc.12", diff --git a/src/providers/sources/ridomovies/index.ts b/src/providers/sources/ridomovies/index.ts index f028875..fba442a 100644 --- a/src/providers/sources/ridomovies/index.ts +++ b/src/providers/sources/ridomovies/index.ts @@ -28,9 +28,9 @@ const universalScraper = async (ctx: MovieScrapeContext | ShowScrapeContext) => const showPageResult = await ctx.proxiedFetcher(`/${show.fullSlug}`, { baseUrl: ridoMoviesBase, }); - const fullEpisodeSlug = `${show.fullSlug}/season-${ctx.media.season.number}/episode-${ctx.media.episode.number}`; + const fullEpisodeSlug = `season-${ctx.media.season.number}/episode-${ctx.media.episode.number}`; const regexPattern = new RegExp( - `\\\\"id\\\\":\\\\"(\\d+)\\\\"(?=.*?\\\\\\"fullSlug\\\\\\":\\\\\\"${fullEpisodeSlug}\\\\\\")`, + `\\\\"id\\\\":\\\\"(\\d+)\\\\"(?=.*?\\\\\\"fullSlug\\\\\\":\\\\\\"[^"]*${fullEpisodeSlug}[^"]*\\\\\\")`, 'g', ); const matches = [...showPageResult.matchAll(regexPattern)];