Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update served webUI after update #764

Merged
merged 1 commit into from
Nov 7, 2023
Merged

Update served webUI after update #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion server/src/main/kotlin/suwayomi/tachidesk/server/JavalinSetup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,19 @@ object JavalinSetup {
val app =
Javalin.create { config ->
if (serverConfig.webUIEnabled.value) {
val serveWebUI = {
config.addSinglePageRoot("/", applicationDirs.webUIRoot + "/index.html", Location.EXTERNAL)
}
WebInterfaceManager.setServeWebUI(serveWebUI)

runBlocking {
WebInterfaceManager.setupWebUI()
}

logger.info { "Serving web static files for ${serverConfig.webUIFlavor.value}" }
config.addStaticFiles(applicationDirs.webUIRoot, Location.EXTERNAL)
config.addSinglePageRoot("/", applicationDirs.webUIRoot + "/index.html", Location.EXTERNAL)
serveWebUI()

config.registerPlugin(OpenApiPlugin(getOpenApiOptions()))
}

Expand Down
8 changes: 8 additions & 0 deletions server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,12 @@ object WebInterfaceManager {
)
}

private var serveWebUI: () -> Unit = {}

fun setServeWebUI(serveWebUI: () -> Unit) {
this.serveWebUI = serveWebUI
}

private fun isAutoUpdateEnabled(): Boolean {
return serverConfig.webUIUpdateCheckInterval.value.toInt() != 0
}
Expand Down Expand Up @@ -566,6 +572,8 @@ object WebInterfaceManager {
log.info { "Extracting WebUI zip Done." }

emitStatus(version, FINISHED, 100)

serveWebUI()
} catch (e: Exception) {
emitStatus(version, ERROR, 0)
throw e
Expand Down