mirror of
https://github.com/Suwayomi/TachideskJUI.git
synced 2025-12-10 06:42:05 +01:00
Update dependency org.lighthousegames:logging to v2 (#177)
* Update dependency org.lighthousegames:logging to v2 * Move to new imports --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Syer10 <syer10@users.noreply.github.com>
This commit is contained in:
@@ -16,8 +16,8 @@ import ca.gosyer.jui.android.data.notification.Notifications
|
|||||||
import ca.gosyer.jui.core.prefs.Preference
|
import ca.gosyer.jui.core.prefs.Preference
|
||||||
import ca.gosyer.jui.core.prefs.getAsFlow
|
import ca.gosyer.jui.core.prefs.getAsFlow
|
||||||
import ca.gosyer.jui.domain.ui.model.ThemeMode
|
import ca.gosyer.jui.domain.ui.model.ThemeMode
|
||||||
|
import com.diamondedge.logging.logging
|
||||||
import kotlinx.coroutines.flow.launchIn
|
import kotlinx.coroutines.flow.launchIn
|
||||||
import org.lighthousegames.logging.logging
|
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
|
|
||||||
class App :
|
class App :
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import ca.gosyer.jui.domain.download.model.DownloadStatus
|
|||||||
import ca.gosyer.jui.domain.download.service.DownloadService
|
import ca.gosyer.jui.domain.download.service.DownloadService
|
||||||
import ca.gosyer.jui.domain.download.service.DownloadService.Companion.status
|
import ca.gosyer.jui.domain.download.service.DownloadService.Companion.status
|
||||||
import ca.gosyer.jui.i18n.MR
|
import ca.gosyer.jui.i18n.MR
|
||||||
|
import com.diamondedge.logging.logging
|
||||||
import dev.icerock.moko.resources.desc.desc
|
import dev.icerock.moko.resources.desc.desc
|
||||||
import dev.icerock.moko.resources.format
|
import dev.icerock.moko.resources.format
|
||||||
import io.ktor.client.plugins.websocket.ws
|
import io.ktor.client.plugins.websocket.ws
|
||||||
@@ -50,7 +51,6 @@ import kotlinx.coroutines.flow.mapLatest
|
|||||||
import kotlinx.coroutines.flow.receiveAsFlow
|
import kotlinx.coroutines.flow.receiveAsFlow
|
||||||
import kotlinx.coroutines.job
|
import kotlinx.coroutines.job
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import org.lighthousegames.logging.logging
|
|
||||||
import java.util.regex.Pattern
|
import java.util.regex.Pattern
|
||||||
|
|
||||||
class AndroidDownloadService : Service() {
|
class AndroidDownloadService : Service() {
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import ca.gosyer.jui.domain.library.model.UpdateStatus
|
|||||||
import ca.gosyer.jui.domain.library.service.LibraryUpdateService
|
import ca.gosyer.jui.domain.library.service.LibraryUpdateService
|
||||||
import ca.gosyer.jui.domain.library.service.LibraryUpdateService.Companion.status
|
import ca.gosyer.jui.domain.library.service.LibraryUpdateService.Companion.status
|
||||||
import ca.gosyer.jui.i18n.MR
|
import ca.gosyer.jui.i18n.MR
|
||||||
|
import com.diamondedge.logging.logging
|
||||||
import dev.icerock.moko.resources.desc.desc
|
import dev.icerock.moko.resources.desc.desc
|
||||||
import dev.icerock.moko.resources.format
|
import dev.icerock.moko.resources.format
|
||||||
import io.ktor.client.plugins.websocket.ws
|
import io.ktor.client.plugins.websocket.ws
|
||||||
@@ -51,7 +52,6 @@ import kotlinx.coroutines.flow.mapLatest
|
|||||||
import kotlinx.coroutines.flow.receiveAsFlow
|
import kotlinx.coroutines.flow.receiveAsFlow
|
||||||
import kotlinx.coroutines.job
|
import kotlinx.coroutines.job
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import org.lighthousegames.logging.logging
|
|
||||||
|
|
||||||
class AndroidLibraryService : Service() {
|
class AndroidLibraryService : Service() {
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import ca.gosyer.jui.uicore.vm.ContextWrapper
|
|||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.Path.Companion.toPath
|
import okio.Path.Companion.toPath
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class AppMigrations(
|
class AppMigrations(
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
package ca.gosyer.jui.desktop.logging
|
package ca.gosyer.jui.desktop.logging
|
||||||
|
|
||||||
import ca.gosyer.jui.desktop.build.BuildConfig
|
import ca.gosyer.jui.desktop.build.BuildConfig
|
||||||
|
import com.diamondedge.logging.logging
|
||||||
import com.github.weisj.darklaf.LafManager
|
import com.github.weisj.darklaf.LafManager
|
||||||
import okio.Path
|
import okio.Path
|
||||||
import org.apache.logging.log4j.Level
|
import org.apache.logging.log4j.Level
|
||||||
@@ -15,7 +16,6 @@ import org.apache.logging.log4j.core.LoggerContext
|
|||||||
import org.apache.logging.log4j.core.appender.ConsoleAppender
|
import org.apache.logging.log4j.core.appender.ConsoleAppender
|
||||||
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory
|
import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory
|
||||||
import org.lighthousegames.logging.KmLogging
|
import org.lighthousegames.logging.KmLogging
|
||||||
import org.lighthousegames.logging.logging
|
|
||||||
import org.slf4j.bridge.SLF4JBridgeHandler
|
import org.slf4j.bridge.SLF4JBridgeHandler
|
||||||
import java.util.logging.LogManager as JLogManager
|
import java.util.logging.LogManager as JLogManager
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ fun initializeLogger(loggingLocation: Path) {
|
|||||||
addHandler(SLF4JBridgeHandler())
|
addHandler(SLF4JBridgeHandler())
|
||||||
}
|
}
|
||||||
|
|
||||||
KmLogging.setLogFactory(org.lighthousegames.logging.Slf4jLogFactory())
|
KmLogging.setLogFactory(com.diamondedge.logging.Slf4jLogFactory())
|
||||||
|
|
||||||
val log = logging("UncaughtException")
|
val log = logging("UncaughtException")
|
||||||
Thread.setDefaultUncaughtExceptionHandler { t, e ->
|
Thread.setDefaultUncaughtExceptionHandler { t, e ->
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
package ca.gosyer.jui.desktop.logging
|
package ca.gosyer.jui.desktop.logging
|
||||||
|
|
||||||
import org.lighthousegames.logging.KmLog
|
import com.diamondedge.logging.KmLog
|
||||||
import org.lighthousegames.logging.LogFactory
|
import com.diamondedge.logging.LogFactory
|
||||||
import org.slf4j.Logger
|
import org.slf4j.Logger
|
||||||
import org.slf4j.LoggerFactory
|
import org.slf4j.LoggerFactory
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.flatMapLatest
|
|||||||
import kotlinx.coroutines.flow.onStart
|
import kotlinx.coroutines.flow.onStart
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ServerListeners {
|
class ServerListeners {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import io.ktor.client.request.HttpRequestBuilder
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ExportBackupFile(
|
class ExportBackupFile(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
|
|||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.Path
|
import okio.Path
|
||||||
import okio.SYSTEM
|
import okio.SYSTEM
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ImportBackupFile(
|
class ImportBackupFile(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
|
|||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.Path
|
import okio.Path
|
||||||
import okio.SYSTEM
|
import okio.SYSTEM
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ValidateBackupFile(
|
class ValidateBackupFile(
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.launchIn
|
|||||||
import kotlinx.coroutines.flow.mapLatest
|
import kotlinx.coroutines.flow.mapLatest
|
||||||
import kotlinx.coroutines.flow.receiveAsFlow
|
import kotlinx.coroutines.flow.receiveAsFlow
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@OptIn(DelicateCoroutinesApi::class)
|
@OptIn(DelicateCoroutinesApi::class)
|
||||||
abstract class WebsocketService(
|
abstract class WebsocketService(
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.collect
|
|||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class AddMangaToCategory(
|
class AddMangaToCategory(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class CreateCategory(
|
class CreateCategory(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class DeleteCategory(
|
class DeleteCategory(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetCategories(
|
class GetCategories(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.manga.model.Manga
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetMangaCategories(
|
class GetMangaCategories(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetMangaListFromCategory(
|
class GetMangaListFromCategory(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ModifyCategory(
|
class ModifyCategory(
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.collect
|
|||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import kotlinx.coroutines.flow.map
|
import kotlinx.coroutines.flow.map
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class RemoveMangaFromCategory(
|
class RemoveMangaFromCategory(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.category.service.CategoryRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ReorderCategory(
|
class ReorderCategory(
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateCategoryMeta(
|
class UpdateCategoryMeta(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.jvm.JvmName
|
import kotlin.jvm.JvmName
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetChapter(
|
class GetChapter(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import io.ktor.client.request.HttpRequestBuilder
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetChapterPages(
|
class GetChapterPages(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetChapters(
|
class GetChapters(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class RefreshChapters(
|
class RefreshChapters(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.jvm.JvmName
|
import kotlin.jvm.JvmName
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateChapterMeta(
|
class UpdateChapterMeta(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class BatchChapterDownload(
|
class BatchChapterDownload(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ClearDownloadQueue(
|
class ClearDownloadQueue(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class QueueChapterDownload(
|
class QueueChapterDownload(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ReorderChapterDownload(
|
class ReorderChapterDownload(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class StartDownloading(
|
class StartDownloading(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class StopChapterDownload(
|
class StopChapterDownload(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.download.service.DownloadRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class StopDownloading(
|
class StopDownloading(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetExtensionList(
|
class GetExtensionList(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class InstallExtension(
|
class InstallExtension(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import me.tatarka.inject.annotations.Inject
|
|||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.Path
|
import okio.Path
|
||||||
import okio.SYSTEM
|
import okio.SYSTEM
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class InstallExtensionFile(
|
class InstallExtensionFile(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UninstallExtension(
|
class UninstallExtension(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.extension.service.ExtensionRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateExtension(
|
class UpdateExtension(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.global.service.GlobalRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetGlobalMeta(
|
class GetGlobalMeta(
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateGlobalMeta(
|
class UpdateGlobalMeta(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class AddMangaToLibrary(
|
class AddMangaToLibrary(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class RemoveMangaFromLibrary(
|
class RemoveMangaFromLibrary(
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import io.ktor.websocket.Frame
|
|||||||
import io.ktor.websocket.readText
|
import io.ktor.websocket.readText
|
||||||
import kotlinx.coroutines.flow.MutableStateFlow
|
import kotlinx.coroutines.flow.MutableStateFlow
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class LibraryUpdateService(
|
class LibraryUpdateService(
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetManga(
|
class GetManga(
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import kotlinx.coroutines.flow.onEach
|
|||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class RefreshManga(
|
class RefreshManga(
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import kotlinx.coroutines.flow.flow
|
import kotlinx.coroutines.flow.flow
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateMangaMeta(
|
class UpdateMangaMeta(
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import io.ktor.http.URLBuilder
|
|||||||
import io.ktor.http.URLProtocol
|
import io.ktor.http.URLProtocol
|
||||||
import io.ktor.serialization.kotlinx.json.json
|
import io.ktor.serialization.kotlinx.json.json
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.time.Duration.Companion.minutes
|
import kotlin.time.Duration.Companion.minutes
|
||||||
import kotlin.time.Duration.Companion.seconds
|
import kotlin.time.Duration.Companion.seconds
|
||||||
import io.ktor.client.plugins.auth.Auth as AuthPlugin
|
import io.ktor.client.plugins.auth.Auth as AuthPlugin
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class AboutServer(
|
class AboutServer(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetSettings(
|
class GetSettings(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.settings.service.SettingsRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class SetSettings(
|
class SetSettings(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetFilterList(
|
class GetFilterList(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetLatestManga(
|
class GetLatestManga(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetPopularManga(
|
class GetPopularManga(
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetSearchManga(
|
class GetSearchManga(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetSourceList(
|
class GetSourceList(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetSourceSettings(
|
class GetSourceSettings(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.source.service.SourceRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class SetSourceSetting(
|
class SetSourceSetting(
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import kotlinx.coroutines.launch
|
|||||||
import kotlinx.coroutines.sync.Mutex
|
import kotlinx.coroutines.sync.Mutex
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
fun interface GetMangaPage {
|
fun interface GetMangaPage {
|
||||||
suspend fun get(page: Int): MangaPage?
|
suspend fun get(page: Int): MangaPage?
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GetRecentUpdates(
|
class GetRecentUpdates(
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateCategory(
|
class UpdateCategory(
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import kotlinx.coroutines.flow.flow
|
|||||||
import kotlinx.coroutines.flow.flowOn
|
import kotlinx.coroutines.flow.flowOn
|
||||||
import kotlinx.coroutines.flow.singleOrNull
|
import kotlinx.coroutines.flow.singleOrNull
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateChecker(
|
class UpdateChecker(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import ca.gosyer.jui.domain.updates.service.UpdatesRepository
|
|||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdateLibrary(
|
class UpdateLibrary(
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import okio.Path
|
|||||||
import okio.Path.Companion.toPath
|
import okio.Path.Companion.toPath
|
||||||
import okio.buffer
|
import okio.buffer
|
||||||
import okio.source
|
import okio.source
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import java.io.File.pathSeparatorChar
|
import java.io.File.pathSeparatorChar
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.io.Reader
|
import java.io.Reader
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ apolloKtor = "0.1.1"
|
|||||||
# Logging
|
# Logging
|
||||||
slf4j = "2.0.17"
|
slf4j = "2.0.17"
|
||||||
log4j = "2.25.2"
|
log4j = "2.25.2"
|
||||||
kmlogging = "1.5.0"
|
kmlogging = "2.0.3"
|
||||||
|
|
||||||
# Storage
|
# Storage
|
||||||
okio = "3.16.0"
|
okio = "3.16.0"
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
|
|||||||
import kotlinx.coroutines.flow.asStateFlow
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class CategoriesScreenViewModel(
|
class CategoriesScreenViewModel(
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ import kotlinx.coroutines.CoroutineExceptionHandler
|
|||||||
import kotlinx.coroutines.DelicateCoroutinesApi
|
import kotlinx.coroutines.DelicateCoroutinesApi
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
private val log = logging()
|
private val log = logging()
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import kotlinx.coroutines.flow.stateIn
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class DownloadsScreenViewModel(
|
class DownloadsScreenViewModel(
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import kotlinx.coroutines.launch
|
|||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.Source
|
import okio.Source
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ import kotlinx.coroutines.flow.toList
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Stable
|
@Stable
|
||||||
sealed class LibraryState {
|
sealed class LibraryState {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.map
|
|||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.time.Instant
|
import kotlin.time.Instant
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import kotlinx.coroutines.cancel
|
|||||||
import kotlinx.coroutines.flow.asStateFlow
|
import kotlinx.coroutines.flow.asStateFlow
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class LibraryUpdatesViewModel(
|
class LibraryUpdatesViewModel(
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ import kotlinx.coroutines.flow.stateIn
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class MangaScreenViewModel(
|
class MangaScreenViewModel(
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import kotlinx.coroutines.flow.filterIsInstance
|
|||||||
import kotlinx.coroutines.flow.launchIn
|
import kotlinx.coroutines.flow.launchIn
|
||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import kotlinx.coroutines.flow.take
|
import kotlinx.coroutines.flow.take
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
class ChapterLoader(
|
class ChapterLoader(
|
||||||
private val readerPreferences: ReaderPreferences,
|
private val readerPreferences: ReaderPreferences,
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ import kotlinx.coroutines.flow.update
|
|||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class ReaderMenuViewModel(
|
class ReaderMenuViewModel(
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ import okio.BufferedSource
|
|||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
import okio.buffer
|
import okio.buffer
|
||||||
import okio.use
|
import okio.use
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
class TachideskPageLoader(
|
class TachideskPageLoader(
|
||||||
val chapter: ReaderChapter,
|
val chapter: ReaderChapter,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import kotlinx.coroutines.flow.asStateFlow
|
|||||||
import kotlinx.coroutines.flow.filterIsInstance
|
import kotlinx.coroutines.flow.filterIsInstance
|
||||||
import kotlinx.coroutines.flow.flatMapLatest
|
import kotlinx.coroutines.flow.flatMapLatest
|
||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Immutable
|
@Immutable
|
||||||
data class ReaderChapter(
|
data class ReaderChapter(
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ import kotlinx.coroutines.flow.flow
|
|||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import kotlinx.coroutines.isActive
|
import kotlinx.coroutines.isActive
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.time.Duration.Companion.seconds
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
|
||||||
class SettingsAdvancedScreen : Screen {
|
class SettingsAdvancedScreen : Screen {
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ import okio.Path
|
|||||||
import okio.Sink
|
import okio.Sink
|
||||||
import okio.Source
|
import okio.Source
|
||||||
import okio.buffer
|
import okio.buffer
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
import kotlin.random.Random
|
import kotlin.random.Random
|
||||||
|
|
||||||
class SettingsBackupScreen : Screen {
|
class SettingsBackupScreen : Screen {
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ import kotlinx.coroutines.flow.map
|
|||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
class SourceScreenViewModel(
|
class SourceScreenViewModel(
|
||||||
private val source: Source,
|
private val source: Source,
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ import kotlinx.coroutines.flow.mapLatest
|
|||||||
import kotlinx.coroutines.flow.onEach
|
import kotlinx.coroutines.flow.onEach
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
class SourceFiltersViewModel(
|
class SourceFiltersViewModel(
|
||||||
private val sourceId: Long,
|
private val sourceId: Long,
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ import kotlinx.coroutines.sync.Semaphore
|
|||||||
import kotlinx.coroutines.sync.withPermit
|
import kotlinx.coroutines.sync.withPermit
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class GlobalSearchViewModel(
|
class GlobalSearchViewModel(
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import kotlinx.coroutines.flow.onEach
|
|||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class SourceHomeScreenViewModel(
|
class SourceHomeScreenViewModel(
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import kotlinx.coroutines.flow.onEach
|
|||||||
import kotlinx.coroutines.supervisorScope
|
import kotlinx.coroutines.supervisorScope
|
||||||
import me.tatarka.inject.annotations.Assisted
|
import me.tatarka.inject.annotations.Assisted
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class SourceSettingsScreenViewModel(
|
class SourceSettingsScreenViewModel(
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ import kotlinx.coroutines.flow.onEach
|
|||||||
import kotlinx.coroutines.flow.stateIn
|
import kotlinx.coroutines.flow.stateIn
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class UpdatesScreenViewModel(
|
class UpdatesScreenViewModel(
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import kotlinx.coroutines.flow.catch
|
|||||||
import kotlinx.coroutines.flow.filterIsInstance
|
import kotlinx.coroutines.flow.filterIsInstance
|
||||||
import kotlinx.coroutines.flow.shareIn
|
import kotlinx.coroutines.flow.shareIn
|
||||||
import me.tatarka.inject.annotations.Inject
|
import me.tatarka.inject.annotations.Inject
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
class TrayViewModel(
|
class TrayViewModel(
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ import com.seiko.imageloader.model.ImageRequest
|
|||||||
import com.seiko.imageloader.rememberImageAction
|
import com.seiko.imageloader.rememberImageAction
|
||||||
import com.seiko.imageloader.rememberImageActionPainter
|
import com.seiko.imageloader.rememberImageActionPainter
|
||||||
import com.seiko.imageloader.rememberImagePainter
|
import com.seiko.imageloader.rememberImagePainter
|
||||||
import org.lighthousegames.logging.logging
|
import com.diamondedge.logging.logging
|
||||||
|
|
||||||
private val log = logging()
|
private val log = logging()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user