improve overrides

packages/app/src/cores/player/classes/TrackInstance.js

@@ -32,24 +32,23 @@ export default class TrackInstance {
 	waitUpdateTimeout = null
 
 	mediaEvents = {
-        "ended": () => {
+		ended: () => {
 			this.player.next()
 		},
-        "loadeddata": () => {
+		loadeddata: () => {
 			this.player.state.loading = false
 		},
-        "loadedmetadata": () => {
+		loadedmetadata: () => {
 			// TODO: Detect a livestream and change mode
 			// if (instance.media.duration === Infinity) {
 			//     instance.manifest.stream = true
-
 			//     this.state.livestream_mode = true
 			// }
 		},
-        "play": () => {
+		play: () => {
 			this.player.state.playback_status = "playing"
 		},
-        "playing": () => {
+		playing: () => {
 			this.player.state.loading = false
 
 			this.player.state.playback_status = "playing"
@@ -59,13 +58,16 @@ export default class TrackInstance {
 				this.waitUpdateTimeout = null
 			}
 		},
-        "pause": () => {
+		pause: () => {
 			this.player.state.playback_status = "paused"
 		},
-        "durationchange": () => {
+		durationchange: () => {
-            this.player.eventBus.emit(`player.durationchange`, this.audio.duration)
+			this.player.eventBus.emit(
+				`player.durationchange`,
+				this.audio.duration,
+			)
 		},
-        "waiting": () => {
+		waiting: () => {
 			if (this.waitUpdateTimeout) {
 				clearTimeout(this.waitUpdateTimeout)
 				this.waitUpdateTimeout = null
@@ -76,7 +78,7 @@ export default class TrackInstance {
 				this.player.state.loading = true
 			}, 150)
 		},
-        "seeked": () => {
+		seeked: () => {
 			this.player.eventBus.emit(`player.seeked`, this.audio.currentTime)
 		},
 	}
@@ -104,7 +106,9 @@ export default class TrackInstance {
 			this.audio.addEventListener(key, value)
 		}
 
-        this.contextElement = this.player.audioContext.createMediaElementSource(this.audio)
+		this.contextElement = this.player.audioContext.createMediaElementSource(
+			this.audio,
+		)
 
 		this._initialized = true
 
@@ -120,10 +124,13 @@ export default class TrackInstance {
 			this.muxerPlayer.destroy()
 		}
 
-        const lastProcessor = this.attachedProcessors[this.attachedProcessors.length - 1]
+		const lastProcessor =
+			this.attachedProcessors[this.attachedProcessors.length - 1]
 
 		if (lastProcessor) {
-            this.attachedProcessors[this.attachedProcessors.length - 1]._destroy(this)
+			this.attachedProcessors[
+				this.attachedProcessors.length - 1
+			]._destroy(this)
 		}
 
 		this.attachedProcessors = []
@@ -142,14 +149,19 @@ export default class TrackInstance {
 
 		if (this.manifest.service) {
 			if (!this.player.serviceProviders.has(this.manifest.service)) {
-                throw new Error(`Service ${this.manifest.service} is not supported`)
+				throw new Error(
+					`Service ${this.manifest.service} is not supported`,
+				)
 			}
 
 			// try to resolve source file
 			if (!this.manifest.source) {
 				console.log("Resolving manifest cause no source defined")
 
-                this.manifest = await this.player.serviceProviders.resolve(this.manifest.service, this.manifest)
+				this.manifest = await this.player.serviceProviders.resolve(
+					this.manifest.service,
+					this.manifest,
+				)
 
 				console.log("Manifest resolved", this.manifest)
 			}
@@ -169,21 +181,18 @@ export default class TrackInstance {
 			this.manifest.metadata.title = this.manifest.source.split("/").pop()
 		}
 
-        // check if has overrides
+		// process overrides
 		const override = await this.manifest.serviceOperations.fetchOverride()
 
 		if (override) {
-            console.log(`Override found for track ${this.manifest._id}`, override)
+			console.log(
+				`Override found for track ${this.manifest._id}`,
+				override,
+			)
+
 			this.manifest.overrides = override
 		}
 
-        // FIXME: idk why this is here, move somewhere else
-        // try {
-        //     this.manifest = await this.manifest.analyzeCoverColor()
-        // } catch (error) {
-        //     //x
-        // }
-
 		return this.manifest
 	}
 }

packages/app/src/cores/player/classes/TrackManifest.js

@@ -73,10 +73,6 @@ export default class TrackManifest {
 	lyrics_enabled = false
 	liked = null
 
-	// TODO: implement this server feature to fetch some data from the server,
-	// used for example to fix a incorrect lyrics time
-	overrides = null
-
 	async initialize() {
 		if (this.params.file) {
 			this.metadata = await this.analyzeMetadata(
@@ -167,11 +163,22 @@ export default class TrackManifest {
 				return null
 			}
 
-			return await this.ctx.serviceProviders.operation(
+			const result = await this.ctx.serviceProviders.operation(
 				"resolveLyrics",
 				this.service,
 				this,
 			)
+
+			console.log(this.overrides)
+
+			if (this.overrides) {
+				return {
+					...result,
+					...this.overrides,
+				}
+			}
+
+			return result
 		},
 		fetchOverride: async () => {
 			if (!this._id) {