Minor tracking cleanups

(cherry picked from commit 6887d98f15b4b9a84230217800fba2d4ae5b186a)

# Conflicts:
#	app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt
This commit is contained in:
arkon
2023-12-24 22:25:22 -05:00
committed by Jobobby04
parent 1d68a64e5c
commit 0dc3b37e70
29 changed files with 78 additions and 82 deletions
@@ -7,7 +7,6 @@ import tachiyomi.domain.track.model.Track
@Serializable
data class BackupTracking(
// in 1.x some of these values have different types or names
// syncId is called siteId in 1,x
@ProtoNumber(1) var syncId: Int,
// LibraryId is not null in 1.x
@ProtoNumber(2) var libraryId: Long,
@@ -34,7 +33,7 @@ data class BackupTracking(
return Track(
id = -1,
mangaId = -1,
syncId = this@BackupTracking.syncId.toLong(),
trackerId = this@BackupTracking.syncId.toLong(),
remoteId = if (this@BackupTracking.mediaIdInt != 0) {
this@BackupTracking.mediaIdInt.toLong()
} else {
@@ -8,9 +8,9 @@ class DeleteTrack(
private val trackRepository: TrackRepository,
) {
suspend fun await(mangaId: Long, syncId: Long) {
suspend fun await(mangaId: Long, trackerId: Long) {
try {
trackRepository.delete(mangaId, syncId)
trackRepository.delete(mangaId, trackerId)
} catch (e: Exception) {
logcat(LogPriority.ERROR, e)
}
@@ -5,6 +5,6 @@ import tachiyomi.domain.track.model.Track
class IsTrackUnfollowed {
fun await(track: Track) =
track.syncId == 60L && // TrackManager.MDLIST
track.trackerId == 60L && // TrackManager.MDLIST
track.status == 0L // FollowStatus.UNFOLLOWED
}
@@ -3,7 +3,7 @@ package tachiyomi.domain.track.model
data class Track(
val id: Long,
val mangaId: Long,
val syncId: Long,
val trackerId: Long,
val remoteId: Long,
val libraryId: Long?,
val title: String,
@@ -19,7 +19,7 @@ interface TrackRepository {
fun getTracksByMangaIdAsFlow(mangaId: Long): Flow<List<Track>>
suspend fun delete(mangaId: Long, syncId: Long)
suspend fun delete(mangaId: Long, trackerId: Long)
suspend fun insert(track: Track)