From 0216cc2cf5ec59f216bd62e3962c65b8feeb7f09 Mon Sep 17 00:00:00 2001 From: Gauthier Roebroeck Date: Wed, 17 Feb 2021 16:59:44 +0800 Subject: [PATCH] style: apply ktlint again to project --- .../komga/domain/service/FileSystemScanner.kt | 2 +- .../komga/domain/service/MetadataAggregator.kt | 2 +- .../komga/domain/service/MetadataLifecycle.kt | 2 +- .../komga/infrastructure/jooq/ReferentialDao.kt | 8 ++++---- .../komga/infrastructure/jooq/SeriesDtoDao.kt | 4 ++-- .../komga/interfaces/rest/SeriesController.kt | 12 +++++++----- .../komga/interfaces/rest/dto/SeriesDto.kt | 1 - .../domain/service/FileSystemScannerTest.kt | 1 - .../domain/service/MetadataAggregatorTest.kt | 16 ++++++++-------- .../interfaces/rest/SeriesControllerTest.kt | 1 - 10 files changed, 24 insertions(+), 25 deletions(-) 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 ad58cb128..e82111789 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 @@ -35,7 +35,7 @@ class FileSystemScanner( logger.info { "Excluded patterns: ${komgaProperties.librariesScanDirectoryExclusions}" } logger.info { "Force directory modified time: $forceDirectoryModifiedTime" } - if(!(Files.isDirectory(root) && Files.isReadable(root))) + if (!(Files.isDirectory(root) && Files.isReadable(root))) throw DirectoryNotFoundException("Library root is not accessible: $root") lateinit var scannedSeries: Map> diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataAggregator.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataAggregator.kt index 64d837a0c..0b47962b2 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataAggregator.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataAggregator.kt @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service @Service class MetadataAggregator { - fun aggregate(metadatas: Collection) : BookMetadataAggregation { + fun aggregate(metadatas: Collection): BookMetadataAggregation { val authors = metadatas.flatMap { it.authors }.distinctBy { "${it.role}__${it.name}" } val (summary, summaryNumber) = metadatas.sortedBy { it.numberSort }.find { it.summary.isNotBlank() }?.let { it.summary to it.number diff --git a/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataLifecycle.kt b/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataLifecycle.kt index 3b319fae1..6e2d9a06e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataLifecycle.kt +++ b/komga/src/main/kotlin/org/gotson/komga/domain/service/MetadataLifecycle.kt @@ -195,7 +195,7 @@ class MetadataLifecycle( } } - fun aggregateMetadata(series: Series){ + fun aggregateMetadata(series: Series) { logger.info { "Aggregate book metadata for series: $series" } val metadatas = bookMetadataRepository.findByIds(bookRepository.findAllIdBySeriesId(series.id)) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReferentialDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReferentialDao.kt index fd9530443..69986a420 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReferentialDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/ReferentialDao.kt @@ -169,10 +169,10 @@ class ReferentialDao( override fun findAllSeriesReleaseDates(): Set = dsl.selectDistinct(bma.RELEASE_DATE) - .from(bma) - .where(bma.RELEASE_DATE.isNotNull) - .orderBy(bma.RELEASE_DATE.desc()) - .fetchSet(bma.RELEASE_DATE) + .from(bma) + .where(bma.RELEASE_DATE.isNotNull) + .orderBy(bma.RELEASE_DATE.desc()) + .fetchSet(bma.RELEASE_DATE) override fun findAllSeriesReleaseDatesByLibrary(libraryId: String): Set = dsl.selectDistinct(bma.RELEASE_DATE) diff --git a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt index 3c2765ad7..48bd65f20 100644 --- a/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt +++ b/komga/src/main/kotlin/org/gotson/komga/infrastructure/jooq/SeriesDtoDao.kt @@ -196,7 +196,7 @@ class SeriesDtoDao( val aggregatedAuthors = dsl.selectFrom(bmaa) .where(bmaa.SERIES_ID.eq(sr.id)) .fetchInto(bmaa) - .filter {it.name != null } + .filter { it.name != null } .map { AuthorDto(it.name, it.role) } sr.toDto(booksCount, booksReadCount, booksUnreadCount, booksInProgressCount, dr.toDto(genres, tags), bmar.toDto(aggregatedAuthors)) @@ -219,7 +219,7 @@ class SeriesDtoDao( c = c.and(c1.or(c2)) } // cast to String is necessary for SQLite, else the years in the IN block are coerced to Int, even though YEAR for SQLite uses strftime (string) - if(!releaseYears.isNullOrEmpty()) c = c.and(DSL.year(bma.RELEASE_DATE).cast(String::class.java).`in`(releaseYears)) + if (!releaseYears.isNullOrEmpty()) c = c.and(DSL.year(bma.RELEASE_DATE).cast(String::class.java).`in`(releaseYears)) return c } diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt index d0026fec6..67f090068 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/SeriesController.kt @@ -402,11 +402,13 @@ class SeriesController( } return ResponseEntity.ok() - .headers(HttpHeaders().apply { - contentDisposition = ContentDisposition.builder("attachment") - .filename(seriesMetadataRepository.findById(seriesId).title + ".zip") - .build() - }) + .headers( + HttpHeaders().apply { + contentDisposition = ContentDisposition.builder("attachment") + .filename(seriesMetadataRepository.findById(seriesId).title + ".zip") + .build() + } + ) .contentType(MediaType.parseMediaType("application/zip")) .body(streamingResponse) } diff --git a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesDto.kt b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesDto.kt index f015a4ae3..3f148d63e 100644 --- a/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesDto.kt +++ b/komga/src/main/kotlin/org/gotson/komga/interfaces/rest/dto/SeriesDto.kt @@ -1,7 +1,6 @@ package org.gotson.komga.interfaces.rest.dto import com.fasterxml.jackson.annotation.JsonFormat -import org.gotson.komga.domain.model.Author import java.time.LocalDate import java.time.LocalDateTime diff --git a/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt b/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt index 22f035f3b..55236d9b5 100644 --- a/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/domain/service/FileSystemScannerTest.kt @@ -8,7 +8,6 @@ import org.assertj.core.api.Assertions.catchThrowable import org.gotson.komga.domain.model.DirectoryNotFoundException import org.gotson.komga.infrastructure.configuration.KomgaProperties import org.junit.jupiter.api.Test -import java.lang.Exception import java.nio.file.Files import java.nio.file.Path diff --git a/komga/src/test/kotlin/org/gotson/komga/domain/service/MetadataAggregatorTest.kt b/komga/src/test/kotlin/org/gotson/komga/domain/service/MetadataAggregatorTest.kt index 5eff0549d..f3d648862 100644 --- a/komga/src/test/kotlin/org/gotson/komga/domain/service/MetadataAggregatorTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/domain/service/MetadataAggregatorTest.kt @@ -10,10 +10,10 @@ class MetadataAggregatorTest { private val aggregator = MetadataAggregator() @Test - fun `given metadatas when aggregating then aggregation is relevant`(){ + fun `given metadatas when aggregating then aggregation is relevant`() { val metadatas = listOf( - BookMetadata(title = "ignored", summary = "summary 1", number = "1", numberSort = 1F, authors = listOf(Author("author1", "role1"), Author("author2", "role2")), releaseDate = LocalDate.of(2020, 1,1)), - BookMetadata(title = "ignored", summary = "summary 2", number = "2", numberSort = 2F, authors = listOf(Author("author3", "role3"), Author("author2", "role3")), releaseDate = LocalDate.of(2021, 1,1)), + BookMetadata(title = "ignored", summary = "summary 1", number = "1", numberSort = 1F, authors = listOf(Author("author1", "role1"), Author("author2", "role2")), releaseDate = LocalDate.of(2020, 1, 1)), + BookMetadata(title = "ignored", summary = "summary 2", number = "2", numberSort = 2F, authors = listOf(Author("author3", "role3"), Author("author2", "role3")), releaseDate = LocalDate.of(2021, 1, 1)), ) val aggregation = aggregator.aggregate(metadatas) @@ -25,7 +25,7 @@ class MetadataAggregatorTest { } @Test - fun `given metadatas with summary only on second book when aggregating then aggregation has second book's summary`(){ + fun `given metadatas with summary only on second book when aggregating then aggregation has second book's summary`() { val metadatas = listOf( BookMetadata(title = "ignored", number = "1", numberSort = 1F), BookMetadata(title = "ignored", summary = "summary 2", number = "2", numberSort = 2F), @@ -38,10 +38,10 @@ class MetadataAggregatorTest { } @Test - fun `given metadatas with second book with earlier release date when aggregating then aggregation has release date from second book`(){ + fun `given metadatas with second book with earlier release date when aggregating then aggregation has release date from second book`() { val metadatas = listOf( - BookMetadata(title = "ignored", number = "1", numberSort = 1F, releaseDate = LocalDate.of(2020, 1,1)), - BookMetadata(title = "ignored", number = "2", numberSort = 2F, releaseDate = LocalDate.of(2019, 1,1)), + BookMetadata(title = "ignored", number = "1", numberSort = 1F, releaseDate = LocalDate.of(2020, 1, 1)), + BookMetadata(title = "ignored", number = "2", numberSort = 2F, releaseDate = LocalDate.of(2019, 1, 1)), ) val aggregation = aggregator.aggregate(metadatas) @@ -50,7 +50,7 @@ class MetadataAggregatorTest { } @Test - fun `given metadatas with duplicate authors when aggregating then aggregation has no duplicate authors`(){ + fun `given metadatas with duplicate authors when aggregating then aggregation has no duplicate authors`() { val metadatas = listOf( BookMetadata(title = "ignored", number = "1", numberSort = 1F, authors = listOf(Author("author1", "role1"), Author("author2", "role2"))), BookMetadata(title = "ignored", number = "2", numberSort = 2F, authors = listOf(Author("author1", "role1"), Author("author2", "role2"))), diff --git a/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt b/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt index eb93a9ede..ab5af43d5 100644 --- a/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt +++ b/komga/src/test/kotlin/org/gotson/komga/interfaces/rest/SeriesControllerTest.kt @@ -269,7 +269,6 @@ class SeriesControllerTest( } } - @Nested inner class RestrictedUserByRole { @Test