KotatsuApp
/
Kotatsu
2
0
Fork 0
Code Issues 124 Pull Requests Packages Projects Releases 163 Wiki Activity

Fix sync issues

Browse Source
devel
Koitharu 7 months ago
parent 6b1885c89d
commit 391c8ab649
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/kotlin/org/koitharu/kotatsu/sync/data/model/FavouriteCategorySyncDto.kt
Unescape Escape View File

@ -34,7 +34,7 @@ data class FavouriteCategorySyncDto(
put("created_at", createdAt) put("created_at", createdAt)
put("sort_key", sortKey) put("sort_key", sortKey)
put("title", title) put("title", title)
put("order", order) put("`order`", order)
put("track", track) put("track", track)
put("show_in_lib", isVisibleInLibrary) put("show_in_lib", isVisibleInLibrary)
put("deleted_at", deletedAt) put("deleted_at", deletedAt)

6
app/src/main/kotlin/org/koitharu/kotatsu/sync/data/model/SyncDto.kt
Unescape Escape View File

@ -5,8 +5,8 @@ import kotlinx.serialization.Serializable
@Serializable @Serializable
data class SyncDto( data class SyncDto(
@SerialName("history") val history: List<HistorySyncDto>?, @SerialName("history") val history: List<HistorySyncDto>? = null,
@SerialName("categories") val categories: List<FavouriteCategorySyncDto>?, @SerialName("categories") val categories: List<FavouriteCategorySyncDto>? = null,
@SerialName("favourites") val favourites: List<FavouriteSyncDto>?, @SerialName("favourites") val favourites: List<FavouriteSyncDto>? = null,
@SerialName("timestamp") val timestamp: Long, @SerialName("timestamp") val timestamp: Long,
) )

21
app/src/main/kotlin/org/koitharu/kotatsu/sync/domain/SyncHelper.kt
Unescape Escape View File

@ -22,7 +22,6 @@ import okhttp3.OkHttpClient
import okhttp3.Request import okhttp3.Request
import okhttp3.RequestBody.Companion.toRequestBody import okhttp3.RequestBody.Companion.toRequestBody
import okhttp3.Response import okhttp3.Response
import okhttp3.internal.closeQuietly
import okio.IOException import okio.IOException
import org.jetbrains.annotations.Blocking import org.jetbrains.annotations.Blocking
import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.BuildConfig
@ -89,12 +88,12 @@ class SyncHelper @AssistedInject constructor(
val response = httpClient.newCall(request).execute().parseDtoOrNull() val response = httpClient.newCall(request).execute().parseDtoOrNull()
response?.categories?.let { categories -> response?.categories?.let { categories ->
val categoriesResult = upsertFavouriteCategories(categories) val categoriesResult = upsertFavouriteCategories(categories)
stats.numDeletes += categoriesResult.first().count?.toLong() ?: 0L stats.numDeletes += categoriesResult.firstOrNull()?.count?.toLong() ?: 0L
stats.numInserts += categoriesResult.drop(1).sumOf { it.count?.toLong() ?: 0L } stats.numInserts += categoriesResult.drop(1).sumOf { it.count?.toLong() ?: 0L }
} }
response?.favourites?.let { favourites -> response?.favourites?.let { favourites ->
val favouritesResult = upsertFavourites(favourites) val favouritesResult = upsertFavourites(favourites)
stats.numDeletes += favouritesResult.first().count?.toLong() ?: 0L stats.numDeletes += favouritesResult.firstOrNull()?.count?.toLong() ?: 0L
stats.numInserts += favouritesResult.drop(1).sumOf { it.count?.toLong() ?: 0L } stats.numInserts += favouritesResult.drop(1).sumOf { it.count?.toLong() ?: 0L }
stats.numEntries += stats.numInserts + stats.numDeletes stats.numEntries += stats.numInserts + stats.numDeletes
} }
@ -119,7 +118,7 @@ class SyncHelper @AssistedInject constructor(
val response = httpClient.newCall(request).execute().parseDtoOrNull() val response = httpClient.newCall(request).execute().parseDtoOrNull()
response?.history?.let { history -> response?.history?.let { history ->
val result = upsertHistory(history) val result = upsertHistory(history)
stats.numDeletes += result.first().count?.toLong() ?: 0L stats.numDeletes += result.firstOrNull()?.count?.toLong() ?: 0L
stats.numInserts += result.drop(1).sumOf { it.count?.toLong() ?: 0L } stats.numInserts += result.drop(1).sumOf { it.count?.toLong() ?: 0L }
stats.numEntries += stats.numInserts + stats.numDeletes stats.numEntries += stats.numInserts + stats.numDeletes
} }
@ -286,15 +285,11 @@ class SyncHelper @AssistedInject constructor(
private fun uri(authority: String, table: String) = "content://$authority/$table".toUri() private fun uri(authority: String, table: String) = "content://$authority/$table".toUri()
private fun Response.parseDtoOrNull(): SyncDto? { private fun Response.parseDtoOrNull(): SyncDto? = use {
return try { when {
when { !isSuccessful -> throw IOException(body.string())
!isSuccessful -> throw IOException(body?.string()) code == HttpURLConnection.HTTP_NO_CONTENT -> null
code == HttpURLConnection.HTTP_NO_CONTENT -> null else -> Json.decodeFromString<SyncDto>(body.string())
else -> Json.decodeFromString<SyncDto>(body?.string() ?: return null)
}
} finally {
closeQuietly()
} }
} }

Write Preview
Loading…
Cancel
Save