From 150b8de8e837608eba256c183122da37381be0fe Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawki2005@gmail.com>
Date: Fri, 22 Oct 2021 10:44:02 +0100
Subject: [PATCH 1/3] tv shows work now

todo: fix subs on episodes
---
 src/components/VideoElement.js |  4 ++--
 src/lib/scraper/lookmovie.js   | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/components/VideoElement.js b/src/components/VideoElement.js
index c07fb0fd..da4dc0e8 100644
--- a/src/components/VideoElement.js
+++ b/src/components/VideoElement.js
@@ -48,13 +48,13 @@ export function VideoElement({ streamUrl, loading, setProgress, videoRef, startT
 
     if (!streamUrl.endsWith('.mp4')) {
         return (
-            <video crossorigin="anonymous" className="videoElement" ref={videoRef} controls autoPlay onProgress={setProgress} onLoadedData={onLoad}>
+            <video crossOrigin="anonymous" className="videoElement" ref={videoRef} controls autoPlay onProgress={setProgress} onLoadedData={onLoad}>
                 { streamData.subtitles && streamData.subtitles.map((sub, index) => <track key={index} kind="captions" label={sub.language} src={`${process.env.REACT_APP_CORS_PROXY_URL}https://lookmovie.io${sub.file}` } />) }
             </video>
         )
     } else {
         return (
-            <video crossorigin="anonymous" className="videoElement" ref={videoRef} controls autoPlay onProgress={setProgress} onLoadedData={onLoad}>
+            <video crossOrigin="anonymous" className="videoElement" ref={videoRef} controls autoPlay onProgress={setProgress} onLoadedData={onLoad}>
                 { streamData.subtitles && streamData.subtitles.map((sub, index) => <track key={index} kind="captions" label={sub.language} src={`${process.env.REACT_APP_CORS_PROXY_URL}https://lookmovie.io${sub.file}` } />) }
                 <source src={streamUrl} type="video/mp4" />
             </video>
diff --git a/src/lib/scraper/lookmovie.js b/src/lib/scraper/lookmovie.js
index a8a4ecbc..7972cb79 100644
--- a/src/lib/scraper/lookmovie.js
+++ b/src/lib/scraper/lookmovie.js
@@ -61,20 +61,17 @@ async function getVideoUrl(config) {
     if (config.type === 'movie') {
         url = `${CORS_URL}/api/v1/security/movie-access?id_movie=${config.id}&token=1&sk=&step=1`;
     } else if (config.type === 'show') {
-        url = `${CORS_URL}/api/v1/security/show-access?slug=${config.slug}&token=&step=2`;
+        url = `${CORS_URL}/api/v1/security/episode-access?id_episode=${config.id}`;
     }
 
     const data = await fetch(url, {
         headers: { phpsessid },
     }).then((d) => d.json());
 
-    let subs;
-
-    if (config.type === "show") {
-        subs = await getEpisodeSubs(config);
-    } else if (config.type === "movie") {
-        subs = data?.data?.subtitles;
-    }
+    const subs = data?.subtitles.filter((sub) => {
+        if (typeof sub.file === 'object') return false;
+        return true;
+    })
 
     // Find video URL and return it (with a check for a full url if needed)
     const opts = ["1080p", "1080", "720p", "720", "480p", "480", "auto"];
@@ -86,9 +83,11 @@ async function getVideoUrl(config) {
         }
     }
 
+    console.log(subs);
+
     return {
         videoUrl: videoUrl.startsWith("/") ? `${BASE_URL}${videoUrl}` : videoUrl, 
-        subs, 
+        subs: subs, 
     };
 }
 

From 8ef38b151b3d86a2ef3ff7978cdf98e96c41e843 Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawki2005@gmail.com>
Date: Fri, 22 Oct 2021 10:50:01 +0100
Subject: [PATCH 2/3] fix episode subtitles

---
 src/lib/scraper/lookmovie.js | 6 ------
 src/views/Movie.js           | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/lib/scraper/lookmovie.js b/src/lib/scraper/lookmovie.js
index 7972cb79..fb596b45 100644
--- a/src/lib/scraper/lookmovie.js
+++ b/src/lib/scraper/lookmovie.js
@@ -91,12 +91,6 @@ async function getVideoUrl(config) {
     };
 }
 
-async function getEpisodeSubs (config) {
-    return await fetch(`${CORS_URL}/api/v1/shows/episode-subtitles/?id_episode=${config.id}`, {
-        headers: { phpsessid },
-    }).then(res => res.json());
-}
-
 async function getEpisodes(slug) {
     const url = `${CORS_URL}/shows/view/${slug}`;
     const pageReq = await fetch(url, {
diff --git a/src/views/Movie.js b/src/views/Movie.js
index f77ae4d4..c47522cb 100644
--- a/src/views/Movie.js
+++ b/src/views/Movie.js
@@ -57,9 +57,9 @@ export function MovieView(props) {
 
         setLoading(true);
         getStreamUrl(streamData.slug, streamData.type, streamData.source, season, episode)
-        .then(({ url }) => {
+        .then(({ url, subtitles }) => {
                 if (cancel) return;
-                streamData.subtitles = [];
+                streamData.subtitles = subtitles;
                 setStreamUrl(url)
                 setLoading(false);
             })

From d4e1478b29d284855b67c02f39918bbf9030f8a1 Mon Sep 17 00:00:00 2001
From: James Hawkins <jhawki2005@gmail.com>
Date: Fri, 22 Oct 2021 10:50:38 +0100
Subject: [PATCH 3/3] remove excess console.log

---
 src/lib/scraper/lookmovie.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/lib/scraper/lookmovie.js b/src/lib/scraper/lookmovie.js
index fb596b45..d2f080f8 100644
--- a/src/lib/scraper/lookmovie.js
+++ b/src/lib/scraper/lookmovie.js
@@ -83,8 +83,6 @@ async function getVideoUrl(config) {
         }
     }
 
-    console.log(subs);
-
     return {
         videoUrl: videoUrl.startsWith("/") ? `${BASE_URL}${videoUrl}` : videoUrl, 
         subs: subs,