Browse Source

Merge pull request #813 from movie-web/hotfix/provider-api

Check for extension in scrape logic
pull/814/head
mrjvs 2 years ago committed by GitHub
parent
commit
6371478d0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      package.json
  2. 6
      src/components/player/hooks/useSourceSelection.ts
  3. 2
      src/hooks/useProviderScrape.tsx

2
package.json

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "movie-web",
"version": "4.3.0",
"version": "4.3.1",
"private": true,
"homepage": "https://movie-web.app",
"scripts": {

6
src/components/player/hooks/useSourceSelection.ts

@ -42,7 +42,7 @@ export function useEmbedScraping( @@ -42,7 +42,7 @@ export function useEmbedScraping(
let result: EmbedOutput | undefined;
if (!meta) return;
try {
if (providerApiUrl) {
if (providerApiUrl && !isExtensionActiveCached()) {
const baseUrlMaker = makeProviderUrl(providerApiUrl);
const conn = await connectServerSideEvents<EmbedOutput>(
baseUrlMaker.scrapeEmbed(embedId, url),
@ -107,7 +107,7 @@ export function useSourceScraping(sourceId: string | null, routerId: string) { @@ -107,7 +107,7 @@ export function useSourceScraping(sourceId: string | null, routerId: string) {
let result: SourcererOutput | undefined;
try {
if (providerApiUrl) {
if (providerApiUrl && !isExtensionActiveCached()) {
const baseUrlMaker = makeProviderUrl(providerApiUrl);
const conn = await connectServerSideEvents<SourcererOutput>(
baseUrlMaker.scrapeSource(sourceId, scrapeMedia),
@ -149,7 +149,7 @@ export function useSourceScraping(sourceId: string | null, routerId: string) { @@ -149,7 +149,7 @@ export function useSourceScraping(sourceId: string | null, routerId: string) {
let embedResult: EmbedOutput | undefined;
if (!meta) return;
try {
if (providerApiUrl) {
if (providerApiUrl && !isExtensionActiveCached()) {
const baseUrlMaker = makeProviderUrl(providerApiUrl);
const conn = await connectServerSideEvents<EmbedOutput>(
baseUrlMaker.scrapeEmbed(

2
src/hooks/useProviderScrape.tsx

@ -159,7 +159,7 @@ export function useScrape() { @@ -159,7 +159,7 @@ export function useScrape() {
const startScraping = useCallback(
async (media: ScrapeMedia) => {
const providerApiUrl = getLoadbalancedProviderApiUrl();
if (providerApiUrl) {
if (providerApiUrl && !isExtensionActiveCached()) {
startScrape();
const baseUrlMaker = makeProviderUrl(providerApiUrl);
const conn = await connectServerSideEvents<RunOutput | "">(

Loading…
Cancel
Save