diff --git a/komga-tray/src/main/kotlin/org/gotson/komga/Utils.kt b/komga-tray/src/main/kotlin/org/gotson/komga/Utils.kt index cd4f679f1..bdf4acd13 100644 --- a/komga-tray/src/main/kotlin/org/gotson/komga/Utils.kt +++ b/komga-tray/src/main/kotlin/org/gotson/komga/Utils.kt @@ -1,6 +1,6 @@ package org.gotson.komga -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.awt.Desktop import java.io.File import java.net.URI diff --git a/komga/build.gradle.kts b/komga/build.gradle.kts index e401bcfa4..0744e8921 100644 --- a/komga/build.gradle.kts +++ b/komga/build.gradle.kts @@ -62,7 +62,7 @@ dependencies { implementation("org.flywaydb:flyway-core") - api("io.github.microutils:kotlin-logging-jvm:3.0.5") + api("io.github.oshai:kotlin-logging-jvm:6.0.3") implementation("io.hawt:hawtio-springboot:2.17.6") implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0") diff --git a/komga/src/flyway/kotlin/db/migration/sqlite/V20210624165023__missing_series_metadata.kt b/komga/src/flyway/kotlin/db/migration/sqlite/V20210624165023__missing_series_metadata.kt index efb707ff4..492277839 100644 --- a/komga/src/flyway/kotlin/db/migration/sqlite/V20210624165023__missing_series_metadata.kt +++ b/komga/src/flyway/kotlin/db/migration/sqlite/V20210624165023__missing_series_metadata.kt @@ -1,6 +1,6 @@ package db.migration.sqlite -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.StringUtils import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context diff --git a/komga/src/flyway/kotlin/db/migration/sqlite/V20230801104436__fix_incorrect_language_codes.kt b/komga/src/flyway/kotlin/db/migration/sqlite/V20230801104436__fix_incorrect_language_codes.kt index 847dd4ce6..5cf593c86 100644 --- a/komga/src/flyway/kotlin/db/migration/sqlite/V20230801104436__fix_incorrect_language_codes.kt +++ b/komga/src/flyway/kotlin/db/migration/sqlite/V20230801104436__fix_incorrect_language_codes.kt @@ -1,7 +1,7 @@ package db.migration.sqlite import com.ibm.icu.util.ULocale -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.flywaydb.core.api.migration.BaseJavaMigration import org.flywaydb.core.api.migration.Context import org.springframework.jdbc.core.JdbcTemplate diff --git a/komga/src/main/kotlin/org/gotson/komga/application/scheduler/LibraryScanScheduler.kt b/komga/src/main/kotlin/org/gotson/komga/application/scheduler/LibraryScanScheduler.kt index 196fb9371..53de99bfd 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/scheduler/LibraryScanScheduler.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/scheduler/LibraryScanScheduler.kt @@ -1,6 +1,6 @@ package org.gotson.komga.application.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.Library import org.gotson.komga.domain.model.Library.ScanInterval.DAILY diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt index 9cccb1dd5..6ad09c6ff 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskEmitter.kt @@ -1,6 +1,6 @@ package org.gotson.komga.application.tasks -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookMetadataPatchCapability import org.gotson.komga.domain.model.BookPageNumbered diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt index b2854d8f0..773f6589c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskHandler.kt @@ -1,7 +1,7 @@ package org.gotson.komga.application.tasks +import io.github.oshai.kotlinlogging.KotlinLogging import io.micrometer.core.instrument.MeterRegistry -import mu.KotlinLogging import org.gotson.komga.domain.model.BookAction import org.gotson.komga.domain.persistence.BookRepository import org.gotson.komga.domain.persistence.LibraryRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskProcessor.kt b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskProcessor.kt index 3603953a9..2ba5c8769 100644 --- a/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskProcessor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/application/tasks/TaskProcessor.kt @@ -1,6 +1,6 @@ package org.gotson.komga.application.tasks -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.infrastructure.configuration.KomgaSettingsProvider import org.springframework.beans.factory.InitializingBean import org.springframework.boot.context.event.ApplicationReadyEvent diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookAnalyzer.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookAnalyzer.kt index 46fca1e1d..0af67d830 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookAnalyzer.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookAnalyzer.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookPage import org.gotson.komga.domain.model.BookWithMedia diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt index af23b77f7..04fe836be 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookConverter.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.compress.archivers.zip.ZipArchiveEntry import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream import org.apache.commons.io.FilenameUtils diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookImporter.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookImporter.kt index d2cbe6af5..7a7dc02bc 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookImporter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookImporter.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.CodedException diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookLifecycle.kt index 3d9c8cb5f..d3ac56ba1 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookAction import org.gotson.komga.domain.model.BookSearch diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookMetadataLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookMetadataLifecycle.kt index 6457b32d3..ed4758230 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookMetadataLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookMetadataLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookMetadataPatch import org.gotson.komga.domain.model.BookMetadataPatchCapability diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookPageEditor.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookPageEditor.kt index a68449af2..0e6719fa2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/BookPageEditor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/BookPageEditor.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.compress.archivers.zip.ZipArchiveEntry import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream import org.apache.commons.io.FilenameUtils diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt index 85c1b43f9..0ff86fbd3 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/FileSystemScanner.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.DirectoryNotFoundException import org.gotson.komga.domain.model.ScanResult diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/KomgaUserLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/KomgaUserLifecycle.kt index 30c95c1b7..76c833622 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/KomgaUserLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/KomgaUserLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.KomgaUser import org.gotson.komga.domain.model.UserEmailAlreadyExistsException diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryContentLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryContentLifecycle.kt index ff9b1a2d9..41673b68d 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryContentLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryContentLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.BookMetadataPatchCapability diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryLifecycle.kt index d12ec4000..a50cf79f2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/LibraryLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.scheduler.LibraryScanScheduler import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.DirectoryNotFoundException diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/LocalArtworkLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/LocalArtworkLifecycle.kt index b9e3d1e7f..1248946c6 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/LocalArtworkLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/LocalArtworkLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.MarkSelectedPreference import org.gotson.komga.domain.model.Series diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/PageHashLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/PageHashLifecycle.kt index f5dd85ba8..bc0a41fd4 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/PageHashLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/PageHashLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.BookPageNumbered import org.gotson.komga.domain.model.Library import org.gotson.komga.domain.model.MediaType diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListLifecycle.kt index fb5474101..642b0d805 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.DuplicateNameException diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListMatcher.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListMatcher.kt index 20c09c572..0eb430667 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListMatcher.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/ReadListMatcher.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.ReadListMatch import org.gotson.komga.domain.model.ReadListRequest import org.gotson.komga.domain.model.ReadListRequestMatch diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesCollectionLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesCollectionLifecycle.kt index cb44243f9..58935bd56 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesCollectionLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesCollectionLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.DuplicateNameException import org.gotson.komga.domain.model.Series diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesLifecycle.kt index fff4b9eb0..59e774cc2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.model.Book diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesMetadataLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesMetadataLifecycle.kt index 19b5e09da..e25d7b9cb 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesMetadataLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/SeriesMetadataLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.BookWithMedia import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.MetadataPatchTarget diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/ThumbnailLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/ThumbnailLifecycle.kt index a40c1bf0b..66bc76e11 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/ThumbnailLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/ThumbnailLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.domain.service -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Dimension import org.gotson.komga.domain.model.ThumbnailBook import org.gotson.komga.domain.model.ThumbnailReadList diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/cache/TransientBookCache.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/cache/TransientBookCache.kt index 4c1034050..b14a24190 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/cache/TransientBookCache.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/cache/TransientBookCache.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.cache import com.github.benmanes.caffeine.cache.Caffeine -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.TransientBook import org.gotson.komga.domain.persistence.TransientBookRepository import org.springframework.stereotype.Service diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/datasource/SqliteUdfDataSource.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/datasource/SqliteUdfDataSource.kt index 8503c8923..194fbe693 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/datasource/SqliteUdfDataSource.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/datasource/SqliteUdfDataSource.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.datasource import com.ibm.icu.text.Collator -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.language.stripAccents import org.sqlite.Collation import org.sqlite.Function diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/hash/Hasher.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/hash/Hasher.kt index 7f441c5a5..550796338 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/hash/Hasher.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/hash/Hasher.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.hash import com.appmattus.crypto.Algorithm -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Component import java.io.InputStream import java.nio.file.Path diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageAnalyzer.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageAnalyzer.kt index 8431aaee2..abbafdbcd 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageAnalyzer.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageAnalyzer.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.image -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Dimension import org.springframework.stereotype.Service import java.io.InputStream diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt index 5e4c995cb..4740f8d89 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/image/ImageConverter.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.image -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import net.coobird.thumbnailator.Thumbnails import org.gotson.komga.infrastructure.mediacontainer.ContentDetector import org.springframework.stereotype.Service diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisCleanup.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisCleanup.kt index 04e7e0377..15a62a76e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisCleanup.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jms/ArtemisCleanup.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.jms -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.beans.factory.InitializingBean import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Service diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt index 79b4dcda7..ff2a13d8d 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/MediaDao.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.jooq.main import com.fasterxml.jackson.databind.ObjectMapper -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.BookPage import org.gotson.komga.domain.model.Dimension import org.gotson.komga.domain.model.Media diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt index bf03153ec..25cb8a65e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/main/SeriesDtoDao.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.jooq.main -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.ContentRestrictions import org.gotson.komga.domain.model.ReadStatus import org.gotson.komga.domain.model.SeriesSearch diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt index ffb905acb..2c275ece2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/tasks/TasksDao.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.jooq.tasks import com.fasterxml.jackson.databind.ObjectMapper -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.Task import org.gotson.komga.application.tasks.TasksRepository import org.gotson.komga.jooq.tasks.Tables diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/ContentDetector.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/ContentDetector.kt index 8b9a9e1d6..c37adf14b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/ContentDetector.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/ContentDetector.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.mediacontainer -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.tika.config.TikaConfig import org.apache.tika.io.TikaInputStream import org.apache.tika.metadata.Metadata diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/Rar5Extractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/Rar5Extractor.kt index 22a6b30d2..410f2c9fb 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/Rar5Extractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/Rar5Extractor.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.mediacontainer.divina import com.github.gotson.nightcompress.Archive -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator import org.gotson.komga.domain.model.MediaContainerEntry import org.gotson.komga.domain.model.MediaType diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/RarExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/RarExtractor.kt index 561b95aa7..9ce1f6bb6 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/RarExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/RarExtractor.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.mediacontainer.divina import com.github.junrar.Archive -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator import org.gotson.komga.domain.model.MediaContainerEntry import org.gotson.komga.domain.model.MediaType diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/ZipExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/ZipExtractor.kt index 87762d5f8..36540bc44 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/ZipExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/divina/ZipExtractor.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.mediacontainer.divina -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import net.greypanther.natsort.CaseInsensitiveSimpleNaturalComparator import org.apache.commons.compress.archivers.ArchiveEntry import org.apache.commons.compress.archivers.zip.ZipFile diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt index 2610a2903..33a71dc52 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/epub/EpubExtractor.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.mediacontainer.epub -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.compress.archivers.ArchiveEntry import org.apache.commons.compress.archivers.zip.ZipFile import org.gotson.komga.domain.model.BookPage diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/pdf/PdfExtractor.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/pdf/PdfExtractor.kt index ff0bd5300..ba6564aeb 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/pdf/PdfExtractor.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/mediacontainer/pdf/PdfExtractor.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.mediacontainer.pdf -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.pdfbox.io.MemoryUsageSetting import org.apache.pdfbox.multipdf.PageExtractor import org.apache.pdfbox.pdmodel.PDDocument diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/barcode/IsbnBarcodeProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/barcode/IsbnBarcodeProvider.kt index 10a4954bf..96d7f8ac4 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/barcode/IsbnBarcodeProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/barcode/IsbnBarcodeProvider.kt @@ -6,7 +6,7 @@ import com.google.zxing.DecodeHintType import com.google.zxing.MultiFormatReader import com.google.zxing.RGBLuminanceSource import com.google.zxing.common.HybridBinarizer -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.validator.routines.ISBNValidator import org.gotson.komga.domain.model.BookMetadataPatch import org.gotson.komga.domain.model.BookMetadataPatchCapability diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt index 942b5210c..d9289771f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ComicInfoProvider.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.metadata.comicrack import com.fasterxml.jackson.dataformat.xml.XmlMapper -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.validator.routines.ISBNValidator import org.gotson.komga.domain.model.Author import org.gotson.komga.domain.model.BCP47TagValidator diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt index fee185b82..c3625dd62 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/comicrack/ReadListProvider.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.metadata.comicrack import com.fasterxml.jackson.dataformat.xml.XmlMapper -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.ComicRackListException import org.gotson.komga.domain.model.ReadListRequest import org.gotson.komga.domain.model.ReadListRequestBook diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/localartwork/LocalArtworkProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/localartwork/LocalArtworkProvider.kt index 838787da5..0f1997e45 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/localartwork/LocalArtworkProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/localartwork/LocalArtworkProvider.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.metadata.localartwork -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.io.FilenameUtils import org.gotson.komga.domain.model.Book import org.gotson.komga.domain.model.Dimension diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/mylar/MylarSeriesProvider.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/mylar/MylarSeriesProvider.kt index 44b10e13f..64b92b811 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/mylar/MylarSeriesProvider.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/metadata/mylar/MylarSeriesProvider.kt @@ -1,7 +1,7 @@ package org.gotson.komga.infrastructure.metadata.mylar import com.fasterxml.jackson.databind.ObjectMapper -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.Library import org.gotson.komga.domain.model.MetadataPatchTarget import org.gotson.komga.domain.model.Series diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt index fca1d6e5b..c468fae04 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/LuceneHelper.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.search -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.lucene.analysis.Analyzer import org.apache.lucene.document.Document import org.apache.lucene.document.Field diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt index 5b1b49380..acc80acc9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/search/SearchIndexLifecycle.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.search -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.lucene.document.Document import org.apache.lucene.index.Term import org.gotson.komga.domain.model.BookSearchWithReadProgress diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/LoginListener.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/LoginListener.kt index 8f5403e83..fde5fb37c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/LoginListener.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/LoginListener.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.security -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.AuthenticationActivity import org.gotson.komga.domain.persistence.AuthenticationActivityRepository import org.gotson.komga.domain.persistence.KomgaUserRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/SecurityConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/SecurityConfiguration.kt index de6dfde36..024ad4fec 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/SecurityConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/SecurityConfiguration.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.security -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.ROLE_ADMIN import org.gotson.komga.domain.model.ROLE_USER import org.gotson.komga.infrastructure.configuration.KomgaProperties diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/GithubOAuth2UserService.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/GithubOAuth2UserService.kt index c83790ba3..0cef8e979 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/GithubOAuth2UserService.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/GithubOAuth2UserService.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.security.oauth2 -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.core.ParameterizedTypeReference import org.springframework.http.HttpHeaders import org.springframework.http.HttpMethod diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/KomgaOAuth2UserServiceConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/KomgaOAuth2UserServiceConfiguration.kt index 416e7fc7b..af758065a 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/KomgaOAuth2UserServiceConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/oauth2/KomgaOAuth2UserServiceConfiguration.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.security.oauth2 -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.RandomStringUtils import org.gotson.komga.domain.model.KomgaUser import org.gotson.komga.domain.persistence.KomgaUserRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SessionListener.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SessionListener.kt index bcefdd333..572defbd8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SessionListener.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/security/session/SessionListener.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.security.session -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.context.event.EventListener import org.springframework.session.events.AbstractSessionEvent import org.springframework.stereotype.Component diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/util/TempDirectoryChecker.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/util/TempDirectoryChecker.kt index 54c93c862..65845a3d2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/util/TempDirectoryChecker.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/util/TempDirectoryChecker.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.util -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import java.nio.file.Files import kotlin.io.path.Path diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/WebServerConfiguration.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/WebServerConfiguration.kt index 358118bd6..8762e0814 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/WebServerConfiguration.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/web/WebServerConfiguration.kt @@ -1,6 +1,6 @@ package org.gotson.komga.infrastructure.web -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.infrastructure.configuration.KomgaSettingsProvider import org.springframework.boot.web.server.WebServerFactoryCustomizer import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/v1/OpdsController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/v1/OpdsController.kt index 7ceaeddc6..fcf94d15f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/v1/OpdsController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/opds/v1/OpdsController.kt @@ -1,10 +1,10 @@ package org.gotson.komga.interfaces.api.opds.v1 +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse -import mu.KotlinLogging import org.apache.commons.io.FilenameUtils import org.gotson.komga.domain.model.BookSearchWithReadProgress import org.gotson.komga.domain.model.Library diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt index 28fdcef4a..d5774e83b 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/BookController.kt @@ -1,5 +1,6 @@ package org.gotson.komga.interfaces.api.rest +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content @@ -7,7 +8,6 @@ import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse import jakarta.servlet.http.HttpServletRequest import jakarta.validation.Valid -import mu.KotlinLogging import org.apache.commons.io.FilenameUtils import org.apache.commons.io.IOUtils import org.gotson.komga.application.tasks.HIGHEST_PRIORITY diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt index a14ecb5f0..f7ddadf1e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/ReadListController.kt @@ -1,11 +1,11 @@ package org.gotson.komga.interfaces.api.rest +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse import jakarta.validation.Valid -import mu.KotlinLogging import org.apache.commons.compress.archivers.zip.Zip64Mode import org.apache.commons.compress.archivers.zip.ZipArchiveEntry import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt index 6f68c3f53..d339ca673 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesCollectionController.kt @@ -1,11 +1,11 @@ package org.gotson.komga.interfaces.api.rest +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse import jakarta.validation.Valid -import mu.KotlinLogging import org.gotson.komga.domain.model.Author import org.gotson.komga.domain.model.Dimension import org.gotson.komga.domain.model.DomainEvent diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt index 9b3130e6d..d5a17dba9 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/SeriesController.kt @@ -1,5 +1,6 @@ package org.gotson.komga.interfaces.api.rest +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Operation import io.swagger.v3.oas.annotations.Parameter import io.swagger.v3.oas.annotations.Parameters @@ -8,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Content import io.swagger.v3.oas.annotations.media.Schema import io.swagger.v3.oas.annotations.responses.ApiResponse import jakarta.validation.Valid -import mu.KotlinLogging import org.apache.commons.compress.archivers.zip.Zip64Mode import org.apache.commons.compress.archivers.zip.ZipArchiveEntry import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt index d66129811..1ba9598dc 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/TransientBooksController.kt @@ -1,7 +1,7 @@ package org.gotson.komga.interfaces.api.rest import com.jakewharton.byteunits.BinaryByteUnit -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.model.CodedException import org.gotson.komga.domain.model.MediaNotReadyException import org.gotson.komga.domain.model.MediaProfile diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt index a2ee5d061..ababbbf7f 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/api/rest/UserController.kt @@ -1,8 +1,8 @@ package org.gotson.komga.interfaces.api.rest +import io.github.oshai.kotlinlogging.KotlinLogging import io.swagger.v3.oas.annotations.Parameter import jakarta.validation.Valid -import mu.KotlinLogging import org.gotson.komga.domain.model.AgeRestriction import org.gotson.komga.domain.model.ContentRestrictions import org.gotson.komga.domain.model.ROLE_ADMIN diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/ListUsersRunner.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/ListUsersRunner.kt index c809a03dd..de5c86127 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/ListUsersRunner.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/ListUsersRunner.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.apprunner -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.persistence.KomgaUserRepository import org.springframework.boot.ApplicationArguments import org.springframework.boot.ApplicationRunner diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/PasswordResetRunner.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/PasswordResetRunner.kt index be8accc11..1ecbecd34 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/PasswordResetRunner.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/apprunner/PasswordResetRunner.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.apprunner -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.persistence.KomgaUserRepository import org.gotson.komga.domain.service.KomgaUserLifecycle import org.springframework.boot.ApplicationArguments diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/AuthenticationActivityCleanupController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/AuthenticationActivityCleanupController.kt index be79bd38c..85e680b2c 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/AuthenticationActivityCleanupController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/AuthenticationActivityCleanupController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.domain.persistence.AuthenticationActivityRepository import org.springframework.context.annotation.Profile import org.springframework.scheduling.annotation.Scheduled diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt index 4b79fddb8..a3df325c8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/InitialUserController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.apache.commons.lang3.RandomStringUtils import org.gotson.komga.domain.model.KomgaUser import org.gotson.komga.domain.service.KomgaUserLifecycle diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/MetricsPublisherController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/MetricsPublisherController.kt index a479a71f2..4ef54e7d1 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/MetricsPublisherController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/MetricsPublisherController.kt @@ -1,5 +1,6 @@ package org.gotson.komga.interfaces.scheduler +import io.github.oshai.kotlinlogging.KotlinLogging import io.micrometer.core.instrument.Counter import io.micrometer.core.instrument.Gauge import io.micrometer.core.instrument.MeterRegistry @@ -7,7 +8,6 @@ import io.micrometer.core.instrument.MultiGauge import io.micrometer.core.instrument.MultiGauge.Row import io.micrometer.core.instrument.Tags import io.micrometer.core.instrument.Timer -import mu.KotlinLogging import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.persistence.BookRepository import org.gotson.komga.domain.persistence.LibraryRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt index 06021d25e..e0db8cee8 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/PeriodicScannerController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.scheduler.LibraryScanScheduler import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.domain.persistence.LibraryRepository diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt index 6d88196f1..2eb207f53 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/SearchIndexController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.HIGHEST_PRIORITY import org.gotson.komga.application.tasks.TaskEmitter import org.gotson.komga.infrastructure.search.LuceneEntity diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/ThumbnailMetadataFixerController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/ThumbnailMetadataFixerController.kt index 4db81dbe3..916d279ff 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/ThumbnailMetadataFixerController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/scheduler/ThumbnailMetadataFixerController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.scheduler -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.LOWEST_PRIORITY import org.gotson.komga.application.tasks.TaskEmitter import org.springframework.boot.context.event.ApplicationReadyEvent diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt index e14b75897..00d757205 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/sse/SseController.kt @@ -1,6 +1,6 @@ package org.gotson.komga.interfaces.sse -import mu.KotlinLogging +import io.github.oshai.kotlinlogging.KotlinLogging import org.gotson.komga.application.tasks.TasksRepository import org.gotson.komga.domain.model.DomainEvent import org.gotson.komga.domain.model.KomgaUser