Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-11-22 17:14:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

YT Provider Fix

Browse Source
This commit is contained in:
shabinder 2021-01-02 03:46:20 +05:30
parent fd2a1cf46b
commit 0a2cd5400a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/com/shabinder/spotiflyer/downloadHelper/YoutubeProvider.kt
View File

@ -22,6 +22,7 @@ import com.beust.klaxon.JsonArray
import com.beust.klaxon.JsonObject import com.beust.klaxon.JsonObject
import com.beust.klaxon.Parser import com.beust.klaxon.Parser
import com.shabinder.spotiflyer.models.YoutubeTrack import com.shabinder.spotiflyer.models.YoutubeTrack
import com.shabinder.spotiflyer.utils.log
import me.xdrop.fuzzywuzzy.FuzzySearch import me.xdrop.fuzzywuzzy.FuzzySearch
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
@ -119,15 +120,20 @@ fun getYTTracks(response: String):List<YoutubeTrack>{
if(detail.obj("musicResponsiveListItemFlexColumnRenderer")?.size!! < 2) continue if(detail.obj("musicResponsiveListItemFlexColumnRenderer")?.size!! < 2) continue
// if not a dummy, collect All Variables // if not a dummy, collect All Variables
detail.obj("musicResponsiveListItemFlexColumnRenderer") val details = detail.obj("musicResponsiveListItemFlexColumnRenderer")
?.obj("text") ?.obj("text")
?.array<JsonObject>("runs")?.get(0)?.get("text")?.let { ?.array<JsonObject>("runs") ?: listOf()
availableDetails.add( for (d in details){
it.toString() d["text"]?.let {
) if(it.toString() != " • "){
availableDetails.add(
it.toString()
)
}
} }
}
} }
//log("Text Api",availableDetails.toString()) // log("YT Music details",availableDetails.toString())
/* /*
! Filter Out non-Song/Video results and incomplete results here itself ! Filter Out non-Song/Video results and incomplete results here itself
! From what we know about detail order, note that [1] - indicate result type ! From what we know about detail order, note that [1] - indicate result type
@ -135,7 +141,7 @@ fun getYTTracks(response: String):List<YoutubeTrack>{
if ( availableDetails.size == 5 && availableDetails[1] in listOf("Song","Video") ){ if ( availableDetails.size == 5 && availableDetails[1] in listOf("Song","Video") ){
// skip if result is in hours instead of minutes (no song is that long) // skip if result is in hours instead of minutes (no song is that long)
if(availableDetails[4].split(':').size != 2) continue //Has Been Giving Issues if(availableDetails[4].split(':').size != 2) continue
/* /*
! grab Video ID ! grab Video ID
@ -145,7 +151,7 @@ fun getYTTracks(response: String):List<YoutubeTrack>{
! reference the dict keys by index ! reference the dict keys by index
*/ */
val videoId:String = result.last().obj("watchEndpoint")?.get("videoId") as String val videoId:String? = result.last().obj("watchEndpoint")?.get("videoId") as String?
val ytTrack = YoutubeTrack( val ytTrack = YoutubeTrack(
name = availableDetails[0], name = availableDetails[0],
type = availableDetails[1], type = availableDetails[1],
@ -154,10 +160,11 @@ fun getYTTracks(response: String):List<YoutubeTrack>{
videoId = videoId videoId = videoId
) )
youtubeTracks.add(ytTrack) youtubeTracks.add(ytTrack)
} }
} }
} }
log("YT Search",youtubeTracks.joinToString(" abc \n"))
return youtubeTracks return youtubeTracks
} }

1
app/src/main/java/com/shabinder/spotiflyer/worker/ForegroundService.kt
View File

@ -190,6 +190,7 @@ class ForegroundService : Service(){
trackDurationSec = it.durationSec trackDurationSec = it.durationSec
).keys.firstOrNull() ).keys.firstOrNull()
log("Service VideoID", videoId ?: "Not Found") log("Service VideoID", videoId ?: "Not Found")
//println(response.body().toString())
if (videoId.isNullOrBlank()) { if (videoId.isNullOrBlank()) {
sendTrackBroadcast(Status.FAILED.name, it) sendTrackBroadcast(Status.FAILED.name, it)
failed++ failed++