ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manga database classes, api url change, fix source id

Browse Source
This commit is contained in:
Aria Moradi
2020-12-25 17:16:26 +03:30
parent 5597ad66b4
commit ab33a0ef1d
12 changed files with 105 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/kotlin/ir/armor/tachidesk/util/APK.kt
View File

@@ -68,9 +68,9 @@ fun installAPK(apkName: String): Int {
// name = httpSource.name
// this.extension = ExtensionEntity.find { ExtensionsTable.name eq extension.name }.first().id
// }
if (SourcesTable.select { SourcesTable.sourceId eq httpSource.id }.count() == 0L) {
if (SourcesTable.select { SourcesTable.id eq httpSource.id }.count() == 0L) {
SourcesTable.insert {
it[this.sourceId] = httpSource.id
it[this.id] = httpSource.id
it[name] = httpSource.name
it[this.lang] = httpSource.lang
it[extension] = extensionId
@@ -86,9 +86,9 @@ fun installAPK(apkName: String): Int {
transaction {
sourceFactory.createSources().forEachIndexed { index, source ->
val httpSource = source as HttpSource
if (SourcesTable.select { SourcesTable.sourceId eq httpSource.id }.count() == 0L) {
if (SourcesTable.select { SourcesTable.id eq httpSource.id }.count() == 0L) {
SourcesTable.insert {
it[this.sourceId] = httpSource.id
it[this.id] = httpSource.id
it[name] = httpSource.name
it[this.lang] = httpSource.lang
it[extension] = extensionId

2
server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt Normal file
View File

@@ -0,0 +1,2 @@
package ir.armor.tachidesk.util

6
server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
View File

@@ -18,7 +18,7 @@ import java.net.URLClassLoader
fun getHttpSource(sourceId: Long): HttpSource {
return transaction {
val sourceRecord = SourceEntity.find { SourcesTable.sourceId eq sourceId }.first()
val sourceRecord = SourceEntity.get(sourceId)
val extensionId = sourceRecord.extension.id.value
val extensionRecord = ExtensionEntity.get(extensionId)
val apkName = extensionRecord.apkName
@@ -44,11 +44,11 @@ fun getSourceList(): List<SourceDataClass> {
return transaction {
return@transaction SourcesTable.selectAll().map {
SourceDataClass(
it[SourcesTable.sourceId],
it[SourcesTable.id].value,
it[SourcesTable.name],
it[SourcesTable.lang],
ExtensionsTable.select { ExtensionsTable.id eq it[SourcesTable.extension] }.first()[ExtensionsTable.iconUrl],
getHttpSource(it[SourcesTable.sourceId]).supportsLatest
getHttpSource(it[SourcesTable.id].value).supportsLatest
)
}
}