mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 06:42:05 +01:00
Code Issues Projects Releases Wiki Activity

Automatic Lint

Browse Source
This commit is contained in:
Syer10
2024-03-29 00:16:52 +00:00
parent 253095fab1
commit b93c96a85b
48 changed files with 204 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/server/HttpClient.kt
View File

@@ -57,12 +57,14 @@ fun httpClient(
engine {
proxy = when (serverPreferences.proxy().get()) {
Proxy.NO_PROXY -> null
Proxy.HTTP_PROXY -> ProxyBuilder.http(
URLBuilder(
host = serverPreferences.proxyHttpHost().get(),
port = serverPreferences.proxyHttpPort().get(),
).build(),
)
Proxy.SOCKS_PROXY -> ProxyBuilder.socks(
serverPreferences.proxySocksHost().get(),
serverPreferences.proxySocksPort().get(),
@@ -71,6 +73,7 @@ fun httpClient(
}
when (serverPreferences.auth().get()) {
Auth.NONE -> Unit
Auth.BASIC -> AuthPlugin {
basic {
sendWithoutRequest {
@@ -84,6 +87,7 @@ fun httpClient(
}
}
}
Auth.DIGEST -> AuthPlugin {
digest {
credentials {

1
domain/src/commonMain/kotlin/ca/gosyer/jui/domain/updates/interactor/UpdatesPager.kt
View File

@@ -143,6 +143,7 @@ class UpdatesPager
updates.map {
when (it) {
is Updates.Date -> it
is Updates.Update -> it.copy(
manga = changedManga[it.manga.id] ?: it.manga,
chapter = changedChapters[it.chapter.id] ?: it.chapter,

10
domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/ServerService.kt
View File

@@ -77,12 +77,10 @@ class ServerService
}
}
private fun getRuntimeJava(): String? {
return System.getProperty("java.home")?.let { getJavaFromPath(it.toPath().resolve("bin")) }
}
private fun getRuntimeJava(): String? = System.getProperty("java.home")?.let { getJavaFromPath(it.toPath().resolve("bin")) }
private fun getPossibleJava(): String? {
return System.getProperty("java.library.path")?.split(pathSeparatorChar)
private fun getPossibleJava(): String? =
System.getProperty("java.library.path")?.split(pathSeparatorChar)
.orEmpty()
.asSequence()
.mapNotNull {
@@ -99,7 +97,6 @@ class ServerService
}
.mapNotNull { getJavaFromPath(it) }
.firstOrNull()
}
private suspend fun runService() {
process?.destroy()
@@ -154,6 +151,7 @@ class ServerService
when {
it.contains("Javalin started") ->
_initialized.value = ServerResult.STARTED
it.contains("Javalin has stopped") ->
_initialized.value = ServerResult.FAILED
}

4
domain/src/desktopMain/kotlin/ca/gosyer/jui/domain/server/service/host/ServerHostPreference.kt
View File

@@ -17,9 +17,7 @@ sealed class ServerHostPreference<T : Any> {
protected abstract val defaultValue: T
protected abstract val serverValue: T
private fun validate(value: T): Boolean {
return value != serverValue
}
private fun validate(value: T): Boolean = value != serverValue
fun getProperty(): String? {
val preference = preference().get().takeIf(::validate)