temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-07-03 10:54:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix unread and download counts casing (#230)

Browse Source
This commit is contained in:
Mitchell Syer
2021-10-28 11:41:10 -04:00
committed by GitHub
parent 6f8fc5b69d
commit 1ee37da720
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/CategoryManga.kt
View File

@@ -7,8 +7,16 @@ package suwayomi.tachidesk.manga.impl
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * 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.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.Category.DEFAULT_CATEGORY_ID
import suwayomi.tachidesk.manga.impl.util.lang.isEmpty import suwayomi.tachidesk.manga.impl.util.lang.isEmpty
import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass import suwayomi.tachidesk.manga.model.dataclass.CategoryDataClass
@@ -66,8 +74,8 @@ object CategoryManga {
val selectedColumns = MangaTable.columns + unreadExpression + downloadExpression val selectedColumns = MangaTable.columns + unreadExpression + downloadExpression
val transform: (ResultRow) -> MangaDataClass = { val transform: (ResultRow) -> MangaDataClass = {
val dataClass = MangaTable.toDataClass(it) val dataClass = MangaTable.toDataClass(it)
dataClass.unread_count = it[unreadExpression]?.toInt() dataClass.unreadCount = it[unreadExpression]?.toInt()
dataClass.download_count = it[downloadExpression]?.toInt() dataClass.downloadCount = it[downloadExpression]?.toInt()
dataClass dataClass
} }

4
server/src/main/kotlin/suwayomi/tachidesk/manga/model/dataclass/MangaDataClass.kt
View File

@@ -35,8 +35,8 @@ data class MangaDataClass(
val realUrl: String? = null, val realUrl: String? = null,
val freshData: Boolean = false, val freshData: Boolean = false,
var unread_count: Int? = null, var unreadCount: Int? = null,
var download_count: Int? = null var downloadCount: Int? = null
) )
data class PagedMangaListDataClass( data class PagedMangaListDataClass(