Merge pull request #70 from movie-web/fix/included-disabled-embeds

Add disabled embed filter to scrapeInvidualSource and runAllProviders

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@movie-web/providers",
-  "version": "1.1.5",
+  "version": "2.0.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@movie-web/providers",
-      "version": "1.1.5",
+      "version": "2.0.5",
       "license": "MIT",
       "dependencies": {
         "cheerio": "^1.0.0-rc.12",

src/runners/individualRunner.ts

@@ -58,6 +58,14 @@ export async function scrapeInvidualSource(
   }
 
   if (!output) throw new Error('output is null');
+
+  // filter output with only valid embeds that are not disabled
+  output.embeds = output.embeds.filter((embed) => {
+    const e = list.embeds.find((v) => v.id === embed.embedId);
+    if (!e || e.disabled) return false;
+    return true;
+  });
+
   if ((!output.stream || output.stream.length === 0) && output.embeds.length === 0)
     throw new NotFoundError('No streams found');
   return output;

src/runners/runner.ts

@@ -116,8 +116,14 @@ export async function runAllProviders(list: ProviderList, ops: ProviderRunnerOpt
       };
     }
 
-    // run embed scrapers on listed embeds
+    // filter disabled and run embed scrapers on listed embeds
-    const sortedEmbeds = output.embeds.sort((a, b) => embedIds.indexOf(a.embedId) - embedIds.indexOf(b.embedId));
+    const sortedEmbeds = output.embeds
+      .filter((embed) => {
+        const e = list.embeds.find((v) => v.id === embed.embedId);
+        if (!e || e.disabled) return false;
+        return true;
+      })
+      .sort((a, b) => embedIds.indexOf(a.embedId) - embedIds.indexOf(b.embedId));
 
     if (sortedEmbeds.length > 0) {
       ops.events?.discoverEmbeds?.({