From 2ed8f6cfa9799c1728d9f8b894fd241f85b67d37 Mon Sep 17 00:00:00 2001 From: Pas <74743263+Pasithea0@users.noreply.github.com> Date: Tue, 25 Feb 2025 09:37:18 -0700 Subject: [PATCH] remove uira embeds --- src/providers/all.ts | 20 -------- src/providers/embeds/uiralive.ts | 80 ------------------------------- src/providers/sources/uiralive.ts | 22 +++++---- 3 files changed, 13 insertions(+), 109 deletions(-) delete mode 100644 src/providers/embeds/uiralive.ts diff --git a/src/providers/all.ts b/src/providers/all.ts index 1882dc7..7b17ac0 100644 --- a/src/providers/all.ts +++ b/src/providers/all.ts @@ -57,17 +57,6 @@ import { smashyStreamOScraper } from './embeds/smashystream/opstream'; import { smashyStreamFScraper } from './embeds/smashystream/video1'; import { streamtapeScraper } from './embeds/streamtape'; import { streamvidScraper } from './embeds/streamvid'; -import { - uiraCatflixScraper, - uiraFlickyScraper, - uiraFlixhqScraper, - uiraMegaScraper, - uiraOrionScraper, - uiraRabbitScraper, - uiraSlidemoviesScraper, - uiraVidapiScraper, - uiraVidsrcvipScraper, -} from './embeds/uiralive'; import { vidCloudScraper } from './embeds/vidcloud'; import { vidplayScraper } from './embeds/vidplay'; import { @@ -224,14 +213,5 @@ export function gatherAllEmbeds(): Array { webtor720Scraper, webtor480Scraper, viperScraper, - uiraCatflixScraper, - uiraMegaScraper, - uiraRabbitScraper, - uiraOrionScraper, - uiraVidsrcvipScraper, - uiraFlixhqScraper, - uiraSlidemoviesScraper, - uiraVidapiScraper, - uiraFlickyScraper, ]; } diff --git a/src/providers/embeds/uiralive.ts b/src/providers/embeds/uiralive.ts deleted file mode 100644 index 6d2d6e6..0000000 --- a/src/providers/embeds/uiralive.ts +++ /dev/null @@ -1,80 +0,0 @@ -import { flags } from '@/entrypoint/utils/targets'; -import { makeEmbed } from '@/providers/base'; - -const providers = [ - { - id: 'uira-catflix', - rank: 309, - }, - { - id: 'uira-mega', - rank: 308, - }, - { - id: 'uira-rabbit', - rank: 307, - }, - { - id: 'uira-orion', - rank: 306, - }, - { - id: 'uira-vidsrcvip', - rank: 305, - }, - { - id: 'uira-flixhq', - rank: 304, - }, - { - id: 'uira-slidemovies', - rank: 303, - }, - { - id: 'uira-vidapi', - rank: 302, - }, - { - id: 'uira-flicky', - rank: 301, - }, -]; - -function embed(provider: { id: string; rank: number; name?: string; disabled?: boolean }) { - return makeEmbed({ - id: provider.id, - name: - provider.name || - provider.id - .split('-') - .map((word) => word[0].toUpperCase() + word.slice(1)) - .join(' '), - disabled: provider.disabled, - rank: provider.rank, - async scrape(ctx) { - return { - stream: [ - { - id: 'primary', - type: 'hls', - playlist: ctx.url, - flags: [flags.CORS_ALLOWED], - captions: [], - }, - ], - }; - }, - }); -} - -export const [ - uiraCatflixScraper, - uiraMegaScraper, - uiraRabbitScraper, - uiraOrionScraper, - uiraVidsrcvipScraper, - uiraFlixhqScraper, - uiraSlidemoviesScraper, - uiraVidapiScraper, - uiraFlickyScraper, -] = providers.map(embed); diff --git a/src/providers/sources/uiralive.ts b/src/providers/sources/uiralive.ts index fb32f52..861c77e 100644 --- a/src/providers/sources/uiralive.ts +++ b/src/providers/sources/uiralive.ts @@ -1,5 +1,5 @@ import { flags } from '@/entrypoint/utils/targets'; -import { SourcererEmbed, SourcererOutput, makeSourcerer } from '@/providers/base'; +import { SourcererOutput, makeSourcerer } from '@/providers/base'; import { MovieScrapeContext, ShowScrapeContext } from '@/utils/context'; import { NotFoundError } from '@/utils/errors'; @@ -13,7 +13,7 @@ async function comboScraper(ctx: ShowScrapeContext | MovieScrapeContext): Promis let result = await ctx.fetcher(fetchUrl); - if (!result?.sources?.length) { + if (!result?.sources || result.sources.length === 0) { try { result = await ctx.fetcher(fetchUrl); } catch (e: any) { @@ -22,17 +22,21 @@ async function comboScraper(ctx: ShowScrapeContext | MovieScrapeContext): Promis } } - if (!result?.sources?.length) throw new NotFoundError('No sources found'); - - const embeds: SourcererEmbed[] = result.sources.map((source: { source: any; url: any }) => ({ - embedId: `uira-${source.source}`, - url: source.url, - })); + if (!result?.sources || result.sources.length === 0) throw new NotFoundError('No sources found'); ctx.progress(90); return { - embeds, + embeds: [], + stream: [ + { + id: 'primary', + playlist: result.sources[0].url, + type: 'hls', + flags: [flags.CORS_ALLOWED], + captions: [], + }, + ], }; }