Switch to a new Ktlint Formatter (#705)

* Switch to new Ktlint plugin

* Add ktlintCheck to PR builds

* Run formatter

* Put ktlint version in libs toml

* Fix lint

* Use Zip4Java from libs.toml

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/BackupFlags.kt

@@ -12,5 +12,5 @@ data class BackupFlags(
     val includeCategories: Boolean,
     val includeChapters: Boolean,
     val includeTracking: Boolean,
-    val includeHistory: Boolean
+    val includeHistory: Boolean,
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Category.kt

@@ -1,23 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-import java.io.Serializable
-
-interface Category : Serializable {
-
-    var id: Int?
-
-    var name: String
-
-    var order: Int
-
-    var flags: Int
-
-    companion object {
-
-        fun create(name: String): Category = CategoryImpl().apply {
-            this.name = name
-        }
-
-        fun createDefault(): Category = create("Default").apply { id = 0 }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/CategoryImpl.kt

@@ -1,24 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-class CategoryImpl : Category {
-
-    override var id: Int? = null
-
-    override lateinit var name: String
-
-    override var order: Int = 0
-
-    override var flags: Int = 0
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other == null || javaClass != other.javaClass) return false
-
-        val category = other as Category
-        return name == category.name
-    }
-
-    override fun hashCode(): Int {
-        return name.hashCode()
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Chapter.kt

@@ -1,10 +1,11 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 import eu.kanade.tachiyomi.source.model.SChapter
 import java.io.Serializable
 
 interface Chapter : SChapter, Serializable {
-
     var id: Long?
 
     var manga_id: Long?
@@ -23,9 +24,9 @@ interface Chapter : SChapter, Serializable {
         get() = chapter_number >= 0f
 
     companion object {
-
-        fun create(): Chapter = ChapterImpl().apply {
-            chapter_number = -1f
-        }
+        fun create(): Chapter =
+            ChapterImpl().apply {
+                chapter_number = -1f
+            }
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/ChapterImpl.kt

@@ -1,10 +1,11 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.model.table.ChapterTable
 
 class ChapterImpl : Chapter {
-
     override var id: Long? = null
 
     override var manga_id: Long? = null

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/History.kt

@@ -1,42 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-import java.io.Serializable
-
-/**
- * Object containing the history statistics of a chapter
- */
-interface History : Serializable {
-
-    /**
-     * Id of history object.
-     */
-    var id: Long?
-
-    /**
-     * Chapter id of history object.
-     */
-    var chapter_id: Long
-
-    /**
-     * Last time chapter was read in time long format
-     */
-    var last_read: Long
-
-    /**
-     * Total time chapter was read - todo not yet implemented
-     */
-    var time_read: Long
-
-    companion object {
-
-        /**
-         * History constructor
-         *
-         * @param chapter chapter object
-         * @return history object
-         */
-        fun create(chapter: Chapter): History = HistoryImpl().apply {
-            this.chapter_id = chapter.id!!
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/HistoryImpl.kt

@@ -1,27 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-/**
- * Object containing the history statistics of a chapter
- */
-class HistoryImpl : History {
-
-    /**
-     * Id of history object.
-     */
-    override var id: Long? = null
-
-    /**
-     * Chapter id of history object.
-     */
-    override var chapter_id: Long = 0
-
-    /**
-     * Last time chapter was read in time long format
-     */
-    override var last_read: Long = 0
-
-    /**
-     * Total time chapter was read - todo not yet implemented
-     */
-    override var time_read: Long = 0
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Manga.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 import eu.kanade.tachiyomi.source.model.SManga
@@ -15,7 +17,6 @@ object ReadingModeType {
 }
 
 interface Manga : SManga {
-
     var id: Long?
 
     var source: Long
@@ -48,11 +49,17 @@ interface Manga : SManga {
         return genre?.split(", ")?.map { it.trim() }
     }
 
-    private fun setChapterFlags(flag: Int, mask: Int) {
+    private fun setChapterFlags(
+        flag: Int,
+        mask: Int,
+    ) {
         chapter_flags = chapter_flags and mask.inv() or (flag and mask)
     }
 
-    private fun setViewerFlags(flag: Int, mask: Int) {
+    private fun setViewerFlags(
+        flag: Int,
+        mask: Int,
+    ) {
         viewer_flags = viewer_flags and mask.inv() or (flag and mask)
     }
 
@@ -86,7 +93,6 @@ interface Manga : SManga {
         set(rotationType) = setViewerFlags(rotationType, OrientationType.MASK)
 
     companion object {
-
         // Generic filter that does not filter anything
         const val SHOW_ALL = 0x00000000
 
@@ -115,15 +121,21 @@ interface Manga : SManga {
         const val CHAPTER_DISPLAY_NUMBER = 0x00100000
         const val CHAPTER_DISPLAY_MASK = 0x00100000
 
-        fun create(source: Long): Manga = MangaImpl().apply {
-            this.source = source
-        }
+        fun create(source: Long): Manga =
+            MangaImpl().apply {
+                this.source = source
+            }
 
-        fun create(pathUrl: String, title: String, source: Long = 0): Manga = MangaImpl().apply {
-            url = pathUrl
-            this.title = title
-            this.source = source
-        }
+        fun create(
+            pathUrl: String,
+            title: String,
+            source: Long = 0,
+        ): Manga =
+            MangaImpl().apply {
+                url = pathUrl
+                this.title = title
+                this.source = source
+            }
     }
 }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaCategory.kt

@@ -1,20 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-class MangaCategory {
-
-    var id: Long? = null
-
-    var manga_id: Long = 0
-
-    var category_id: Int = 0
-
-    companion object {
-
-        fun create(manga: Manga, category: Category): MangaCategory {
-            val mc = MangaCategory()
-            mc.manga_id = manga.id!!
-            mc.category_id = category.id!!
-            return mc
-        }
-    }
-}

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaChapter.kt

@@ -1,3 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-class MangaChapter(val manga: Manga, val chapter: Chapter)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaChapterHistory.kt

@@ -1,10 +0,0 @@
-package suwayomi.tachidesk.manga.impl.backup.models
-
-/**
- * Object containing manga, chapter and history
- *
- * @param manga object containing manga
- * @param chapter object containing chater
- * @param history object containing history
- */
-data class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val history: History)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/MangaImpl.kt

@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 import eu.kanade.tachiyomi.source.model.UpdateStrategy
@@ -5,7 +7,6 @@ import org.jetbrains.exposed.sql.ResultRow
 import suwayomi.tachidesk.manga.model.table.MangaTable
 
 open class MangaImpl : Manga {
-
     override var id: Long? = null
 
     override var source: Long = -1

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/Track.kt

@@ -1,9 +1,10 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 import java.io.Serializable
 
 interface Track : Serializable {
-
     var id: Long?
 
     var manga_id: Long
@@ -39,8 +40,9 @@ interface Track : Serializable {
     }
 
     companion object {
-        fun create(serviceId: Int): Track = TrackImpl().apply {
-            sync_id = serviceId
-        }
+        fun create(serviceId: Int): Track =
+            TrackImpl().apply {
+                sync_id = serviceId
+            }
     }
 }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/models/TrackImpl.kt

@@ -1,7 +1,8 @@
+@file:Suppress("ktlint:standard:property-naming")
+
 package suwayomi.tachidesk.manga.impl.backup.models
 
 class TrackImpl : Track {
-
     override var id: Long? = null
 
     override var manga_id: Long = 0

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupExport.kt

@@ -51,7 +51,7 @@ object ProtoBackupExport : ProtoBackupBase() {
     private val logger = KotlinLogging.logger { }
     private val applicationDirs by DI.global.instance<ApplicationDirs>()
     private var backupSchedulerJobId: String = ""
-    private const val lastAutomatedBackupKey = "lastAutomatedBackupKey"
+    private const val LAST_AUTOMATED_BACKUP_KEY = "lastAutomatedBackupKey"
     private val preferences = Preferences.userNodeForPackage(ProtoBackupExport::class.java)
 
     init {
@@ -59,10 +59,10 @@ object ProtoBackupExport : ProtoBackupBase() {
             combine(serverConfig.backupInterval, serverConfig.backupTime) { interval, timeOfDay ->
                 Pair(
                     interval,
-                    timeOfDay
+                    timeOfDay,
                 )
             },
-            ::scheduleAutomatedBackupTask
+            ::scheduleAutomatedBackupTask,
         )
     }
 
@@ -77,7 +77,7 @@ object ProtoBackupExport : ProtoBackupBase() {
         val task = {
             cleanupAutomatedBackups()
             createAutomatedBackup()
-            preferences.putLong(lastAutomatedBackupKey, System.currentTimeMillis())
+            preferences.putLong(LAST_AUTOMATED_BACKUP_KEY, System.currentTimeMillis())
         }
 
         val (hour, minute) = serverConfig.backupTime.value.split(":").map { it.toInt() }
@@ -86,7 +86,7 @@ object ProtoBackupExport : ProtoBackupBase() {
         val backupInterval = serverConfig.backupInterval.value.days.coerceAtLeast(1.days)
 
         // trigger last backup in case the server wasn't running on the scheduled time
-        val lastAutomatedBackup = preferences.getLong(lastAutomatedBackupKey, System.currentTimeMillis())
+        val lastAutomatedBackup = preferences.getLong(LAST_AUTOMATED_BACKUP_KEY, System.currentTimeMillis())
         val wasPreviousBackupTriggered =
             (System.currentTimeMillis() - lastAutomatedBackup) < backupInterval.inWholeMilliseconds
         if (!wasPreviousBackupTriggered) {
@@ -105,8 +105,8 @@ object ProtoBackupExport : ProtoBackupBase() {
                 includeCategories = true,
                 includeChapters = true,
                 includeTracking = true,
-                includeHistory = true
-            )
+                includeHistory = true,
+            ),
         ).use { input ->
             val automatedBackupDir = File(applicationDirs.automatedBackupRoot)
             automatedBackupDir.mkdirs()
@@ -162,14 +162,15 @@ object ProtoBackupExport : ProtoBackupBase() {
 
         val databaseManga = transaction { MangaTable.select { MangaTable.inLibrary eq true } }
 
-        val backup: Backup = transaction {
-            Backup(
-                backupManga(databaseManga, flags),
-                backupCategories(),
-                emptyList(),
-                backupExtensionInfo(databaseManga)
-            )
-        }
+        val backup: Backup =
+            transaction {
+                Backup(
+                    backupManga(databaseManga, flags),
+                    backupCategories(),
+                    emptyList(),
+                    backupExtensionInfo(databaseManga),
+                )
+            }
 
         val byteArray = parser.encodeToByteArray(BackupSerializer, backup)
 
@@ -179,48 +180,54 @@ object ProtoBackupExport : ProtoBackupBase() {
         return byteStream.toByteArray().inputStream()
     }
 
-    private fun backupManga(databaseManga: Query, flags: BackupFlags): List<BackupManga> {
+    private fun backupManga(
+        databaseManga: Query,
+        flags: BackupFlags,
+    ): List<BackupManga> {
         return databaseManga.map { mangaRow ->
-            val backupManga = BackupManga(
-                source = mangaRow[MangaTable.sourceReference],
-                url = mangaRow[MangaTable.url],
-                title = mangaRow[MangaTable.title],
-                artist = mangaRow[MangaTable.artist],
-                author = mangaRow[MangaTable.author],
-                description = mangaRow[MangaTable.description],
-                genre = mangaRow[MangaTable.genre]?.split(", ") ?: emptyList(),
-                status = MangaStatus.valueOf(mangaRow[MangaTable.status]).value,
-                thumbnailUrl = mangaRow[MangaTable.thumbnail_url],
-                dateAdded = TimeUnit.SECONDS.toMillis(mangaRow[MangaTable.inLibraryAt]),
-                viewer = 0, // not supported in Tachidesk
-                updateStrategy = UpdateStrategy.valueOf(mangaRow[MangaTable.updateStrategy])
-            )
+            val backupManga =
+                BackupManga(
+                    source = mangaRow[MangaTable.sourceReference],
+                    url = mangaRow[MangaTable.url],
+                    title = mangaRow[MangaTable.title],
+                    artist = mangaRow[MangaTable.artist],
+                    author = mangaRow[MangaTable.author],
+                    description = mangaRow[MangaTable.description],
+                    genre = mangaRow[MangaTable.genre]?.split(", ") ?: emptyList(),
+                    status = MangaStatus.valueOf(mangaRow[MangaTable.status]).value,
+                    thumbnailUrl = mangaRow[MangaTable.thumbnail_url],
+                    dateAdded = TimeUnit.SECONDS.toMillis(mangaRow[MangaTable.inLibraryAt]),
+                    viewer = 0, // not supported in Tachidesk
+                    updateStrategy = UpdateStrategy.valueOf(mangaRow[MangaTable.updateStrategy]),
+                )
 
             val mangaId = mangaRow[MangaTable.id].value
 
             if (flags.includeChapters) {
-                val chapters = transaction {
-                    ChapterTable.select { ChapterTable.manga eq mangaId }
-                        .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
-                        .map {
-                            ChapterTable.toDataClass(it)
-                        }
-                }
+                val chapters =
+                    transaction {
+                        ChapterTable.select { ChapterTable.manga eq mangaId }
+                            .orderBy(ChapterTable.sourceOrder to SortOrder.DESC)
+                            .map {
+                                ChapterTable.toDataClass(it)
+                            }
+                    }
 
-                backupManga.chapters = chapters.map {
-                    BackupChapter(
-                        it.url,
-                        it.name,
-                        it.scanlator,
-                        it.read,
-                        it.bookmarked,
-                        it.lastPageRead,
-                        TimeUnit.SECONDS.toMillis(it.fetchedAt),
-                        it.uploadDate,
-                        it.chapterNumber,
-                        chapters.size - it.index
-                    )
-                }
+                backupManga.chapters =
+                    chapters.map {
+                        BackupChapter(
+                            it.url,
+                            it.name,
+                            it.scanlator,
+                            it.read,
+                            it.bookmarked,
+                            it.lastPageRead,
+                            TimeUnit.SECONDS.toMillis(it.fetchedAt),
+                            it.uploadDate,
+                            it.chapterNumber,
+                            chapters.size - it.index,
+                        )
+                    }
             }
 
             if (flags.includeCategories) {
@@ -246,7 +253,7 @@ object ProtoBackupExport : ProtoBackupBase() {
             BackupCategory(
                 it.name,
                 it.order,
-                0 // not supported in Tachidesk
+                0, // not supported in Tachidesk
             )
         }
     }
@@ -260,7 +267,7 @@ object ProtoBackupExport : ProtoBackupBase() {
                 val sourceRow = SourceTable.select { SourceTable.id eq it }.firstOrNull()
                 BackupSource(
                     sourceRow?.get(SourceTable.name) ?: "",
-                    it
+                    it,
                 )
             }
             .toList()

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupImport.kt

@@ -47,9 +47,12 @@ object ProtoBackupImport : ProtoBackupBase() {
     private val errors = mutableListOf<Pair<Date, String>>()
 
     private val backupMutex = Mutex()
+
     sealed class BackupRestoreState {
         data object Idle : BackupRestoreState()
+
         data class RestoringCategories(val totalManga: Int) : BackupRestoreState()
+
         data class RestoringManga(val current: Int, val totalManga: Int, val title: String) : BackupRestoreState()
     }
 
@@ -70,26 +73,28 @@ object ProtoBackupImport : ProtoBackupBase() {
                 restoreCategories(backup.backupCategories)
             }
 
-            val categoryMapping = transaction {
-                backup.backupCategories.associate {
-                    it.order to CategoryTable.select { CategoryTable.name eq it.name }.first()[CategoryTable.id].value
+            val categoryMapping =
+                transaction {
+                    backup.backupCategories.associate {
+                        it.order to CategoryTable.select { CategoryTable.name eq it.name }.first()[CategoryTable.id].value
+                    }
                 }
-            }
 
             // Store source mapping for error messages
             sourceMapping = backup.getSourceMap()
 
             // Restore individual manga
             backup.backupManga.forEachIndexed { index, manga ->
-                backupRestoreState.value = BackupRestoreState.RestoringManga(
-                    current = index + 1,
-                    totalManga = backup.backupManga.size,
-                    title = manga.title
-                )
+                backupRestoreState.value =
+                    BackupRestoreState.RestoringManga(
+                        current = index + 1,
+                        totalManga = backup.backupManga.size,
+                        title = manga.title,
+                    )
                 restoreManga(
                     backupManga = manga,
                     backupCategories = backup.backupCategories,
-                    categoryMapping = categoryMapping
+                    categoryMapping = categoryMapping,
                 )
             }
 
@@ -126,7 +131,7 @@ object ProtoBackupImport : ProtoBackupBase() {
     private fun restoreManga(
         backupManga: BackupManga,
         backupCategories: List<BackupCategory>,
-        categoryMapping: Map<Int, Int>
+        categoryMapping: Map<Int, Int>,
     ) {
         val manga = backupManga.getMangaImpl()
         val chapters = backupManga.getChaptersImpl()
@@ -150,36 +155,38 @@ object ProtoBackupImport : ProtoBackupBase() {
         history: List<BackupHistory>,
         tracks: List<Track>,
         backupCategories: List<BackupCategory>,
-        categoryMapping: Map<Int, Int>
+        categoryMapping: Map<Int, Int>,
     ) {
-        val dbManga = transaction {
-            MangaTable.select { (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq manga.source) }
-                .firstOrNull()
-        }
+        val dbManga =
+            transaction {
+                MangaTable.select { (MangaTable.url eq manga.url) and (MangaTable.sourceReference eq manga.source) }
+                    .firstOrNull()
+            }
 
         if (dbManga == null) { // Manga not in database
             transaction {
                 // insert manga to database
-                val mangaId = MangaTable.insertAndGetId {
-                    it[url] = manga.url
-                    it[title] = manga.title
+                val mangaId =
+                    MangaTable.insertAndGetId {
+                        it[url] = manga.url
+                        it[title] = manga.title
 
-                    it[artist] = manga.artist
-                    it[author] = manga.author
-                    it[description] = manga.description
-                    it[genre] = manga.genre
-                    it[status] = manga.status
-                    it[thumbnail_url] = manga.thumbnail_url
-                    it[updateStrategy] = manga.update_strategy.name
+                        it[artist] = manga.artist
+                        it[author] = manga.author
+                        it[description] = manga.description
+                        it[genre] = manga.genre
+                        it[status] = manga.status
+                        it[thumbnail_url] = manga.thumbnail_url
+                        it[updateStrategy] = manga.update_strategy.name
 
-                    it[sourceReference] = manga.source
+                        it[sourceReference] = manga.source
 
-                    it[initialized] = manga.description != null
+                        it[initialized] = manga.description != null
 
-                    it[inLibrary] = manga.favorite
+                        it[inLibrary] = manga.favorite
 
-                    it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added)
-                }.value
+                        it[inLibraryAt] = TimeUnit.MILLISECONDS.toSeconds(manga.date_added)
+                    }.value
 
                 // insert chapter data
                 val chaptersLength = chapters.size

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/ProtoBackupValidator.kt

@@ -24,7 +24,7 @@ object ProtoBackupValidator {
         val missingTrackers: List<String>,
         val mangasMissingSources: List<String>,
         @JsonIgnore
-        val missingSourceIds: List<Pair<Long, String>>
+        val missingSourceIds: List<Pair<Long, String>>,
     )
 
     fun validate(backup: Backup): ValidationResult {
@@ -34,9 +34,10 @@ object ProtoBackupValidator {
 
         val sources = backup.getSourceMap()
 
-        val missingSources = transaction {
-            sources.filter { SourceTable.select { SourceTable.id eq it.key }.firstOrNull() == null }
-        }
+        val missingSources =
+            transaction {
+                sources.filter { SourceTable.select { SourceTable.id eq it.key }.firstOrNull() == null }
+            }
 
 //        val trackers = backup.backupManga
 //            .flatMap { it.tracking }
@@ -56,7 +57,7 @@ object ProtoBackupValidator {
                 .sorted(),
             missingTrackers,
             emptyList(),
-            missingSources.toList()
+            missingSources.toList(),
         )
     }
 

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/Backup.kt

@@ -9,7 +9,7 @@ data class Backup(
     @ProtoNumber(2) var backupCategories: List<BackupCategory> = emptyList(),
     // Bump by 100 to specify this is a 0.x value
     @ProtoNumber(100) var brokenBackupSources: List<BrokenBackupSource> = emptyList(),
-    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList()
+    @ProtoNumber(101) var backupSources: List<BackupSource> = emptyList(),
 ) {
     fun getSourceMap(): Map<Long, String> {
         return (brokenBackupSources.map { BackupSource(it.name, it.sourceId) } + backupSources)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupCategory.kt

@@ -2,8 +2,6 @@ package suwayomi.tachidesk.manga.impl.backup.proto.models
 
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.protobuf.ProtoNumber
-import suwayomi.tachidesk.manga.impl.backup.models.Category
-import suwayomi.tachidesk.manga.impl.backup.models.CategoryImpl
 
 @Serializable
 class BackupCategory(
@@ -11,23 +9,5 @@ class BackupCategory(
     @ProtoNumber(2) var order: Int = 0,
     // @ProtoNumber(3) val updateInterval: Int = 0, 1.x value not used in 0.x
     // Bump by 100 to specify this is a 0.x value
-    @ProtoNumber(100) var flags: Int = 0
-) {
-    fun getCategoryImpl(): CategoryImpl {
-        return CategoryImpl().apply {
-            name = this@BackupCategory.name
-            flags = this@BackupCategory.flags
-            order = this@BackupCategory.order
-        }
-    }
-
-    companion object {
-        fun copyFrom(category: Category): BackupCategory {
-            return BackupCategory(
-                name = category.name,
-                order = category.order,
-                flags = category.flags
-            )
-        }
-    }
-}
+    @ProtoNumber(100) var flags: Int = 0,
+)

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupChapter.kt

@@ -20,7 +20,7 @@ data class BackupChapter(
     @ProtoNumber(8) var dateUpload: Long = 0,
     // chapterNumber is called number is 1.x
     @ProtoNumber(9) var chapterNumber: Float = 0F,
-    @ProtoNumber(10) var sourceOrder: Int = 0
+    @ProtoNumber(10) var sourceOrder: Int = 0,
 ) {
     fun toChapterImpl(): ChapterImpl {
         return ChapterImpl().apply {
@@ -49,7 +49,7 @@ data class BackupChapter(
                 lastPageRead = chapter.last_page_read,
                 dateFetch = chapter.date_fetch,
                 dateUpload = chapter.date_upload,
-                sourceOrder = chapter.source_order
+                sourceOrder = chapter.source_order,
             )
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupHistory.kt

@@ -6,11 +6,11 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupHistory(
     @ProtoNumber(0) var url: String,
-    @ProtoNumber(1) var lastRead: Long
+    @ProtoNumber(1) var lastRead: Long,
 )
 
 @Serializable
 data class BackupHistory(
     @ProtoNumber(1) var url: String,
-    @ProtoNumber(2) var lastRead: Long
+    @ProtoNumber(2) var lastRead: Long,
 )

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupManga.kt

@@ -37,7 +37,7 @@ data class BackupManga(
     @ProtoNumber(102) var brokenHistory: List<BrokenBackupHistory> = emptyList(),
     @ProtoNumber(103) var viewer_flags: Int? = null,
     @ProtoNumber(104) var history: List<BackupHistory> = emptyList(),
-    @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE
+    @ProtoNumber(105) var updateStrategy: UpdateStrategy = UpdateStrategy.ALWAYS_UPDATE,
 ) {
     fun getMangaImpl(): MangaImpl {
         return MangaImpl().apply {
@@ -86,7 +86,7 @@ data class BackupManga(
                 dateAdded = manga.date_added,
                 viewer = manga.readingModeType,
                 viewer_flags = manga.viewer_flags,
-                chapterFlags = manga.chapter_flags
+                chapterFlags = manga.chapter_flags,
             )
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupSource.kt

@@ -7,19 +7,19 @@ import kotlinx.serialization.protobuf.ProtoNumber
 @Serializable
 data class BrokenBackupSource(
     @ProtoNumber(0) var name: String = "",
-    @ProtoNumber(1) var sourceId: Long
+    @ProtoNumber(1) var sourceId: Long,
 )
 
 @Serializable
 data class BackupSource(
     @ProtoNumber(1) var name: String = "",
-    @ProtoNumber(2) var sourceId: Long
+    @ProtoNumber(2) var sourceId: Long,
 ) {
     companion object {
         fun copyFrom(source: Source): BackupSource {
             return BackupSource(
                 name = source.name,
-                sourceId = source.id
+                sourceId = source.id,
             )
         }
     }

server/src/main/kotlin/suwayomi/tachidesk/manga/impl/backup/proto/models/BackupTracking.kt

@@ -24,7 +24,7 @@ data class BackupTracking(
     // startedReadingDate is called startReadTime in 1.x
     @ProtoNumber(10) var startedReadingDate: Long = 0,
     // finishedReadingDate is called endReadTime in 1.x
-    @ProtoNumber(11) var finishedReadingDate: Long = 0
+    @ProtoNumber(11) var finishedReadingDate: Long = 0,
 ) {
     fun getTrackingImpl(): TrackImpl {
         return TrackImpl().apply {
@@ -58,7 +58,7 @@ data class BackupTracking(
                 status = track.status,
                 startedReadingDate = track.started_reading_date,
                 finishedReadingDate = track.finished_reading_date,
-                trackingUrl = track.tracking_url
+                trackingUrl = track.tracking_url,
             )
         }
     }