mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2026-01-18 01:32:31 +01:00
Code Issues Projects Releases Wiki Activity

Switch Kotlin-Logging to KmLogging

Browse Source
This commit is contained in:
Syer10
2022-03-25 22:30:34 -04:00
parent 0852f08a84
commit 7fd9544f3d
34 changed files with 203 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/src/main/kotlin/ca/gosyer/jui/android/App.kt
View File

@@ -13,12 +13,12 @@ import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.ProcessLifecycleOwner
import androidx.lifecycle.lifecycleScope
import ca.gosyer.jui.android.data.notification.Notifications
import ca.gosyer.jui.core.logging.CKLogger
import ca.gosyer.jui.core.prefs.Preference
import ca.gosyer.jui.core.prefs.getAsFlow
import ca.gosyer.jui.data.ui.model.ThemeMode
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.lighthousegames.logging.logging
import java.util.Locale
class App : Application(), DefaultLifecycleObserver {
@@ -55,7 +55,7 @@ class App : Application(), DefaultLifecycleObserver {
try {
Notifications.createChannels(this)
} catch (e: Exception) {
error(e) { "Failed to modify notification channels" }
log.error(e) { "Failed to modify notification channels" }
}
}
@@ -86,5 +86,7 @@ class App : Application(), DefaultLifecycleObserver {
.launchIn(ProcessLifecycleOwner.get().lifecycleScope)
}
protected companion object : CKLogger({})
private companion object {
private val log = logging()
}
}

18
android/src/main/kotlin/ca/gosyer/jui/android/data/download/AndroidDownloadService.kt
View File

@@ -19,7 +19,6 @@ import ca.gosyer.jui.android.util.notificationBuilder
import ca.gosyer.jui.android.util.notificationManager
import ca.gosyer.jui.core.lang.chop
import ca.gosyer.jui.core.lang.throwIfCancellation
import ca.gosyer.jui.core.logging.CKLogger
import ca.gosyer.jui.core.prefs.getAsFlow
import ca.gosyer.jui.data.base.WebsocketService.Actions
import ca.gosyer.jui.data.base.WebsocketService.Status
@@ -49,11 +48,12 @@ import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.job
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import org.lighthousegames.logging.logging
import java.util.regex.Pattern
class AndroidDownloadService : Service() {
companion object : CKLogger({}) {
companion object {
private var instance: AndroidDownloadService? = null
fun start(context: Context, actions: Actions) {
@@ -72,6 +72,8 @@ class AndroidDownloadService : Service() {
fun isRunning(): Boolean {
return instance != null
}
private val log = logging()
}
private lateinit var ioScope: CoroutineScope
@@ -103,17 +105,15 @@ class AndroidDownloadService : Service() {
if (intent != null) {
val action = intent.action
info("using an intent with action $action")
log.info { "using an intent with action $action" }
when (action) {
Actions.START.name,
Actions.RESTART.name -> startWebsocket()
Actions.STOP.name -> stopSelf()
else -> info("This should never happen. No action in the received intent")
else -> log.info { "This should never happen. No action in the received intent" }
}
} else {
info(
"with a null intent. It has been probably restarted by the system."
)
log.info { "with a null intent. It has been probably restarted by the system." }
startWebsocket()
}
@@ -157,7 +157,7 @@ class AndroidDownloadService : Service() {
.filterIsInstance<Frame.Text>()
.mapLatest(::onReceived)
.catch {
info(it) { "Error running downloader" }
log.warn(it) { "Error running downloader" }
}
.collect()
}
@@ -169,7 +169,7 @@ class AndroidDownloadService : Service() {
}
.catch {
status.value = Status.STOPPED
error(it) { "Error while running websocket service" }
log.warn(it) { "Error while running websocket service" }
stopSelf()
}
.launchIn(ioScope)