* Implement Anilist API v2 (closes #1159) Switches to using the Anilist v2 API. Login is now done by implicit grant and tokens are good for one year. Users will need to login again after token expiration. "clientId" on line 289 of AnilistApi.kt should be changed to Tachiyomi's own client ID number. * Code style formatting Revert to kotlin 1.2.30 Use correct client ID Rename AnilistApi.login to AnilistApi.createOAuth to reflect changed implementation Rename json mimetype variable from json to jsonMime for clarity Don't read response if it's ignored Remove unused parameters from api requests * Close netResponse after read * Refactor remote_id into media_id and library_id * DB: Refactor RemoteId Refactor RemoteId into library_id and media_id Implement function to fetch library_id if user is migrating rom APIv1 * Remove logging interceptor * Compatability and sql simplification * Fix score and minor improvements * Revert changes to Kitsu API
This commit is contained in:
@@ -402,8 +402,11 @@ class BackupManager(val context: Context, version: Int = CURRENT_VERSION) {
|
||||
for (dbTrack in dbTracks) {
|
||||
if (track.sync_id == dbTrack.sync_id) {
|
||||
// The sync is already in the db, only update its fields
|
||||
if (track.remote_id != dbTrack.remote_id) {
|
||||
dbTrack.remote_id = track.remote_id
|
||||
if (track.media_id != dbTrack.media_id) {
|
||||
dbTrack.media_id = track.media_id
|
||||
}
|
||||
if (track.library_id != dbTrack.library_id) {
|
||||
dbTrack.library_id = track.library_id
|
||||
}
|
||||
dbTrack.last_chapter_read = Math.max(dbTrack.last_chapter_read, track.last_chapter_read)
|
||||
isInDatabase = true
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package eu.kanade.tachiyomi.data.backup.serializer
|
||||
|
||||
import android.telecom.DisconnectCause.REMOTE
|
||||
import com.github.salomonbrys.kotson.typeAdapter
|
||||
import com.google.gson.TypeAdapter
|
||||
import com.google.gson.stream.JsonToken
|
||||
@@ -11,7 +12,8 @@ import eu.kanade.tachiyomi.data.database.models.TrackImpl
|
||||
object TrackTypeAdapter {
|
||||
|
||||
private const val SYNC = "s"
|
||||
private const val REMOTE = "r"
|
||||
private const val MEDIA = "r"
|
||||
private const val LIBRARY = "ml"
|
||||
private const val TITLE = "t"
|
||||
private const val LAST_READ = "l"
|
||||
private const val TRACKING_URL = "u"
|
||||
@@ -24,8 +26,10 @@ object TrackTypeAdapter {
|
||||
value(it.title)
|
||||
name(SYNC)
|
||||
value(it.sync_id)
|
||||
name(REMOTE)
|
||||
value(it.remote_id)
|
||||
name(MEDIA)
|
||||
value(it.media_id)
|
||||
name(LIBRARY)
|
||||
value(it.library_id)
|
||||
name(LAST_READ)
|
||||
value(it.last_chapter_read)
|
||||
name(TRACKING_URL)
|
||||
@@ -43,7 +47,8 @@ object TrackTypeAdapter {
|
||||
when (name) {
|
||||
TITLE -> track.title = nextString()
|
||||
SYNC -> track.sync_id = nextInt()
|
||||
REMOTE -> track.remote_id = nextInt()
|
||||
MEDIA -> track.media_id = nextInt()
|
||||
LIBRARY -> track.library_id = nextLong()
|
||||
LAST_READ -> track.last_chapter_read = nextInt()
|
||||
TRACKING_URL -> track.tracking_url = nextString()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user