From 21026816fe8a917bfe4c785c59532e4c324816b7 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:23:22 +0000 Subject: [PATCH] Renamed and changed convertToMins function to work with larger values --- src/renderer/index.js | 22 ++++++++++++++++---- src/renderer/views/app/chrome-top.ejs | 4 ++-- src/renderer/views/components/fullscreen.ejs | 4 ++-- src/renderer/views/components/miniplayer.ejs | 4 ++-- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 7000a24b..69b0b739 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -1242,10 +1242,24 @@ const app = new Vue({ return this.playerLCD.playbackDuration } }, - convertToMins(time) { - let mins = Math.floor(time / 60) - let seconds = (Math.floor(time % 60) / 100).toFixed(2) - return `${mins}:${seconds.replace("0.", "")}` + convertTime(time) { + if (typeof time !== "number") { + time = parseInt(time) + } + + const timeGates = { + 600: 15, + 3600: 14, + 36000: 12, + } + + for (let key in timeGates) { + if (time < key) { + return new Date(time * 1000).toISOString().substring(timeGates[key], 19) + } + } + + return new Date(time * 1000).toISOString().substring(11, 19) }, hashCode(str) { let hash = 0, diff --git a/src/renderer/views/app/chrome-top.ejs b/src/renderer/views/app/chrome-top.ejs index 8f2d2207..e38ee43e 100644 --- a/src/renderer/views/app/chrome-top.ejs +++ b/src/renderer/views/app/chrome-top.ejs @@ -80,8 +80,8 @@
-

{{ convertToMins(getSongProgress()) }}

-

{{ convertToMins(mk.currentPlaybackDuration) }} +

{{ convertTime(getSongProgress()) }}

+

{{ convertTime(mk.currentPlaybackDuration) }}

diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs index 76551f09..51093c60 100644 --- a/src/renderer/views/components/fullscreen.ejs +++ b/src/renderer/views/components/fullscreen.ejs @@ -41,8 +41,8 @@
-

{{ app.convertToMins(app.getSongProgress()) }}

-

{{ app.convertToMins(app.mk.currentPlaybackDuration) }}

+

{{ app.convertTime(app.getSongProgress()) }}

+

{{ app.convertTime(app.mk.currentPlaybackDuration) }}

-

{{ app.convertToMins(app.getSongProgress()) }}

-

{{ app.convertToMins(app.mk.currentPlaybackDuration) }}

+

{{ app.convertTime(app.getSongProgress()) }}

+

{{ app.convertTime(app.mk.currentPlaybackDuration) }}