Revert source id to long

This commit is contained in:
Syer10 2021-04-03 16:57:03 -04:00
parent c0df7d314b
commit a211a4143b
3 changed files with 4 additions and 4 deletions

View File

@ -24,7 +24,7 @@ object Source {
return transaction { return transaction {
SourceTable.selectAll().map { SourceTable.selectAll().map {
SourceDataClass( SourceDataClass(
it[SourceTable.id].value, it[SourceTable.id].value.toString(),
it[SourceTable.name], it[SourceTable.name],
it[SourceTable.lang], it[SourceTable.lang],
getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]), getExtensionIconUrl(ExtensionTable.select { ExtensionTable.id eq it[SourceTable.extension] }.first()[ExtensionTable.apkName]),
@ -39,7 +39,7 @@ object Source {
val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull() val source = SourceTable.select { SourceTable.id eq sourceId }.firstOrNull()
SourceDataClass( SourceDataClass(
sourceId, sourceId.toString(),
source?.get(SourceTable.name), source?.get(SourceTable.name),
source?.get(SourceTable.lang), source?.get(SourceTable.lang),
source?.let { ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.iconUrl] }, source?.let { ExtensionTable.select { ExtensionTable.id eq source[SourceTable.extension] }.first()[ExtensionTable.iconUrl] },

View File

@ -8,7 +8,7 @@ package ir.armor.tachidesk.model.dataclass
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
data class SourceDataClass( data class SourceDataClass(
val id: Long, val id: String,
val name: String?, val name: String?,
val lang: String?, val lang: String?,
val iconUrl: String?, val iconUrl: String?,

View File

@ -58,7 +58,7 @@ class TestExtensions {
} }
} }
} }
sources = getSourceList().map { getHttpSource(it.id) } sources = getSourceList().map { getHttpSource(it.id.toLong()) }
} }
setLoggingEnabled(true) setLoggingEnabled(true)
File("tmp/TestDesk/sources.txt").writeText(sources.joinToString("\n") { "${it.name} - ${it.lang.toUpperCase()} - ${it.id}" }) File("tmp/TestDesk/sources.txt").writeText(sources.joinToString("\n") { "${it.name} - ${it.lang.toUpperCase()} - ${it.id}" })