mirror of
https://github.com/IllusionMan1212/lyrics-grabbr.git
synced 2026-10-24 02:12:27 +00:00
remove spotify as lyrics source
In order to stay on f-droid spotify has to be removed. Doing different flavors is not worth it in my opinion.
This commit is contained in:
@@ -1,13 +1,6 @@
|
||||
package com.illusionman1212.lyricsgrabbr.data
|
||||
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import com.illusionman1212.lyricsgrabbr.R
|
||||
import com.illusionman1212.lyricsgrabbr.data.network.GET
|
||||
import com.illusionman1212.lyricsgrabbr.data.network.NetworkHelper
|
||||
import com.illusionman1212.lyricsgrabbr.utils.await
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlinx.serialization.json.Json
|
||||
import org.jsoup.Jsoup
|
||||
import org.jsoup.internal.StringUtil
|
||||
import org.jsoup.nodes.Element
|
||||
@@ -15,58 +8,7 @@ import org.jsoup.nodes.Node
|
||||
import org.jsoup.nodes.TextNode
|
||||
import org.jsoup.select.NodeVisitor
|
||||
|
||||
@Serializable
|
||||
data class LyricLine(
|
||||
val startTimeMs: ULong,
|
||||
val words: String,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class Lyrics(
|
||||
val syncType: String,
|
||||
val lines: List<LyricLine>,
|
||||
val language: String,
|
||||
)
|
||||
|
||||
@Serializable
|
||||
data class SuccessResponse(
|
||||
val lyrics: Lyrics,
|
||||
)
|
||||
|
||||
class LyricsRepository(private val context: Context) {
|
||||
private val networkHelper = NetworkHelper(context)
|
||||
private val json = Json {
|
||||
ignoreUnknownKeys = true
|
||||
}
|
||||
|
||||
suspend fun fetchLyricsFromSpotify(trackId: String): Pair<String, Boolean> {
|
||||
val builder = Uri.Builder()
|
||||
val url = builder.scheme("https")
|
||||
.authority("api.lyricstify.vercel.app")
|
||||
.appendPath("v1")
|
||||
.appendPath("lyrics")
|
||||
.appendPath(trackId)
|
||||
.build()
|
||||
|
||||
val res = networkHelper.client.newCall(
|
||||
GET(url.toString())
|
||||
).await()
|
||||
|
||||
val body = res.body?.string()
|
||||
|
||||
if (res.isSuccessful) {
|
||||
return Pair(json.decodeFromString(SuccessResponse.serializer(), body!!)
|
||||
.lyrics
|
||||
.lines.joinToString(separator = "\n") { it.words }, true)
|
||||
} else {
|
||||
if (res.code == 404) {
|
||||
return Pair(context.resources.getString(R.string.spotify_no_lyrics_error), false)
|
||||
}
|
||||
|
||||
return Pair(context.resources.getString(R.string.generic_error), false)
|
||||
}
|
||||
}
|
||||
|
||||
class LyricsRepository {
|
||||
fun fetchLyricsFromGenius(url: Uri): String {
|
||||
val doc = Jsoup.connect(url.toString()).userAgent(USER_AGENT).get()
|
||||
val divs = doc.select("div[data-lyrics-container]")
|
||||
|
||||
Reference in New Issue
Block a user