From f37bec7a7a6a6c567ebe9166bb057141899ea316 Mon Sep 17 00:00:00 2001 From: Jelle van Snik Date: Mon, 16 Jan 2023 21:53:38 +0100 Subject: [PATCH] progress restoring logic --- .../controls/ProgressListenerControl.tsx | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/components/video/controls/ProgressListenerControl.tsx b/src/components/video/controls/ProgressListenerControl.tsx index bdcc8f07..a8f9a80d 100644 --- a/src/components/video/controls/ProgressListenerControl.tsx +++ b/src/components/video/controls/ProgressListenerControl.tsx @@ -7,6 +7,25 @@ interface Props { onProgress?: (time: number, duration: number) => void; } +const FIVETEEN_MINUTES = 15 * 60; +const FIVE_MINUTES = 5 * 60; + +function shouldRestoreTime(time: number, duration: number): boolean { + const timeFromEnd = Math.max(0, duration - time); + + // short movie + if (duration < FIVETEEN_MINUTES) { + if (time < 5) return false; + if (timeFromEnd < 60) return false; + return true; + } + + // long movie + if (time < 30) return false; + if (timeFromEnd < FIVE_MINUTES) return false; + return true; +} + export function ProgressListenerControl(props: Props) { const { videoState } = useVideoPlayerState(); const didInitialize = useRef(null); @@ -31,7 +50,12 @@ export function ProgressListenerControl(props: Props) { useEffect(() => { if (didInitialize.current) return; if (!videoState.hasInitialized || Number.isNaN(videoState.duration)) return; - if (props.startAt !== undefined) videoState.setTime(props.startAt); + if ( + props.startAt !== undefined && + shouldRestoreTime(props.startAt, videoState.duration) + ) { + videoState.setTime(props.startAt); + } didInitialize.current = true; }, [didInitialize, videoState, props]);