fix(all/Torrentio and TorrentioAnime): fix series handling (#198)

Dark25 · Jan 17, 2025 · 0bc2321 · 0bc2321
1 parent 7401c7f
commit 0bc2321
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/src/all/torrentio/build.gradle b/src/all/torrentio/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Torrentio (Torrent / Debrid)'
     extClass = '.Torrentio'
-    extVersionCode = 3
+    extVersionCode = 4
     containsNsfw = false
 }
 

diff --git a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/Torrentio.kt
@@ -139,7 +139,7 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
                 val content = node.content ?: return@mapNotNull null
 
                 SAnime.create().apply {
-                    url = "${content.externalIds?.imdbId ?: ""},${node.objectType ?: ""},${content.fullPath ?: ""}"
+                    url = "${content.externalIds?.imdbId ?: ""},${if (node.objectType == "SHOW") "series" else node.objectType ?: ""},${content.fullPath ?: ""}"
                     title = content.title ?: ""
                     thumbnail_url = "https://images.justwatch.com${content.posterUrl?.replace("{profile}", "s276")?.replace("{format}", "webp")}"
                     description = content.shortDescription ?: ""
@@ -312,18 +312,18 @@ class Torrentio : ConfigurableAnimeSource, AnimeHttpSource() {
         val responseString = response.body.string()
         val episodeList = json.decodeFromString<EpisodeList>(responseString)
         return when (episodeList.meta?.type) {
-            "show" -> {
+            "series" -> {
                 episodeList.meta.videos
                     ?.let { videos ->
-                        if (preferences.getBoolean(UPCOMING_EP_KEY, UPCOMING_EP_DEFAULT)) { videos } else { videos.filter { video -> (video.firstAired?.let { parseDate(it) } ?: 0L) <= System.currentTimeMillis() } }
+                        if (preferences.getBoolean(UPCOMING_EP_KEY, UPCOMING_EP_DEFAULT)) { videos } else { videos.filter { video -> (video.released?.let { parseDate(it) } ?: 0L) <= System.currentTimeMillis() } }
                     }
                     ?.map { video ->
                         SEpisode.create().apply {
                             episode_number = "${video.season}.${video.number}".toFloat()
                             url = "/stream/series/${video.id}.json"
-                            date_upload = video.firstAired?.let { parseDate(it) } ?: 0L
-                            name = "S${video.season.toString().trim()}:E${video.number} - ${video.name}"
-                            scanlator = (video.firstAired?.let { parseDate(it) } ?: 0L)
+                            date_upload = video.released?.let { parseDate(it) } ?: 0L
+                            name = "S${video.season.toString().trim()}:E${video.number} - ${video.title}"
+                            scanlator = (video.released?.let { parseDate(it) } ?: 0L)
                                 .takeIf { it > System.currentTimeMillis() }
                                 ?.let { "Upcoming" }
                                 ?: ""

diff --git a/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt b/src/all/torrentio/src/eu/kanade/tachiyomi/animeextension/all/torrentio/dto/TorrentioDto.kt
@@ -110,6 +110,6 @@ class EpisodeVideo(
     val id: String? = null,
     val season: Int? = null,
     val number: Int? = null,
-    val firstAired: String? = null,
-    val name: String? = null,
+    val released: String? = null,
+    val title: String? = null,
 )
diff --git a/src/all/torrentioanime/build.gradle b/src/all/torrentioanime/build.gradle
@@ -1,7 +1,7 @@
 ext {
     extName = 'Torrentio Anime (Torrent / Debrid)'
     extClass = '.Torrentio'
-    extVersionCode = 12
+    extVersionCode = 13
     containsNsfw = false
 }
 

diff --git a/...orrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListFilters.kt b/...orrentioanime/src/eu/kanade/tachiyomi/animeextension/all/torrentioanime/AniListFilters.kt
@@ -113,7 +113,7 @@ object AniListFilters {
 
         val YEAR_LIST: Array<Pair<String, String>> = arrayOf(
             Pair("Any", ""),
-        ) + (1940..2024).reversed().map { Pair(it.toString(), it.toString()) }.toTypedArray()
+        ) + (1940..2025).reversed().map { Pair(it.toString(), it.toString()) }.toTypedArray()
 
         val SEASON_LIST = arrayOf(
             Pair("Any", ""),