From f738a162d3cd4582612d4986b3d3887e1c309bdd Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 15 Jun 2024 19:05:28 +0200 Subject: [PATCH] Support for "STABLEPREVIEW" webUI version (#970) Makes it possible to release new stable webUI versions without having to update the mapping file. --- .../suwayomi/tachidesk/server/util/WebInterfaceManager.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt index 37347a2e..508867a4 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt @@ -597,16 +597,19 @@ object WebInterfaceManager { ?: throw Exception("Invalid mappingFile") val minServerVersionNumber = extractVersion(minServerVersionString) + // is a STABLE webUI release, without a specified webUI version, which requires same handling as the PREVIEW release + val isUnknownStableVersion = webUIVersion == "STABLEPREVIEW" + if (!WebUIChannel.doesConfigChannelEqual(WebUIChannel.from(webUIVersion))) { // allow only STABLE versions for STABLE channel - if (WebUIChannel.doesConfigChannelEqual(WebUIChannel.STABLE)) { + if (WebUIChannel.doesConfigChannelEqual(WebUIChannel.STABLE) && !isUnknownStableVersion) { continue } // allow all versions for PREVIEW channel } - if (webUIVersion == WebUIChannel.PREVIEW.name) { + if (webUIVersion == WebUIChannel.PREVIEW.name || isUnknownStableVersion) { webUIVersion = fetchPreviewVersion(flavor) }