Merge branch 'dev' of https://github.com/infvortx/providers-dev into pr/146

src/providers/all.ts

@@ -14,7 +14,7 @@ import { vidsrcembedScraper } from '@/providers/embeds/vidsrc';
 import { vTubeScraper } from '@/providers/embeds/vtube';
 import { flixhqScraper } from '@/providers/sources/flixhq/index';
 import { goMoviesScraper } from '@/providers/sources/gomovies/index';
-import { insertunitScraper } from '@/providers/sources/insertunit/insertunit';
+import { insertunitScraper } from '@/providers/sources/insertunit';
 import { kissAsianScraper } from '@/providers/sources/kissasian/index';
 import { lookmovieScraper } from '@/providers/sources/lookmovie';
 import { remotestreamScraper } from '@/providers/sources/remotestream';

src/providers/sources/insertunit/captions.ts

@@ -1,32 +1,30 @@
-import { Caption } from "@/providers/captions";
+import { Caption, removeDuplicatedLanguages } from '@/providers/captions';
-import { Subtitle } from "./types";
 
-import { removeDuplicatedLanguages } from "@/providers/captions";
+import { Subtitle } from './types';
 
 export async function getCaptions(data: Subtitle[]) {
-    let captions: Caption[] = [];
+  let captions: Caption[] = [];
-    let subtitle: Subtitle;
+  for (const subtitle of data) {
-    for (subtitle of data) {
+    let language = '';
-      let language = '';
 
-      if (subtitle.name.includes('Рус')) {
+    if (subtitle.name.includes('Рус')) {
-        language = 'ru';
+      language = 'ru';
-      } else if (subtitle.name.includes('Укр')) {
+    } else if (subtitle.name.includes('Укр')) {
-        language = 'uk';
+      language = 'uk';
-      } else if (subtitle.name.includes('Eng')) {
+    } else if (subtitle.name.includes('Eng')) {
-        language = 'en';
+      language = 'en';
-      } else {
+    } else {
-        continue;
+      continue;
-      }
-
-      captions.push({
-        id: subtitle.url,
-        url: subtitle.url,
-        language,
-        type: 'vtt',
-        hasCorsRestrictions: false,
-      });
     }
-    captions = removeDuplicatedLanguages(captions);
+
-    return(captions)
+    captions.push({
-}
+      id: subtitle.url,
+      url: subtitle.url,
+      language,
+      type: 'vtt',
+      hasCorsRestrictions: false,
+    });
+  }
+  captions = removeDuplicatedLanguages(captions);
+  return captions;
+}

src/providers/sources/insertunit/index.ts

@@ -1,10 +1,10 @@
 import { flags } from '@/entrypoint/utils/targets';
 import { makeSourcerer } from '@/providers/base';
-import { Caption, removeDuplicatedLanguages } from '@/providers/captions';
+import { Caption } from '@/providers/captions';
 import { NotFoundError } from '@/utils/errors';
-import { getCaptions } from './captions';
 
-import { Season, Subtitle } from './types';
+import { getCaptions } from './captions';
+import { Season } from './types';
 
 const insertUnitBase = 'https://api.insertunit.ws/';
 
@@ -39,16 +39,11 @@ export const insertunitScraper = makeSourcerer({
     );
 
     if (!currentEpisode?.hls) throw new NotFoundError('No result found');
-    
+
-    let captions: Caption[] = []
+    let captions: Caption[] = [];
-
-    if (currentEpisode.cc != null) {
-      captions = await getCaptions(currentEpisode.cc)
-    }
-
-    ctx.progress(80);
 
     if (currentEpisode.cc != null) {
+      captions = await getCaptions(currentEpisode.cc);
     }
 
     ctx.progress(95);
@@ -87,7 +82,7 @@ export const insertunitScraper = makeSourcerer({
 
     if (subtitleJSONData != null && subtitleJSONData[1] != null) {
       const subtitleData = JSON.parse(subtitleJSONData[1]);
-      captions = await getCaptions(subtitleData)
+      captions = await getCaptions(subtitleData);
     }
 
     ctx.progress(90);

src/providers/sources/insertunit/types.ts

@@ -1,30 +1,30 @@
-export interface Episode {
+export interface Subtitle {
-    episode: string;
+  url: string;
-    id: number;
+  name: string;
-    videoKey: string;
-    hls: string;
-    audio: {
-        names: string[];
-        order: number[];
-    }
-    cc: Subtitle[];
-    duration: number;
-    title: string;
-    download: string;
-    sections: string[]
-    poster: string;
-    preview: {
-        src: string;
-    }
 }
 
-export interface Subtitle {
+export interface Episode {
-    url: string;
+  episode: string;
-    name: string;
+  id: number;
+  videoKey: string;
+  hls: string;
+  audio: {
+    names: string[];
+    order: number[];
+  };
+  cc: Subtitle[];
+  duration: number;
+  title: string;
+  download: string;
+  sections: string[];
+  poster: string;
+  preview: {
+    src: string;
+  };
 }
 
 export interface Season {
-    season: number,
+  season: number;
-    blocked: boolean,
+  blocked: boolean;
-    episodes: Episode[]
+  episodes: Episode[];
-}
+}