Add: navidrome Lyric

sawyerf · Dec 3, 2024 · 2194f36 · 2194f36
1 parent f34cda7
commit 2194f36
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/app/components/player/FullScreenPlayer.js b/app/components/player/FullScreenPlayer.js
@@ -38,9 +38,24 @@ const FullScreenPlayer = ({ fullscreen, time }) => {
 		return `${String((second - second % 60) / 60).padStart(2, '0')}:${String((second - second % 1) % 60).padStart(2, '0')}`
 	}
 
-	const getLyrics = async () => {
-		if (isPreview == preview.LYRICS) return setIsPreview(preview.COVER)
-		if (lyrics.length > 0) setIsPreview(preview.LYRICS)
+
+	const getNavidromeLyrics = () => {
+		getApi(config, 'getLyricsBySongId', { id: song.songInfo.id })
+			.then(res => {
+				const ly = res.lyricsList?.structuredLyrics[0]?.line?.map(ly => ({ time: ly.start / 1000, text: ly.value.length ? ly.value : '...' }))
+				if (ly.length == 0) { // not found
+					return getLrcLibLyrics()
+				}
+				ly.sort((a, b) => a.time - b.time)
+				setLyrics(ly)
+				setIsPreview(preview.LYRICS)
+			})
+			.catch(() => { // not found
+				getLrcLibLyrics()
+			})
+	}
+
+	const getLrcLibLyrics = () => {
 		const params = {
 			track_name: song.songInfo.title,
 			artist_name: song.songInfo.artist,
@@ -62,6 +77,12 @@ const FullScreenPlayer = ({ fullscreen, time }) => {
 			})
 	}
 
+	const getLyrics = async () => {
+		if (isPreview == preview.LYRICS) return setIsPreview(preview.COVER)
+		if (lyrics.length > 0) return setIsPreview(preview.LYRICS)
+		getNavidromeLyrics()
+	}
+
 	return (
 		<Modal>
 			<View

diff --git a/app/services/serviceWorker.js b/app/services/serviceWorker.js
@@ -60,7 +60,7 @@ registerRoute(
 
 registerRoute(
 	({ url }) => {
-		return url.hostname === "lrclib.net"
+		return url.hostname === "lrclib.net" || url.pathname.match(/\/rest\/getLyricsBySongId$/)
 	},
 	new NetworkFirst({
 		cacheName: "lyrics",