Tracker-related cleanup
(cherry picked from commit c8e226acb2ef460f78a298ef44412bb5b2915daf) # Conflicts: # app/src/main/java/eu/kanade/domain/track/interactor/TrackChapter.kt # app/src/main/java/eu/kanade/tachiyomi/data/track/TrackerManager.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateDialog.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/stats/StatsScreenModel.kt
This commit is contained in:
@@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.BuildConfig
|
||||
import eu.kanade.tachiyomi.core.security.SecurityPreferences
|
||||
import eu.kanade.tachiyomi.data.backup.BackupCreateJob
|
||||
import eu.kanade.tachiyomi.data.library.LibraryUpdateJob
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.data.track.TrackerManager
|
||||
import eu.kanade.tachiyomi.network.NetworkPreferences
|
||||
import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
|
||||
import eu.kanade.tachiyomi.source.Source
|
||||
@@ -98,7 +98,7 @@ object EXHMigrations {
|
||||
libraryPreferences: LibraryPreferences,
|
||||
readerPreferences: ReaderPreferences,
|
||||
backupPreferences: BackupPreferences,
|
||||
trackManager: TrackManager,
|
||||
trackerManager: TrackerManager,
|
||||
): Boolean {
|
||||
val lastVersionCode = preferenceStore.getInt("eh_last_version_code", 0)
|
||||
val oldVersion = lastVersionCode.get()
|
||||
@@ -205,7 +205,7 @@ object EXHMigrations {
|
||||
}
|
||||
if (oldVersion under 12) {
|
||||
// Force MAL log out due to login flow change
|
||||
trackManager.myAnimeList.logout()
|
||||
trackerManager.myAnimeList.logout()
|
||||
}
|
||||
if (oldVersion under 14) {
|
||||
// Migrate DNS over HTTPS setting
|
||||
@@ -502,7 +502,7 @@ object EXHMigrations {
|
||||
}
|
||||
if (oldVersion under 45) {
|
||||
// Force MangaDex log out due to login flow change
|
||||
trackManager.mdList.logout()
|
||||
trackerManager.mdList.logout()
|
||||
}
|
||||
if (oldVersion under 51) {
|
||||
LibraryUpdateJob.cancelAllWorks(context)
|
||||
@@ -520,7 +520,7 @@ object EXHMigrations {
|
||||
"pref_filter_library_bookmarked",
|
||||
"pref_filter_library_completed",
|
||||
"pref_filter_library_lewd",
|
||||
) + trackManager.services.map { "pref_filter_library_tracked_${it.id}" }
|
||||
) + trackerManager.trackers.map { "pref_filter_library_tracked_${it.id}" }
|
||||
|
||||
prefKeys.forEach { key ->
|
||||
val pref = preferenceStore.getInt(key, 0)
|
||||
|
||||
@@ -8,7 +8,7 @@ import eu.kanade.domain.source.service.SourcePreferences
|
||||
import eu.kanade.domain.ui.UiPreferences
|
||||
import eu.kanade.tachiyomi.core.security.SecurityPreferences
|
||||
import eu.kanade.tachiyomi.data.backup.models.Backup
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.data.track.TrackerManager
|
||||
import eu.kanade.tachiyomi.network.NetworkPreferences
|
||||
import eu.kanade.tachiyomi.source.AndroidSourceManager
|
||||
import eu.kanade.tachiyomi.source.online.all.NHentai
|
||||
@@ -51,7 +51,7 @@ object DebugFunctions {
|
||||
val libraryPrefs: LibraryPreferences by injectLazy()
|
||||
val readerPrefs: ReaderPreferences by injectLazy()
|
||||
val backupPrefs: BackupPreferences by injectLazy()
|
||||
val trackManager: TrackManager by injectLazy()
|
||||
val trackerManager: TrackerManager by injectLazy()
|
||||
val sourceManager: SourceManager by injectLazy()
|
||||
val updateManga: UpdateManga by injectLazy()
|
||||
val getFavorites: GetFavorites by injectLazy()
|
||||
@@ -64,13 +64,13 @@ object DebugFunctions {
|
||||
fun forceUpgradeMigration() {
|
||||
val lastVersionCode = prefsStore.getInt("eh_last_version_code", 0)
|
||||
lastVersionCode.set(1)
|
||||
EXHMigrations.upgrade(app, prefsStore, basePrefs, uiPrefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs, backupPrefs, trackManager)
|
||||
EXHMigrations.upgrade(app, prefsStore, basePrefs, uiPrefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs, backupPrefs, trackerManager)
|
||||
}
|
||||
|
||||
fun forceSetupJobs() {
|
||||
val lastVersionCode = prefsStore.getInt("eh_last_version_code", 0)
|
||||
lastVersionCode.set(0)
|
||||
EXHMigrations.upgrade(app, prefsStore, basePrefs, uiPrefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs, backupPrefs, trackManager)
|
||||
EXHMigrations.upgrade(app, prefsStore, basePrefs, uiPrefs, networkPrefs, sourcePrefs, securityPrefs, libraryPrefs, readerPrefs, backupPrefs, trackerManager)
|
||||
}
|
||||
|
||||
fun resetAgedFlagInEXHManga() {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package exh.md.handlers
|
||||
|
||||
import eu.kanade.tachiyomi.data.database.models.Track
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.data.track.TrackerManager
|
||||
import eu.kanade.tachiyomi.source.model.MetadataMangasPage
|
||||
import eu.kanade.tachiyomi.source.model.SManga
|
||||
import exh.md.dto.MangaDataDto
|
||||
@@ -153,7 +153,7 @@ class FollowsHandler(
|
||||
service.mangasRating(mangaId).ratings.asMdMap<PersonalRatingDto>()[mangaId]
|
||||
}
|
||||
val (followStatus, rating) = followStatusDef.await() to ratingDef.await()
|
||||
Track.create(TrackManager.MDLIST).apply {
|
||||
Track.create(TrackerManager.MDLIST).apply {
|
||||
title = ""
|
||||
status = followStatus.int
|
||||
tracking_url = url
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package exh.recs
|
||||
|
||||
import eu.kanade.tachiyomi.data.track.TrackManager
|
||||
import eu.kanade.tachiyomi.data.track.TrackerManager
|
||||
import eu.kanade.tachiyomi.network.GET
|
||||
import eu.kanade.tachiyomi.network.NetworkHelper
|
||||
import eu.kanade.tachiyomi.network.POST
|
||||
@@ -268,6 +268,7 @@ open class RecommendsPagingSource(
|
||||
private val smart: Boolean = true,
|
||||
private var preferredApi: API = API.MYANIMELIST,
|
||||
) : SourcePagingSource(source) {
|
||||
val trackerManager: TrackerManager by injectLazy()
|
||||
val getTracks: GetTracks by injectLazy()
|
||||
|
||||
override suspend fun requestNextPage(currentPage: Int): MangasPage {
|
||||
@@ -280,8 +281,8 @@ open class RecommendsPagingSource(
|
||||
val recs = apiList.firstNotNullOfOrNull { (key, api) ->
|
||||
try {
|
||||
val id = when (key) {
|
||||
API.MYANIMELIST -> tracks.find { it.syncId == TrackManager.MYANIMELIST }?.remoteId
|
||||
API.ANILIST -> tracks.find { it.syncId == TrackManager.ANILIST }?.remoteId
|
||||
API.MYANIMELIST -> tracks.find { it.syncId == trackerManager.myAnimeList.id }?.remoteId
|
||||
API.ANILIST -> tracks.find { it.syncId == trackerManager.aniList.id }?.remoteId
|
||||
}
|
||||
|
||||
val recs = if (id != null) {
|
||||
|
||||
Reference in New Issue
Block a user