From 35f51f4e986eb478a8d649e17bfce97cde631fa8 Mon Sep 17 00:00:00 2001 From: mfcar Date: Sat, 4 May 2024 20:26:05 +0100 Subject: [PATCH] Fix formatting --- client/players/AudioTrack.js | 69 +++++++++++++++--------------- client/players/LocalAudioPlayer.js | 2 +- 2 files changed, 35 insertions(+), 36 deletions(-) diff --git a/client/players/AudioTrack.js b/client/players/AudioTrack.js index 2146c3e09..96d6a8d98 100644 --- a/client/players/AudioTrack.js +++ b/client/players/AudioTrack.js @@ -1,43 +1,42 @@ export default class AudioTrack { - constructor(track, userToken) { - this.index = track.index || 0 - this.startOffset = track.startOffset || 0 // Total time of all previous tracks - this.duration = track.duration || 0 - this.title = track.title || '' - this.contentUrl = track.contentUrl || null - this.transcriptUrl = track.transcriptUrl || null - this.mimeType = track.mimeType - this.metadata = track.metadata || {} + constructor(track, userToken) { + this.index = track.index || 0 + this.startOffset = track.startOffset || 0 // Total time of all previous tracks + this.duration = track.duration || 0 + this.title = track.title || '' + this.contentUrl = track.contentUrl || null + this.mimeType = track.mimeType + this.metadata = track.metadata || {} - this.userToken = userToken + this.userToken = userToken + } + + get fullContentUrl() { + if (!this.contentUrl || this.contentUrl.startsWith('http')) return this.contentUrl + + if (process.env.NODE_ENV === 'development') { + return `${process.env.serverUrl}${this.contentUrl}?token=${this.userToken}` + } + return `${window.location.origin}${this.contentUrl}?token=${this.userToken}` + } + + get relativeContentUrl() { + if (!this.contentUrl || this.contentUrl.startsWith('http')) return this.contentUrl + + if (process.env.NODE_ENV === 'development') { + return `${process.env.serverUrl}${this.contentUrl}?token=${this.userToken}` } - get fullContentUrl() { - if (!this.contentUrl || this.contentUrl.startsWith('http')) return this.contentUrl + return this.contentUrl + `?token=${this.userToken}` + } - if (process.env.NODE_ENV === 'development') { - return `${process.env.serverUrl}${this.contentUrl}?token=${this.userToken}` - } - return `${window.location.origin}${this.contentUrl}?token=${this.userToken}` + get relativeTranscriptionUrl() { + if (!this.transcriptUrl || this.transcriptUrl.startsWith('http')) return this.transcriptUrl + + if (process.env.NODE_ENV === 'development') { + return `${process.env.serverUrl}${this.transcriptUrl}?token=${this.userToken}` } - get relativeContentUrl() { - if (!this.contentUrl || this.contentUrl.startsWith('http')) return this.contentUrl - - if (process.env.NODE_ENV === 'development') { - return `${process.env.serverUrl}${this.contentUrl}?token=${this.userToken}` - } - - return this.contentUrl + `?token=${this.userToken}` - } - - get relativeTranscriptionUrl() { - if (!this.transcriptUrl || this.transcriptUrl.startsWith('http')) return this.transcriptUrl - - if (process.env.NODE_ENV === 'development') { - return `${process.env.serverUrl}${this.transcriptUrl}?token=${this.userToken}` - } - - return this.transcriptUrl + `?token=${this.userToken}` - } + return this.transcriptUrl + `?token=${this.userToken}` + } } diff --git a/client/players/LocalAudioPlayer.js b/client/players/LocalAudioPlayer.js index 884951c93..f56f89b90 100644 --- a/client/players/LocalAudioPlayer.js +++ b/client/players/LocalAudioPlayer.js @@ -172,7 +172,7 @@ export default class LocalAudioPlayer extends EventEmitter { this.hlsInstance.attachMedia(this.player) this.hlsInstance.on(Hls.Events.MEDIA_ATTACHED, () => { - this.hlsInstance.loadSource(this.currentTrack.relativeContentUrl) + this.hlsInstance.loadSource(this.currentTrack.relativeContentUrl) this.hlsInstance.on(Hls.Events.MANIFEST_PARSED, () => { console.log('[HLS] Manifest Parsed')