From 1ec803b06dfc1e76f5b1139f0e88af524596e5af Mon Sep 17 00:00:00 2001
From: nklhrstv <me@nikolahristov.com>
Date: Thu, 2 Apr 2020 18:17:14 +0300
Subject: [PATCH] basic info menu implemented

---
 src/routes/Player/ControlBar/ControlBar.js |  6 +--
 src/routes/Player/InfoMenu/InfoMenu.js     | 26 +++++++++--
 src/routes/Player/InfoMenu/styles.less     |  2 +-
 src/routes/Player/Player.js                | 54 ++++++----------------
 src/routes/Player/useInfo.js               | 41 ++++++++++++++++
 src/routes/Player/useSettings.js           |  4 +-
 6 files changed, 83 insertions(+), 50 deletions(-)
 create mode 100644 src/routes/Player/useInfo.js

diff --git a/src/routes/Player/ControlBar/ControlBar.js b/src/routes/Player/ControlBar/ControlBar.js
index 11d1bd108..7033efa89 100644
--- a/src/routes/Player/ControlBar/ControlBar.js
+++ b/src/routes/Player/ControlBar/ControlBar.js
@@ -15,7 +15,7 @@ const ControlBar = ({
     volume,
     muted,
     subtitlesTracks,
-    stream,
+    info,
     onPlayRequested,
     onPauseRequested,
     onMuteRequested,
@@ -97,7 +97,7 @@ const ControlBar = ({
                 <Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}>
                     <Icon className={styles['icon']} icon={'ic_network'} />
                 </Button>
-                <Button className={classnames(styles['control-bar-button'], { 'disabled': typeof stream !== 'object' || stream === null })} tabIndex={-1} onMouseDown={onInfoButtonMouseDown} onClick={onInfoButtonClick}>
+                <Button className={classnames(styles['control-bar-button'], { 'disabled': typeof info !== 'object' || info === null })} tabIndex={-1} onMouseDown={onInfoButtonMouseDown} onClick={onInfoButtonClick}>
                     <Icon className={styles['icon']} icon={'ic_info'} />
                 </Button>
                 <Button className={classnames(styles['control-bar-button'], 'disabled')} tabIndex={-1}>
@@ -122,7 +122,7 @@ ControlBar.propTypes = {
     volume: PropTypes.number,
     muted: PropTypes.bool,
     subtitlesTracks: PropTypes.array,
-    stream: PropTypes.object,
+    info: PropTypes.object,
     onPlayRequested: PropTypes.func,
     onPauseRequested: PropTypes.func,
     onMuteRequested: PropTypes.func,
diff --git a/src/routes/Player/InfoMenu/InfoMenu.js b/src/routes/Player/InfoMenu/InfoMenu.js
index 5d5dd1202..538ac91c1 100644
--- a/src/routes/Player/InfoMenu/InfoMenu.js
+++ b/src/routes/Player/InfoMenu/InfoMenu.js
@@ -1,22 +1,42 @@
 const React = require('react');
 const PropTypes = require('prop-types');
 const classnames = require('classnames');
-const MetaPreview = require('stremio/common/MetaPreview');
+const { MetaPreview, CONSTANTS } = require('stremio/common');
 const styles = require('./styles');
 
-const InfoMenu = ({ className }) => {
+const InfoMenu = ({ className, ...props }) => {
+    const metaItem = React.useMemo(() => {
+        return props.metaItem !== null ?
+            {
+                ...props.metaItem,
+                links: props.metaItem.links.filter(({ category }) => category === CONSTANTS.SHARE_LINK_CATEGORY)
+            }
+            :
+            null;
+    }, [props.metaItem]);
     const onMouseDown = React.useCallback((event) => {
         event.nativeEvent.infoMenuClosePrevented = true;
     }, []);
     return (
         <div className={classnames(className, styles['info-menu-container'])} onMouseDown={onMouseDown}>
-            <MetaPreview name={'Info menu name'} />
+            <MetaPreview
+                className={styles['meta-preview']}
+                compact={true}
+                name={metaItem.name}
+                logo={metaItem.logo}
+                runtime={metaItem.runtime}
+                releaseInfo={metaItem.releaseInfo}
+                released={metaItem.released}
+                description={metaItem.description}
+                links={metaItem.links}
+            />
         </div>
     );
 };
 
 InfoMenu.propTypes = {
     className: PropTypes.string,
+    metaItem: PropTypes.object
 };
 
 module.exports = InfoMenu;
diff --git a/src/routes/Player/InfoMenu/styles.less b/src/routes/Player/InfoMenu/styles.less
index 67d10f13e..e3f8f74e9 100644
--- a/src/routes/Player/InfoMenu/styles.less
+++ b/src/routes/Player/InfoMenu/styles.less
@@ -1,3 +1,3 @@
 .info-menu-container {
-    
+    width: 30rem;
 }
\ No newline at end of file
diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
index e560a8a7b..7f05e926e 100644
--- a/src/routes/Player/Player.js
+++ b/src/routes/Player/Player.js
@@ -4,52 +4,23 @@ const classnames = require('classnames');
 const debounce = require('lodash.debounce');
 const { useRouteFocused } = require('stremio-router');
 const { useServices } = require('stremio/services');
-const { HorizontalNavBar, useDeepEqualEffect, useFullscreen, useBinaryState, useToast } = require('stremio/common');
+const { HorizontalNavBar, useDeepEqualEffect, useFullscreen, useBinaryState, useToast, useProfile } = require('stremio/common');
 const BufferingLoader = require('./BufferingLoader');
 const ControlBar = require('./ControlBar');
 const InfoMenu = require('./InfoMenu');
 const SubtitlesMenu = require('./SubtitlesMenu');
 const Video = require('./Video');
+const useInfo = require('./useInfo');
 const usePlayer = require('./usePlayer');
 const useSettings = require('./useSettings');
 const styles = require('./styles');
 
 const Player = ({ urlParams }) => {
     const { core } = useServices();
+    const profile = useProfile();
     const [player, updateLibraryItemState, pushToLibrary] = usePlayer(urlParams);
-    const [settings, updateSettings] = useSettings();
-    const stream = React.useMemo(() => {
-        return player.selected !== null ? player.selected.stream : null;
-    }, [player]);
-    const metaItem = React.useMemo(() => {
-        return player.meta_resource !== null && player.meta_resource.content.type === 'Ready' ? player.meta_resource.content.content : null;
-    }, [player]);
-    const video = React.useMemo(() => {
-        return metaItem !== null && player.selected !== null && typeof player.selected.video_id === 'string' ?
-            metaItem.videos.reduce((result, video) => {
-                if (video.id === player.selected.video_id) {
-                    return video;
-                }
-
-                return result;
-            }, null)
-            :
-            null;
-    }, [player, metaItem]);
-    const title = React.useMemo(() => {
-        const streamTitle = stream !== null && typeof stream.title === 'string' ? stream.title : '';
-        const metaItemTitle = metaItem !== null ? metaItem.name : '';
-        const videoTitle = video !== null && typeof video.title === 'string' && video.title.length > 0 ? video.title : '';
-        const seriesInfo = video !== null && !isNaN(video.season) && !isNaN(video.episode) ? `${video.season}x${video.episode}` : '';
-        if (metaItemTitle.length > 0) {
-            return metaItemTitle
-                .concat(videoTitle.length > 0 || seriesInfo.length > 0 ? ' -' : '')
-                .concat(videoTitle.length > 0 ? ` ${videoTitle}` : '')
-                .concat(seriesInfo.length > 0 ? ` (${seriesInfo})` : '');
-        } else {
-            return streamTitle;
-        }
-    }, [stream, metaItem, video]);
+    const [settings, updateSettings] = useSettings(profile);
+    const info = useInfo(player, profile);
     const routeFocused = useRouteFocused();
     const toast = useToast();
     const [, , , toggleFullscreen] = useFullscreen();
@@ -275,10 +246,10 @@ const Player = ({ urlParams }) => {
         }
     }, [videoState.subtitlesTracks]);
     React.useEffect(() => {
-        if (stream === null) {
+        if (info === null) {
             closeInfoMenu();
         }
-    }, [stream]);
+    }, [info]);
     React.useEffect(() => {
         const intervalId = setInterval(pushToLibrary, 30000);
         return () => {
@@ -337,7 +308,7 @@ const Player = ({ urlParams }) => {
                 }
                 case 'KeyM': {
                     closeSubtitlesMenu();
-                    if (stream !== null) {
+                    if (info !== null) {
                         toggleInfoMenu();
                     }
 
@@ -356,7 +327,7 @@ const Player = ({ urlParams }) => {
         return () => {
             window.removeEventListener('keydown', onKeyDown);
         };
-    }, [routeFocused, subtitlesMenuOpen, infoMenuOpen, stream, videoState.paused, videoState.time, videoState.volume, videoState.subtitlesTracks, toggleSubtitlesMenu, toggleInfoMenu]);
+    }, [routeFocused, subtitlesMenuOpen, infoMenuOpen, info, videoState.paused, videoState.time, videoState.volume, videoState.subtitlesTracks, toggleSubtitlesMenu, toggleInfoMenu]);
     React.useLayoutEffect(() => {
         return () => {
             setImmersedDebounced.cancel();
@@ -404,7 +375,7 @@ const Player = ({ urlParams }) => {
             }
             <HorizontalNavBar
                 className={classnames(styles['layer'], styles['nav-bar-layer'])}
-                title={title}
+                title={info !== null ? info.title : ''}
                 backButton={true}
                 fullscreenButton={true}
                 onMouseMove={onBarMouseMove}
@@ -418,7 +389,7 @@ const Player = ({ urlParams }) => {
                 volume={videoState.volume}
                 muted={videoState.muted}
                 subtitlesTracks={videoState.subtitlesTracks}
-                stream={stream}
+                info={info}
                 onPlayRequested={onPlayRequested}
                 onPauseRequested={onPauseRequested}
                 onMuteRequested={onMuteRequested}
@@ -454,6 +425,9 @@ const Player = ({ urlParams }) => {
                 infoMenuOpen ?
                     <InfoMenu
                         className={classnames(styles['layer'], styles['menu-layer'])}
+                        stream={info !== null ? info.stream : null}
+                        addon={info !== null ? info.addon : null}
+                        metaItem={info !== null ? info.metaItem : null}
                     />
                     :
                     null
diff --git a/src/routes/Player/useInfo.js b/src/routes/Player/useInfo.js
new file mode 100644
index 000000000..08f85b7c6
--- /dev/null
+++ b/src/routes/Player/useInfo.js
@@ -0,0 +1,41 @@
+const React = require('react');
+
+const useInfo = (player, profile) => {
+    const info = React.useMemo(() => {
+        if (player.selected === null) {
+            return null;
+        }
+
+        const stream = player.selected.stream;
+        const addon = stream.addon;
+        const metaItem = player.meta_resource !== null && player.meta_resource.content.type === 'Ready' ?
+            player.meta_resource.content.content
+            :
+            null;
+        const video = metaItem !== null ?
+            metaItem.videos.reduce((result, video) => {
+                if (video.id === player.selected.video_id) {
+                    return video;
+                }
+
+                return result;
+            }, null)
+            :
+            null;
+        const streamTitle = typeof stream.title === 'string' ? stream.title : '';
+        const metaItemTitle = metaItem !== null ? metaItem.name : '';
+        const videoTitle = video !== null && typeof video.title === 'string' && video.title.length > 0 ? video.title : '';
+        const seriesInfo = video !== null && !isNaN(video.season) && !isNaN(video.episode) ? `${video.season}x${video.episode}` : '';
+        const title = metaItemTitle.length > 0 ?
+            metaItemTitle
+                .concat(videoTitle.length > 0 || seriesInfo.length > 0 ? ' -' : '')
+                .concat(videoTitle.length > 0 ? ` ${videoTitle}` : '')
+                .concat(seriesInfo.length > 0 ? ` (${seriesInfo})` : '')
+            :
+            streamTitle;
+        return { stream, addon, metaItem, title };
+    }, [player, profile]);
+    return info;
+};
+
+module.exports = useInfo;
diff --git a/src/routes/Player/useSettings.js b/src/routes/Player/useSettings.js
index 7cdb7cdf7..be82d6034 100644
--- a/src/routes/Player/useSettings.js
+++ b/src/routes/Player/useSettings.js
@@ -1,10 +1,8 @@
 const React = require('react');
-const { useProfile } = require('stremio/common');
 const { useServices } = require('stremio/services');
 
-const useSettings = () => {
+const useSettings = (profile) => {
     const { core } = useServices();
-    const profile = useProfile();
     const updateSettings = React.useCallback((settings) => {
         core.dispatch({
             action: 'Ctx',