From 53a1a5545ae554499ea07fefd3d3a293ff7e9a4a Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 5 Jul 2022 15:30:41 +0200 Subject: [PATCH] Formatting. Disable line length check in detekt. It's being guarded by KtLint already. --- .../main/kotlin/org/moire/ultrasonic/domain/Album.kt | 1 - .../kotlin/org/moire/ultrasonic/domain/Artist.kt | 1 - .../org/moire/ultrasonic/domain/ArtistOrIndex.kt | 1 + .../main/kotlin/org/moire/ultrasonic/domain/Index.kt | 1 - .../main/kotlin/org/moire/ultrasonic/domain/Track.kt | 1 - detekt-config.yml | 5 +---- .../kotlin/org/moire/ultrasonic/data/MetaDatabase.kt | 6 ++++-- .../moire/ultrasonic/domain/APIPlaylistConverter.kt | 12 +++++++----- .../ultrasonic/domain/APIPlaylistConverterTest.kt | 3 +-- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt index 1ddf435b..28af9da0 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt @@ -9,7 +9,6 @@ package org.moire.ultrasonic.domain import androidx.room.ColumnInfo import androidx.room.Entity -import androidx.room.PrimaryKey import java.util.Date @Entity(tableName = "albums", primaryKeys = ["id", "serverId"]) diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt index b9d70777..7c002e58 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Artist.kt @@ -9,7 +9,6 @@ package org.moire.ultrasonic.domain import androidx.room.ColumnInfo import androidx.room.Entity -import androidx.room.PrimaryKey @Entity(tableName = "artists", primaryKeys = ["id", "serverId"]) data class Artist( diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ArtistOrIndex.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ArtistOrIndex.kt index d61dc17c..91040e98 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ArtistOrIndex.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/ArtistOrIndex.kt @@ -9,6 +9,7 @@ package org.moire.ultrasonic.domain import androidx.room.Ignore +@Suppress("LongParameterList") abstract class ArtistOrIndex( @Ignore override var id: String, diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Index.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Index.kt index 9d9431e7..d3190f25 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Index.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Index.kt @@ -9,7 +9,6 @@ package org.moire.ultrasonic.domain import androidx.room.ColumnInfo import androidx.room.Entity -import androidx.room.PrimaryKey @Entity(tableName = "indexes", primaryKeys = ["id", "serverId"]) data class Index( diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Track.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Track.kt index 9a17edee..c0e6afd8 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Track.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Track.kt @@ -9,7 +9,6 @@ package org.moire.ultrasonic.domain import androidx.room.ColumnInfo import androidx.room.Entity -import androidx.room.PrimaryKey import java.io.Serializable import java.util.Date diff --git a/detekt-config.yml b/detekt-config.yml index b59e4ec3..df3b8a00 100644 --- a/detekt-config.yml +++ b/detekt-config.yml @@ -64,10 +64,7 @@ style: WildcardImport: active: true MaxLineLength: - active: true - maxLineLength: 120 - excludePackageStatements: false - excludeImportStatements: false + active: false MagicNumber: # 100 common in percentage, 1000 in milliseconds ignoreNumbers: ['-1', '0', '1', '2', '5', '10', '100', '256', '512', '1000', '1024', '4096'] diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt index 8f67634c..3ecbe54d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt @@ -14,12 +14,12 @@ import androidx.room.TypeConverter import androidx.room.TypeConverters import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase +import java.util.Date import org.moire.ultrasonic.domain.Album import org.moire.ultrasonic.domain.Artist import org.moire.ultrasonic.domain.Index import org.moire.ultrasonic.domain.MusicFolder import org.moire.ultrasonic.domain.Track -import java.util.Date /** * This database is used to store and cache the ID3 metadata @@ -67,7 +67,8 @@ class Converters { } } -val META_MIGRATION_2_3: Migration = object : Migration(2,3) { +/* ktlint-disable max-line-length */ +val META_MIGRATION_2_3: Migration = object : Migration(2, 3) { override fun migrate(database: SupportSQLiteDatabase) { database.execSQL("DROP TABLE `albums`") database.execSQL("DROP TABLE `indexes`") @@ -81,3 +82,4 @@ val META_MIGRATION_2_3: Migration = object : Migration(2,3) { database.execSQL("CREATE TABLE IF NOT EXISTS `tracks` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `isDirectory` INTEGER NOT NULL, `title` TEXT, `album` TEXT, `albumId` TEXT, `artist` TEXT, `artistId` TEXT, `track` INTEGER, `year` INTEGER, `genre` TEXT, `contentType` TEXT, `suffix` TEXT, `transcodedContentType` TEXT, `transcodedSuffix` TEXT, `coverArt` TEXT, `size` INTEGER, `songCount` INTEGER, `duration` INTEGER, `bitRate` INTEGER, `path` TEXT, `isVideo` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `discNumber` INTEGER, `type` TEXT, `created` INTEGER, `closeness` INTEGER NOT NULL, `bookmarkPosition` INTEGER NOT NULL, `userRating` INTEGER, `averageRating` REAL, `name` TEXT, PRIMARY KEY(`id`, `serverId`))") } } +/* ktlint-enable max-line-length */ diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt index e9c279ac..3be0e3f1 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt @@ -21,11 +21,13 @@ internal val playlistDateFormat by lazy(NONE) { SimpleDateFormat.getInstance() } fun APIPlaylist.toMusicDirectoryDomainEntity(serverId: Int): MusicDirectory = MusicDirectory().apply { name = this@toMusicDirectoryDomainEntity.name - addAll(this@toMusicDirectoryDomainEntity.entriesList.map { - val item = it.toTrackEntity(serverId) - item.serverId = serverId - item - }) + addAll( + this@toMusicDirectoryDomainEntity.entriesList.map { + val item = it.toTrackEntity(serverId) + item.serverId = serverId + item + } + ) } fun APIPlaylist.toDomainEntity(): Playlist = Playlist( diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt index 35a0add5..c34de1fd 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverterTest.kt @@ -7,7 +7,6 @@ import org.amshove.kluent.`should be equal to` import org.junit.Test import org.moire.ultrasonic.api.subsonic.models.MusicDirectoryChild import org.moire.ultrasonic.api.subsonic.models.Playlist -import org.moire.ultrasonic.data.ActiveServerProvider /** * Unit test for extension functions that converts api playlist entity to domain. @@ -23,7 +22,7 @@ class APIPlaylistConverterTest : BaseTest() { ) ) - val convertedEntity = entity.toMusicDirectoryDomainEntity(ActiveServerProvider.getActiveServerId()) + val convertedEntity = entity.toMusicDirectoryDomainEntity(serverId) with(convertedEntity) { name `should be equal to` entity.name