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

Properly fix default category bug

Browse Source
This commit is contained in:
Bartu Özen
2025-12-11 23:54:56 +03:00
parent 878ee960f3
commit fde921d256
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
View File

@@ -8,6 +8,7 @@ import kotlinx.serialization.protobuf.ProtoBuf
import org.jetbrains.exposed.sql.selectAll import org.jetbrains.exposed.sql.selectAll
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.update
import suwayomi.tachidesk.manga.impl.Category
import suwayomi.tachidesk.manga.impl.backup.BackupFlags import suwayomi.tachidesk.manga.impl.backup.BackupFlags
import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
@@ -65,7 +66,7 @@ object SyncManager {
val backup = Backup( val backup = Backup(
BackupMangaHandler.backup(backupFlags), BackupMangaHandler.backup(backupFlags),
BackupCategoryHandler.backup(backupFlags), BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
BackupSourceHandler.backup(backupMangas, backupFlags), BackupSourceHandler.backup(backupMangas, backupFlags),
emptyMap(), emptyMap(),
null, null,

4
server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
View File

@@ -326,9 +326,7 @@ class SyncYomiSyncService {
): List<BackupCategory> { ): List<BackupCategory> {
if (localCategoriesList == null) return remoteCategoriesList ?: emptyList() if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
if (remoteCategoriesList == null) return localCategoriesList if (remoteCategoriesList == null) return localCategoriesList
val localCategoriesMap = localCategoriesList val localCategoriesMap = localCategoriesList.associateBy { it.name }
.filter { it.name != Category.DEFAULT_CATEGORY_NAME }
.associateBy { it.name }
val remoteCategoriesMap = remoteCategoriesList.associateBy { it.name } val remoteCategoriesMap = remoteCategoriesList.associateBy { it.name }
val mergedCategoriesMap = mutableMapOf<String, BackupCategory>() val mergedCategoriesMap = mutableMapOf<String, BackupCategory>()