temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-01 01:44:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

use future properly

Browse Source
This commit is contained in:
Aria Moradi
2021-04-02 14:06:41 +04:30
parent 68e69085df
commit da5dd70969
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
server/src/main/kotlin/ir/armor/tachidesk/server/JavalinSetup.kt
View File

@@ -105,7 +105,6 @@ object JavalinSetup {
app.get("/api/v1/extension/update/:pkgName") { ctx -> app.get("/api/v1/extension/update/:pkgName") { ctx ->
val pkgName = ctx.pathParam("pkgName") val pkgName = ctx.pathParam("pkgName")
// TODO maybe replace with ctx.result(scope.future { updateExtension(pkgName) })?
ctx.json( ctx.json(
future { future {
updateExtension(pkgName) updateExtension(pkgName)
@@ -123,11 +122,14 @@ object JavalinSetup {
// icon for extension named `apkName` // icon for extension named `apkName`
app.get("/api/v1/extension/icon/:apkName") { ctx -> app.get("/api/v1/extension/icon/:apkName") { ctx ->
val apkName = ctx.pathParam("apkName") val apkName = ctx.pathParam("apkName")
// TODO see if there is a better way
val result = future { getExtensionIcon(apkName) }.get()
ctx.result(result.first) ctx.result(
ctx.header("content-type", result.second) future { getExtensionIcon(apkName) }
.thenApply {
ctx.header("content-type", it.second)
it.first
}
)
} }
// list of sources // list of sources
@@ -176,27 +178,32 @@ object JavalinSetup {
// manga thumbnail // manga thumbnail
app.get("api/v1/manga/:mangaId/thumbnail") { ctx -> app.get("api/v1/manga/:mangaId/thumbnail") { ctx ->
val mangaId = ctx.pathParam("mangaId").toInt() val mangaId = ctx.pathParam("mangaId").toInt()
// TODO see if there is a better way
val result = future { getMangaThumbnail(mangaId) }.get()
ctx.result(result.first) ctx.result(
ctx.header("content-type", result.second) future { getMangaThumbnail(mangaId) }
.thenApply {
ctx.header("content-type", it.second)
it.first
}
)
} }
// adds the manga to library // adds the manga to library
app.get("api/v1/manga/:mangaId/library") { ctx -> app.get("api/v1/manga/:mangaId/library") { ctx ->
val mangaId = ctx.pathParam("mangaId").toInt() val mangaId = ctx.pathParam("mangaId").toInt()
// TODO see if there is a better way
future { addMangaToLibrary(mangaId) }.get() ctx.result(
ctx.status(200) future { addMangaToLibrary(mangaId) }
)
} }
// removes the manga from the library // removes the manga from the library
app.delete("api/v1/manga/:mangaId/library") { ctx -> app.delete("api/v1/manga/:mangaId/library") { ctx ->
val mangaId = ctx.pathParam("mangaId").toInt() val mangaId = ctx.pathParam("mangaId").toInt()
// TODO see if there is a better way
future { removeMangaFromLibrary(mangaId) }.get() ctx.result(
ctx.status(200) future { removeMangaFromLibrary(mangaId) }
)
} }
// list manga's categories // list manga's categories
@@ -238,11 +245,14 @@ object JavalinSetup {
val mangaId = ctx.pathParam("mangaId").toInt() val mangaId = ctx.pathParam("mangaId").toInt()
val chapterIndex = ctx.pathParam("chapterIndex").toInt() val chapterIndex = ctx.pathParam("chapterIndex").toInt()
val index = ctx.pathParam("index").toInt() val index = ctx.pathParam("index").toInt()
// TODO see if there is a better way
val result = future { getPageImage(mangaId, chapterIndex, index) }.get()
ctx.result(result.first) ctx.result(
ctx.header("content-type", result.second) future { getPageImage(mangaId, chapterIndex, index) }
.thenApply {
ctx.header("content-type", it.second)
it.first
}
)
} }
// global search // global search