Mirrors/movie-web
2
0
Fork 0
mirror of https://github.com/movie-web/movie-web.git synced 2024-09-21 16:40:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from zisra/fix-time

Browse Source 
Fix "Finish at xx:xxPM/AM"
This commit is contained in:
James Hawkins 2023-05-10 10:40:17 +01:00 committed by GitHub
commit 835e818ca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/video/components/actions/TimeAction.tsx
View File

@ -55,13 +55,14 @@ export function TimeAction(props: Props) {
hasHours hasHours
); );
const duration = formatSeconds(videoTime.duration, hasHours); const duration = formatSeconds(videoTime.duration, hasHours);
const timeLeft = formatSeconds( const remaining = formatSeconds(
(videoTime.duration - videoTime.time) / mediaPlaying.playbackSpeed, (videoTime.duration - videoTime.time) / mediaPlaying.playbackSpeed,
hasHours hasHours
); );
const timeFinished = new Date( const timeFinished = new Date(
new Date().getTime() + new Date().getTime() +
(videoTime.duration * 1000) / mediaPlaying.playbackSpeed ((videoTime.duration - videoTime.time) * 1000) /
mediaPlaying.playbackSpeed
).toLocaleTimeString("en-US", { ).toLocaleTimeString("en-US", {
hour: "numeric", hour: "numeric",
minute: "numeric", minute: "numeric",
@ -77,10 +78,10 @@ export function TimeAction(props: Props) {
formattedTime = `${currentTime} ${props.noDuration ? "" : `/ ${duration}`}`; formattedTime = `${currentTime} ${props.noDuration ? "" : `/ ${duration}`}`;
} else if (timeFormat === VideoPlayerTimeFormat.REMAINING && !isMobile) { } else if (timeFormat === VideoPlayerTimeFormat.REMAINING && !isMobile) {
formattedTime = `${t("videoPlayer.timeLeft", { formattedTime = `${t("videoPlayer.timeLeft", {
timeLeft, timeLeft: remaining,
})}${videoTime.time === videoTime.duration ? "" : formattedTimeFinished} `; })}${videoTime.time === videoTime.duration ? "" : formattedTimeFinished} `;
} else if (timeFormat === VideoPlayerTimeFormat.REMAINING && isMobile) { } else if (timeFormat === VideoPlayerTimeFormat.REMAINING && isMobile) {
formattedTime = `-${timeLeft}`; formattedTime = `-${remaining}`;
} else { } else {
formattedTime = ""; formattedTime = "";
} }