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

Fix/web interface manager get latest compatible version #706

Merged
merged 4 commits into from
Oct 8, 2023
Merged

Fix/web interface manager get latest compatible version #706

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aeb71ea
Correctly check for none PREVIEW channel latest compatible version
schroda Oct 7, 2023
212fe25
Remove PREVIEW version constant
schroda Oct 7, 2023
1456cc9
Consider versions of different channels
schroda Oct 7, 2023
1b9cdc2
Restrict min compatible version to the bundled version
schroda Oct 7, 2023
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
22 changes: 15 additions & 7 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 @@ -121,7 +121,6 @@ object WebInterfaceManager {
private val logger = KotlinLogging.logger {}
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.Default)

private const val WEBUI_PREVIEW_VERSION = "PREVIEW"
private const val LAST_WEBUI_UPDATE_CHECK_KEY = "lastWebUIUpdateCheckKey"

private val preferences = Preferences.userNodeForPackage(WebInterfaceManager::class.java)
Expand Down Expand Up @@ -479,15 +478,24 @@ object WebInterfaceManager {
?: throw Exception("Invalid mappingFile")
val minServerVersionNumber = extractVersion(minServerVersionString)

val ignorePreviewVersion =
!WebUIChannel.doesConfigChannelEqual(WebUIChannel.PREVIEW) && webUIVersion == WEBUI_PREVIEW_VERSION
if (ignorePreviewVersion) {
continue
} else {
if (!WebUIChannel.doesConfigChannelEqual(WebUIChannel.from(webUIVersion))) {
// allow only STABLE versions for STABLE channel
if (WebUIChannel.doesConfigChannelEqual(WebUIChannel.STABLE)) {
continue
}

// allow all versions for PREVIEW channel
}

if (webUIVersion == WebUIChannel.PREVIEW.name) {
webUIVersion = fetchPreviewVersion()
}

val isCompatibleVersion = minServerVersionNumber <= currentServerVersionNumber
val isCompatibleVersion =
minServerVersionNumber <= currentServerVersionNumber && minServerVersionNumber >=
extractVersion(
BuildConfig.WEBUI_TAG,
)
if (isCompatibleVersion) {
return webUIVersion
}
Expand Down