Seil0/teapod
1
0
Fork 0
Code Issues 7 Pull Requests Releases 17 Wiki Activity

clean up some AoDParser related code

Browse Source
This commit is contained in:
Jannik
2021-07-25 19:15:31 +02:00
parent 9dfd2cf70b
commit 0340c83b47
11 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/mosad/teapod/util/DataTypes.kt
View File

@ -36,7 +36,7 @@ data class ThirdPartyComponent(
* it is uses in the ItemMediaAdapter (RecyclerView)
*/
data class ItemMedia(
val id: Int,
val id: Int, // aod path id
val title: String,
val posterUrl: String
)
@ -101,9 +101,9 @@ data class Stream(
/**
* this class is used to represent the aod json API?
*/
data class AoDObject(
val playlist: List<Playlist>,
val extLanguage: String
data class AoDPlaylist(
val list: List<Playlist>,
val language: String
)
data class Playlist(

4
app/src/main/java/org/mosad/teapod/util/adapter/EpisodeItemAdapter.kt
View File

@ -12,9 +12,9 @@ import jp.wasabeef.glide.transformations.RoundedCornersTransformation
import org.mosad.teapod.R
import org.mosad.teapod.databinding.ItemEpisodeBinding
import org.mosad.teapod.util.Episode
import org.mosad.teapod.util.tmdb.TVEpisode
import org.mosad.teapod.util.tmdb.TMDBTVEpisode
class EpisodeItemAdapter(private val episodes: List<Episode>, private val tmdbEpisodes: List<TVEpisode>?) : RecyclerView.Adapter<EpisodeItemAdapter.EpisodeViewHolder>() {
class EpisodeItemAdapter(private val episodes: List<Episode>, private val tmdbEpisodes: List<TMDBTVEpisode>?) : RecyclerView.Adapter<EpisodeItemAdapter.EpisodeViewHolder>() {
var onImageClick: ((String, Int) -> Unit)? = null

12
app/src/main/java/org/mosad/teapod/util/tmdb/TMDBApiController.kt
View File

@ -85,12 +85,12 @@ class TMDBApiController {
* @param movieId The tmdb ID of the movie
* @return A tmdb movie object, or null if not found
*/
suspend fun getMovieDetails(movieId: Int): Movie? = withContext(Dispatchers.IO) {
suspend fun getMovieDetails(movieId: Int): TMDBMovie? = withContext(Dispatchers.IO) {
val url = URL("$detailsMovieUrl/$movieId?api_key=$apiKey&language=$language")
return@withContext try {
val json = url.readText()
Gson().fromJson(json, Movie::class.java)
Gson().fromJson(json, TMDBMovie::class.java)
} catch (ex: FileNotFoundException) {
Log.w(javaClass.name, "Waring: The requested media was not found. Requested ID: $movieId", ex)
null
@ -103,12 +103,12 @@ class TMDBApiController {
* @param tvId The tmdb ID of the tv show
* @return A tmdb tv show object, or null if not found
*/
suspend fun getTVShowDetails(tvId: Int): TVShow? = withContext(Dispatchers.IO) {
suspend fun getTVShowDetails(tvId: Int): TMDBTVShow? = withContext(Dispatchers.IO) {
val url = URL("$detailsTVUrl/$tvId?api_key=$apiKey&language=$language")
return@withContext try {
val json = url.readText()
Gson().fromJson(json, TVShow::class.java)
Gson().fromJson(json, TMDBTVShow::class.java)
} catch (ex: FileNotFoundException) {
Log.w(javaClass.name, "Waring: The requested media was not found. Requested ID: $tvId", ex)
null
@ -122,12 +122,12 @@ class TMDBApiController {
* @param seasonNumber The tmdb season number
* @return A tmdb tv season object, or null if not found
*/
suspend fun getTVSeasonDetails(tvId: Int, seasonNumber: Int): TVSeason? = withContext(Dispatchers.IO) {
suspend fun getTVSeasonDetails(tvId: Int, seasonNumber: Int): TMDBTVSeason? = withContext(Dispatchers.IO) {
val url = URL("$detailsTVUrl/$tvId/season/$seasonNumber?api_key=$apiKey&language=$language")
return@withContext try {
val json = url.readText()
Gson().fromJson(json, TVSeason::class.java)
Gson().fromJson(json, TMDBTVSeason::class.java)
} catch (ex: FileNotFoundException) {
Log.w(javaClass.name, "Waring: The requested media was not found. Requested ID: $tvId, Season: $seasonNumber", ex)
null

10
app/src/main/java/org/mosad/teapod/util/tmdb/TMDBDataTypes.kt
View File

@ -37,7 +37,7 @@ abstract class TMDBResult{
abstract val backdropPath: String?
}
data class Movie(
data class TMDBMovie(
override val id: Int,
override val name: String,
override val overview: String?,
@ -52,7 +52,7 @@ data class Movie(
// TODO generes
): TMDBResult()
data class TVShow(
data class TMDBTVShow(
override val id: Int,
override val name: String,
override val overview: String,
@ -67,7 +67,7 @@ data class TVShow(
// TODO generes
): TMDBResult()
data class TVSeason(
data class TMDBTVSeason(
val id: Int,
val name: String,
val overview: String,
@ -76,12 +76,12 @@ data class TVSeason(
@SerializedName("air_date")
val airDate: String,
@SerializedName("episodes")
val episodes: List<TVEpisode>,
val episodes: List<TMDBTVEpisode>,
@SerializedName("season_number")
val seasonNumber: Int
)
data class TVEpisode(
data class TMDBTVEpisode(
val id: Int,
val name: String,
val overview: String,