android/M3UAndroid
1
0
Fork 0
mirror of https://github.com/oxyroid/M3UAndroid.git synced 2025-05-17 19:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: renovate conflict.

Browse Source
This commit is contained in:
oxy-macmini
2025-04-03 22:23:46 +08:00
parent 2d9a62e6eb
commit ad8f608de1
17 changed files with 80 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/src/main/java/com/m3u/data/database/model/Channel.kt
View File

@ -76,7 +76,7 @@ data class Channel(
fun Channel.copyXtreamEpisode(episode: XtreamChannelInfo.Episode): Channel {
val url = Url(url)
val newUrl = URLBuilder(url)
.apply { path(*url.pathSegments.dropLast(1).toTypedArray()) }
.apply { path(*url.rawSegments.dropLast(1).toTypedArray()) }
.appendPathSegments("${episode.id}.${episode.containerExtension}")
.build()
return copy(

3
data/src/main/java/com/m3u/data/repository/playlist/PlaylistRepositoryImpl.kt
View File

@ -60,7 +60,6 @@ import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import okhttp3.OkHttpClient
import okhttp3.Request
@ -583,7 +582,7 @@ internal class PlaylistRepositoryImpl @Inject constructor(
val playlist = checkNotNull(get(series.playlistUrl)) { "playlist is not exist" }
val seriesInfo = xtreamParser.getSeriesInfoOrThrow(
input = XtreamInput.decodeFromPlaylistUrl(playlist.url),
seriesId = Url(series.url).pathSegments.last().toInt()
seriesId = Url(series.url).rawSegments.last().toInt()
)
// fixme: do not flatmap
return seriesInfo.episodes.flatMap { it.value }

8
data/src/main/java/com/m3u/data/tv/http/HttpServerImpl.kt
View File

@ -1,7 +1,7 @@
package com.m3u.data.tv.http
import com.m3u.data.tv.http.endpoint.Remotes
import com.m3u.data.tv.http.endpoint.Playlists
import com.m3u.data.tv.http.endpoint.Remotes
import com.m3u.data.tv.http.endpoint.SayHellos
import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
import io.ktor.serialization.kotlinx.json.json
@ -17,8 +17,8 @@ import io.ktor.server.websocket.WebSockets
import io.ktor.server.websocket.pingPeriod
import io.ktor.server.websocket.timeout
import kotlinx.serialization.json.Json
import java.time.Duration
import javax.inject.Inject
import kotlin.time.Duration.Companion.seconds
internal class HttpServerImpl @Inject constructor(
private val sayHellos: SayHellos,
@ -65,8 +65,8 @@ internal class HttpServerImpl @Inject constructor(
prettyPrint = true
}
contentConverter = KotlinxWebsocketSerializationConverter(json)
pingPeriod = Duration.ofSeconds(15)
timeout = Duration.ofSeconds(15)
pingPeriod = 15.seconds
timeout = 15.seconds
}
}