From 4a3358b9b7c1bcd58db52b2c49b0e435aa949587 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Sun, 27 Aug 2023 20:29:54 +0200
Subject: [PATCH] date ok

---
 package-lock.json             | 14 --------------
 package.json                  |  1 -
 src/components/Feed/List.vue  |  7 +++----
 src/components/Player/Bar.vue | 15 +++++++++++----
 src/utils/time.js             | 12 ++++++++++++
 5 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a9a341a..cd4958c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,6 @@
         "@nextcloud/l10n": "^2.2.0",
         "@nextcloud/router": "^2.1.2",
         "@nextcloud/vue": "8.0.0-beta.4",
-        "date-format-parse": "^0.2.7",
         "vue": "^2",
         "vue-fragment": "^1.6.0",
         "vue-material-design-icons": "^5.2.0",
@@ -8358,19 +8357,6 @@
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
diff --git a/package.json b/package.json
index 2914c20..99c8dc1 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "@nextcloud/l10n": "^2.2.0",
     "@nextcloud/router": "^2.1.2",
     "@nextcloud/vue": "8.0.0-beta.4",
-    "date-format-parse": "^0.2.7",
     "vue": "^2",
     "vue-fragment": "^1.6.0",
     "vue-material-design-icons": "^5.2.0",
diff --git a/src/components/Feed/List.vue b/src/components/Feed/List.vue
index 4e6d1b0..0fdcbf6 100644
--- a/src/components/Feed/List.vue
+++ b/src/components/Feed/List.vue
@@ -14,7 +14,7 @@
 						:url="episode.episodeImage" />
 				</template>
 				<template #subname>
-					{{ format(new Date(episode.episodeDuration*1000), 'H:mm:ss') }}
+					{{ formatTimer(new Date(episode.episodeDuration*1000)) }}
 				</template>
 				<template #actions>
 					<NcActionButton @click="play(episode)">
@@ -31,10 +31,9 @@
 
 <script>
 import { NcActionButton, NcAvatar, NcListItem, NcLoadingIcon } from '@nextcloud/vue'
+import { formatTimeAgo, formatTimer } from '../../utils/time.js'
 import Play from 'vue-material-design-icons/Play.vue'
 import axios from '@nextcloud/axios'
-import { format } from 'date-format-parse'
-import { formatTimeAgo } from '../../utils/time.js'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
@@ -74,7 +73,7 @@ export default {
 		}
 	},
 	methods: {
-		format,
+		formatTimer,
 		formatTimeAgo,
 		play(episode) {
 			this.$store.commit('player/play', episode)
diff --git a/src/components/Player/Bar.vue b/src/components/Player/Bar.vue
index a50d2bf..519df94 100644
--- a/src/components/Player/Bar.vue
+++ b/src/components/Player/Bar.vue
@@ -4,16 +4,18 @@
 			autoplay
 			preload
 			:src="episode.episodeUrl"
+			@durationchange="duration = audio.duration"
 			@loadeddata="loading = false"
 			@pause="paused = audio.paused"
 			@play="paused = audio.paused"
 			@seeked="currentTime = audio.currentTime"
+			@timeupdate="currentTime = audio.currentTime"
 			@volumechange="volume = audio.volume" />
 		<NcLoadingIcon v-if="loading" />
 		<div v-if="!loading"
 			class="progress"
-			@click="(event) => audio.fastSeek(event.x * audio.duration / event.target.offsetWidth)">
-			<NcProgressBar size="medium" :value="currentTime * 100 / audio.duration" />
+			@click="(event) => audio.fastSeek(event.x * duration / event.target.offsetWidth)">
+			<NcProgressBar size="medium" :value="currentTime * 100 / duration" />
 		</div>
 		<div v-if="!loading" class="player">
 			<img :src="episode.episodeImage">
@@ -28,9 +30,9 @@
 			<Pause v-if="!paused" :size="50" @click="() => audio.pause()" />
 			<Play v-if="paused" :size="50" @click="() => audio.play()" />
 			<div class="time">
-				<span class="current">{{ currentTime }}</span>
+				<span class="current">{{ formatTimer(new Date(currentTime*1000)) }}</span>
 				<span class="divider">/</span>
-				<span class="length">{{ audio.duration }}</span>
+				<span class="length">{{ formatTimer(new Date(duration*1000)) }}</span>
 			</div>
 			<div class="volume">
 				<VolumeHigh v-if="audio.volume > 0.7" :size="30" />
@@ -50,6 +52,7 @@ import VolumeHigh from 'vue-material-design-icons/VolumeHigh.vue'
 import VolumeLow from 'vue-material-design-icons/VolumeLow.vue'
 import VolumeMedium from 'vue-material-design-icons/VolumeMedium.vue'
 import VolumeMute from 'vue-material-design-icons/VolumeMute.vue'
+import { formatTimer } from '../../utils/time.js'
 
 export default {
 	name: 'Bar',
@@ -66,6 +69,7 @@ export default {
 	data() {
 		return {
 			currentTime: 0,
+			duration: 0,
 			loading: true,
 			paused: true,
 			volume: 0,
@@ -82,6 +86,9 @@ export default {
 			return atob(this.$route.params.url)
 		},
 	},
+	methods: {
+		formatTimer,
+	},
 }
 </script>
 
diff --git a/src/utils/time.js b/src/utils/time.js
index 2bba9ca..39aa5bc 100644
--- a/src/utils/time.js
+++ b/src/utils/time.js
@@ -25,3 +25,15 @@ export const formatTimeAgo = (date) => {
 		duration /= division.amount
 	}
 }
+
+export const formatTimer = (date) => {
+	const minutes = date.getUTCMinutes().toString().padStart(2, 0)
+	const seconds = date.getUTCSeconds().toString().padStart(2, 0)
+	let timer = `${minutes}:${seconds}`
+
+	if (date.getUTCHours()) {
+		timer = `${date.getUTCHours()}:${timer}`
+	}
+
+	return timer
+}