barebones anime player

server/src/main/kotlin/suwayomi/anime/AnimeAPI.kt

@@ -21,7 +21,6 @@ import suwayomi.anime.impl.extension.Extension.installExtension
 import suwayomi.anime.impl.extension.Extension.uninstallExtension
 import suwayomi.anime.impl.extension.Extension.updateExtension
 import suwayomi.anime.impl.extension.ExtensionsList.getExtensionList
-import suwayomi.server.JavalinSetup
 import suwayomi.server.JavalinSetup.future
 
 object AnimeAPI {
@@ -40,7 +39,7 @@ object AnimeAPI {
             val pkgName = ctx.pathParam("pkgName")
 
             ctx.json(
-                JavalinSetup.future {
+                future {
                     installExtension(pkgName)
                 }
             )
@@ -51,7 +50,7 @@ object AnimeAPI {
             val pkgName = ctx.pathParam("pkgName")
 
             ctx.json(
-                JavalinSetup.future {
+                future {
                     updateExtension(pkgName)
                 }
             )
@@ -70,7 +69,7 @@ object AnimeAPI {
             val apkName = ctx.pathParam("apkName")
 
             ctx.result(
-                JavalinSetup.future { getExtensionIcon(apkName) }
+                future { getExtensionIcon(apkName) }
                     .thenApply {
                         ctx.header("content-type", it.second)
                         it.first
@@ -94,7 +93,7 @@ object AnimeAPI {
             val sourceId = ctx.pathParam("sourceId").toLong()
             val pageNum = ctx.pathParam("pageNum").toInt()
             ctx.json(
-                JavalinSetup.future {
+                future {
                     getAnimeList(sourceId, pageNum, popular = true)
                 }
             )
@@ -105,7 +104,7 @@ object AnimeAPI {
             val sourceId = ctx.pathParam("sourceId").toLong()
             val pageNum = ctx.pathParam("pageNum").toInt()
             ctx.json(
-                JavalinSetup.future {
+                future {
                     getAnimeList(sourceId, pageNum, popular = false)
                 }
             )
@@ -117,7 +116,7 @@ object AnimeAPI {
             val onlineFetch = ctx.queryParam("onlineFetch", "false").toBoolean()
 
             ctx.json(
-                JavalinSetup.future {
+                future {
                     getAnime(animeId, onlineFetch)
                 }
             )
@@ -128,7 +127,7 @@ object AnimeAPI {
             val animeId = ctx.pathParam("animeId").toInt()
 
             ctx.result(
-                JavalinSetup.future { getAnimeThumbnail(animeId) }
+                future { getAnimeThumbnail(animeId) }
                     .thenApply {
                         ctx.header("content-type", it.second)
                         it.first
@@ -164,14 +163,14 @@ object AnimeAPI {
 
             val onlineFetch = ctx.queryParam("onlineFetch")?.toBoolean()
 
-            ctx.json(JavalinSetup.future { getEpisodeList(animeId, onlineFetch) })
+            ctx.json(future { getEpisodeList(animeId, onlineFetch) })
         }
 
         // used to display a episode, get a episode in order to show it's <Quality pending>
         app.get("/api/v1/anime/anime/:animeId/episode/:episodeIndex") { ctx ->
             val episodeIndex = ctx.pathParam("episodeIndex").toInt()
             val animeId = ctx.pathParam("animeId").toInt()
-            ctx.json(JavalinSetup.future { getEpisode(episodeIndex, animeId) })
+            ctx.json(future { getEpisode(episodeIndex, animeId) })
         }
 
         // used to modify a episode's parameters

server/src/main/kotlin/suwayomi/anime/impl/Episode.kt

@@ -8,6 +8,7 @@ package suwayomi.anime.impl
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 import eu.kanade.tachiyomi.source.model.SAnime
+import eu.kanade.tachiyomi.source.model.SEpisode
 import org.jetbrains.exposed.sql.SortOrder.DESC
 import org.jetbrains.exposed.sql.and
 import org.jetbrains.exposed.sql.deleteWhere
@@ -18,6 +19,7 @@ import org.jetbrains.exposed.sql.update
 import suwayomi.anime.impl.Anime.getAnime
 import suwayomi.anime.impl.util.GetAnimeHttpSource.getAnimeHttpSource
 import suwayomi.anime.model.dataclass.EpisodeDataClass
+import suwayomi.anime.model.table.AnimeTable
 import suwayomi.anime.model.table.EpisodeTable
 import suwayomi.anime.model.table.toDataClass
 import suwayomi.tachidesk.impl.util.lang.awaitSingle
@@ -59,7 +61,7 @@ object Episode {
                 val episodeEntry = EpisodeTable.select { EpisodeTable.url eq fetchedEpisode.url }.firstOrNull()
                 if (episodeEntry == null) {
                     EpisodeTable.insert {
-                        it[url] = source.
+                        it[url] = fetchedEpisode.url
                         it[name] = fetchedEpisode.name
                         it[date_upload] = fetchedEpisode.date_upload
                         it[episode_number] = fetchedEpisode.episode_number
@@ -128,7 +130,32 @@ object Episode {
 
     /** used to display a episode, get a episode in order to show it's video */
     suspend fun getEpisode(episodeIndex: Int, animeId: Int): EpisodeDataClass {
-        return getEpisodeList(animeId, true).first { it.index == episodeIndex }
+        val episode = getEpisodeList(animeId, false)
+            .first { it.index == episodeIndex }
+
+        val animeEntry = transaction { AnimeTable.select { AnimeTable.id eq animeId }.first() }
+        val source = getAnimeHttpSource(animeEntry[AnimeTable.sourceReference])
+        val fetchedLinkUrl = source.fetchEpisodeLink(
+            SEpisode.create().also {
+                it.url = episode.url
+                it.name = episode.name
+            }
+        ).awaitSingle()
+
+        return EpisodeDataClass(
+            episode.url,
+            episode.name,
+            episode.uploadDate,
+            episode.episodeNumber,
+            episode.scanlator,
+            animeId,
+            episode.read,
+            episode.bookmarked,
+            episode.lastPageRead,
+            episode.index,
+            episode.episodeCount,
+            fetchedLinkUrl
+        )
     }
 
 //    /** used to display a episode, get a episode in order to show it's pages */

server/src/main/kotlin/suwayomi/anime/model/dataclass/EpisodeDataClass.kt

@@ -27,9 +27,9 @@ data class EpisodeDataClass(
     /** this chapter's index, starts with 1 */
     val index: Int,
 
-    /** total chapter count, used to calculate if there's a next and prev chapter */
-    val chapterCount: Int? = null,
+    /** total episode count, used to calculate if there's a next and prev episode */
+    val episodeCount: Int? = null,
 
     /** used to construct pages in the front-end */
-    val pageCount: Int? = null,
+    val linkUrl: String? = null,
 )

server/src/main/kotlin/suwayomi/anime/model/table/EpisodeTable.kt

@@ -9,6 +9,8 @@ package suwayomi.anime.model.table
 
 import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.ResultRow
+import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.transactions.transaction
 import suwayomi.anime.model.dataclass.EpisodeDataClass
 
 object EpisodeTable : IntIdTable() {
@@ -40,4 +42,5 @@ fun EpisodeTable.toDataClass(episodeEntry: ResultRow) =
         episodeEntry[isBookmarked],
         episodeEntry[lastPageRead],
         episodeEntry[episodeIndex],
+        transaction { EpisodeTable.select { anime eq episodeEntry[anime] }.count().toInt() }
     )