From 1ee37da720abd8d017f3c443f0b7e2dc543ee1ef Mon Sep 17 00:00:00 2001 From: Mitchell Syer Date: Thu, 28 Oct 2021 11:41:10 -0400 Subject: [PATCH] Fix unread and download counts casing (#230) --- .../suwayomi/tachidesk/manga/impl/CategoryManga.kt | 14 +++++++++++--- .../manga/model/dataclass/MangaDataClass.kt | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt index cc79e293..caf5f64f 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt @@ -7,8 +7,16 @@ package suwayomi.tachidesk.manga.impl * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -import org.jetbrains.exposed.sql.* +import org.jetbrains.exposed.sql.ResultRow +import org.jetbrains.exposed.sql.SortOrder +import org.jetbrains.exposed.sql.and +import org.jetbrains.exposed.sql.count +import org.jetbrains.exposed.sql.deleteWhere +import org.jetbrains.exposed.sql.insert +import org.jetbrains.exposed.sql.select import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.sql.update +import org.jetbrains.exposed.sql.wrapAsExpression import suwayomi.tachidesk.manga.impl.Category.DEFAULT_CATEGORY_ID import suwayomi.tachidesk.manga.impl.util.lang.isEmpty import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass @@ -66,8 +74,8 @@ object CategoryManga { val selectedColumns = MangaTable.columns + unreadExpression + downloadExpression val transform: (ResultRow) -> MangaDataClass = { val dataClass = MangaTable.toDataClass(it) - dataClass.unread_count = it[unreadExpression]?.toInt() - dataClass.download_count = it[downloadExpression]?.toInt() + dataClass.unreadCount = it[unreadExpression]?.toInt() + dataClass.downloadCount = it[downloadExpression]?.toInt() dataClass } diff --git a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt index 02275fe9..ad6a2ee1 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt @@ -35,8 +35,8 @@ data class MangaDataClass( val realUrl: String? = null, val freshData: Boolean = false, - var unread_count: Int? = null, - var download_count: Int? = null + var unreadCount: Int? = null, + var downloadCount: Int? = null ) data class PagedMangaListDataClass(