temple/Suwayomi-Server
1
0
Fork 0
mirror of https://github.com/Suwayomi/Suwayomi-Server.git synced 2026-06-30 17:34:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: re-sync (#2121)

Browse Source
This commit is contained in:
Constantin Piber
2026-06-17 23:22:54 +02:00
committed by GitHub
parent a1fdf6d77a
commit 396cfa734a
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/src/main/kotlin/suwayomi/tachidesk/manga/impl/extension/ExtensionStoreService.kt
View File

@@ -124,27 +124,30 @@ object ExtensionStoreService {
transaction { transaction {
ExtensionStoreTable.selectAll().toList() ExtensionStoreTable.selectAll().toList()
} }
return stores.mapNotNull { storeRow -> var needsPrefUpdate = false
val updateStores = stores.mapNotNull { storeRow ->
val oldIndexUrl = storeRow[ExtensionStoreTable.indexUrl] val oldIndexUrl = storeRow[ExtensionStoreTable.indexUrl]
val oldName = storeRow[ExtensionStoreTable.name] val oldName = storeRow[ExtensionStoreTable.name]
try { try {
val store = fetch(oldIndexUrl) val store = fetch(oldIndexUrl)
upsert(store)
if (store.indexUrl != oldIndexUrl) { if (store.indexUrl != oldIndexUrl) {
transaction { transaction {
ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq oldIndexUrl } ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq oldIndexUrl }
} }
syncDbToPrefs(oldIndexUrl) needsPrefUpdate = true
} }
upsert(store)
store store
} catch (e: Exception) { } catch (e: Exception) {
logger.warn(e) { "Failed to fetch extension store '$oldName ($oldIndexUrl)'" } logger.warn(e) { "Failed to fetch extension store '$oldName ($oldIndexUrl)'" }
null null
} }
} }
if (needsPrefUpdate) syncDbToPrefs()
return updateStores
} }
fun syncDbToPrefs(keepRemoved: String? = null) { fun syncDbToPrefs() {
val dbStores = val dbStores =
transaction { transaction {
ExtensionStoreTable ExtensionStoreTable
@@ -154,8 +157,8 @@ object ExtensionStoreService {
} }
val currentPrefs = serverConfig.extensionStores.value.toSet() val currentPrefs = serverConfig.extensionStores.value.toSet()
val toAdd = (dbStores - currentPrefs - keepRemoved).filterNotNull() val toAdd = dbStores - currentPrefs
val toRemove = (currentPrefs - dbStores + keepRemoved).filterNotNull() val toRemove = currentPrefs - dbStores
if (toAdd.isNotEmpty()) { if (toAdd.isNotEmpty()) {
serverConfig.extensionStores.value = (serverConfig.extensionStores.value + toAdd).distinct() serverConfig.extensionStores.value = (serverConfig.extensionStores.value + toAdd).distinct()
@@ -175,28 +178,33 @@ object ExtensionStoreService {
} }
val toAdd = prefUrls - dbStores.keys val toAdd = prefUrls - dbStores.keys
val toRemove = (dbStores.keys - prefUrls).toMutableSet()
var needsPrefUpdate = toRemove.isNotEmpty()
toAdd.forEach { url -> toAdd.forEach { url ->
try { try {
val store = fetch(url) val store = fetch(url)
upsert(store)
if (store.indexUrl != url) { if (store.indexUrl != url) {
transaction { transaction {
ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq url } ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl eq url }
} }
syncDbToPrefs(url) needsPrefUpdate = true
toRemove -= store.indexUrl
} }
upsert(store)
} catch (e: Exception) { } catch (e: Exception) {
logger.warn(e) { "Failed to sync preference store '$url' to database" } logger.warn(e) { "Failed to sync preference store '$url' to database" }
} }
} }
val toRemove = dbStores.keys - prefUrls
if (toRemove.isNotEmpty()) { if (toRemove.isNotEmpty()) {
transaction { transaction {
ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl inList toRemove.toList() } ExtensionStoreTable.deleteWhere { ExtensionStoreTable.indexUrl inList toRemove.toList() }
} }
} }
if (needsPrefUpdate) {
syncDbToPrefs()
}
} }
suspend fun getExtensions(store: ExtensionStore): List<ExtensionInfo> { suspend fun getExtensions(store: ExtensionStore): List<ExtensionInfo> {

1
server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
View File

@@ -525,7 +525,6 @@ fun applicationSetup() {
serverConfig.extensionStores, serverConfig.extensionStores,
{ _ -> { _ ->
ExtensionStoreService.syncPrefsToDb() ExtensionStoreService.syncPrefsToDb()
ExtensionStoreService.syncDbToPrefs()
}, },
ignoreInitialValue = false, ignoreInitialValue = false,
) )