From c80c27a7ed54f87303d433d7f4dd1c41b36c228d Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Fri, 15 Sep 2023 19:21:47 +0200
Subject: [PATCH] refactor file tree for remotestream

---
 src/providers/all.ts                                     | 2 +-
 .../sources/{remotestream/index.ts => remotestream.ts}   | 9 ++++++---
 src/providers/sources/remotestream/common.ts             | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)
 rename src/providers/sources/{remotestream/index.ts => remotestream.ts} (83%)
 delete mode 100644 src/providers/sources/remotestream/common.ts

diff --git a/src/providers/all.ts b/src/providers/all.ts
index a0ec85d..bcf8191 100644
--- a/src/providers/all.ts
+++ b/src/providers/all.ts
@@ -1,7 +1,7 @@
 import { Embed, Sourcerer } from '@/providers/base';
 import { upcloudScraper } from '@/providers/embeds/upcloud';
 import { flixhqScraper } from '@/providers/sources/flixhq/index';
-import { remotestreamScraper } from '@/providers/sources/remotestream/index';
+import { remotestreamScraper } from '@/providers/sources/remotestream';
 
 export function gatherAllSources(): Array<Sourcerer> {
   // all sources are gathered here
diff --git a/src/providers/sources/remotestream/index.ts b/src/providers/sources/remotestream.ts
similarity index 83%
rename from src/providers/sources/remotestream/index.ts
rename to src/providers/sources/remotestream.ts
index a2ead82..80a8621 100644
--- a/src/providers/sources/remotestream/index.ts
+++ b/src/providers/sources/remotestream.ts
@@ -2,9 +2,8 @@ import { flags } from '@/main/targets';
 import { makeSourcerer } from '@/providers/base';
 import { NotFoundError } from '@/utils/errors';
 
-import { remotestreamBase } from './common';
+const remotestreamBase = `https://fsa.remotestre.am`;
 
-// TODO tv shows are available in flixHQ, just no scraper yet
 export const remotestreamScraper = makeSourcerer({
   id: 'remotestream',
   name: 'Remote Stream',
@@ -16,8 +15,10 @@ export const remotestreamScraper = makeSourcerer({
 
     const playlistLink = `${remotestreamBase}/Shows/${ctx.media.tmdbId}/${seasonNumber}/${episodeNumber}/${episodeNumber}.m3u8`;
 
-    const streamRes = await ctx.fetcher<Blob>(playlistLink);
+    ctx.progress(30);
+    const streamRes = await ctx.fetcher<Blob>(playlistLink); // TODO support blobs in fetchers
     if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found');
+    ctx.progress(90);
 
     return {
       embeds: [],
@@ -31,8 +32,10 @@ export const remotestreamScraper = makeSourcerer({
   async scrapeMovie(ctx) {
     const playlistLink = `${remotestreamBase}/Movies/${ctx.media.tmdbId}/${ctx.media.tmdbId}.m3u8`;
 
+    ctx.progress(30);
     const streamRes = await ctx.fetcher<Blob>(playlistLink);
     if (streamRes.type !== 'application/x-mpegurl') throw new NotFoundError('No watchable item found');
+    ctx.progress(90);
 
     return {
       embeds: [],
diff --git a/src/providers/sources/remotestream/common.ts b/src/providers/sources/remotestream/common.ts
deleted file mode 100644
index be8edfd..0000000
--- a/src/providers/sources/remotestream/common.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const remotestreamBase = `https://fsa.remotestre.am`;