fix library update restriction naming

aniyomiorg · Jul 17, 2023 · aee3d2c · aee3d2c
1 parent 78822ad
commit aee3d2c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 44 deletions.
diff --git a/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt b/app/src/main/java/eu/kanade/domain/library/service/LibraryPreferences.kt
@@ -1,9 +1,9 @@
 package eu.kanade.domain.library.service
 
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import tachiyomi.core.preference.PreferenceStore
 import tachiyomi.core.preference.getEnum
 import tachiyomi.domain.entries.TriStateFilter
@@ -35,7 +35,7 @@ class LibraryPreferences(
 
  fun libraryUpdateDeviceRestriction() = preferenceStore.getStringSet("library_update_restriction", setOf(DEVICE_ONLY_ON_WIFI))
 
- fun libraryUpdateItemRestriction() = preferenceStore.getStringSet("library_update_manga_restriction", setOf(MANGA_HAS_UNREAD, MANGA_NON_COMPLETED, MANGA_NON_READ))
+ fun libraryUpdateItemRestriction() = preferenceStore.getStringSet("library_update_manga_restriction", setOf(ENTRY_HAS_UNVIEWED, ENTRY_NON_COMPLETED, ENTRY_NON_VIEWED))
 
  fun autoUpdateMetadata() = preferenceStore.getBoolean("auto_update_metadata", false)
 

diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt
@@ -43,9 +43,9 @@ import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW
 import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
 import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.ui.category.CategoriesTab
 import kotlinx.coroutines.launch
@@ -312,9 +312,9 @@ object SettingsLibraryScreen : SearchableSettings {
  pref = libraryUpdateMangaRestrictionPref,
  title = stringResource(R.string.pref_library_update_manga_restriction),
  entries = mapOf(
- MANGA_HAS_UNREAD to stringResource(R.string.pref_update_only_completely_read),
- MANGA_NON_READ to stringResource(R.string.pref_update_only_started),
- MANGA_NON_COMPLETED to stringResource(R.string.pref_update_only_non_completed),
+ ENTRY_HAS_UNVIEWED to stringResource(R.string.pref_update_only_completely_read),
+ ENTRY_NON_VIEWED to stringResource(R.string.pref_update_only_started),
+ ENTRY_NON_COMPLETED to stringResource(R.string.pref_update_only_non_completed),
  ),
  ),
  Preference.PreferenceItem.TextPreference(

diff --git a/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt b/app/src/main/java/eu/kanade/tachiyomi/Migrations.kt
@@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.core.security.SecurityPreferences
 import eu.kanade.tachiyomi.data.backup.BackupCreatorJob
 import eu.kanade.tachiyomi.data.library.anime.AnimeLibraryUpdateJob
 import eu.kanade.tachiyomi.data.library.manga.MangaLibraryUpdateJob
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
 import eu.kanade.tachiyomi.data.preference.PreferenceValues
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.network.NetworkPreferences
@@ -274,7 +274,7 @@ object Migrations {
  if (oldVersion < 72) {
  val oldUpdateOngoingOnly = prefs.getBoolean("pref_update_only_non_completed_key", true)
  if (!oldUpdateOngoingOnly) {
- libraryPreferences.libraryUpdateItemRestriction() -= MANGA_NON_COMPLETED
+ libraryPreferences.libraryUpdateItemRestriction() -= ENTRY_NON_COMPLETED
  }
  }
  if (oldVersion < 75) {

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/anime/AnimeLibraryUpdateJob.kt
@@ -29,13 +29,13 @@ import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.data.cache.AnimeCoverCache
 import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager
 import eu.kanade.tachiyomi.data.notification.Notifications
-import eu.kanade.tachiyomi.data.preference.ANIME_HAS_UNSEEN
-import eu.kanade.tachiyomi.data.preference.ANIME_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.ANIME_NON_SEEN
 import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW
 import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
 import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import eu.kanade.tachiyomi.data.track.EnhancedAnimeTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -251,13 +251,13 @@ class AnimeLibraryUpdateJob(private val context: Context, workerParams: WorkerPa
  anime,
  ) {
  when {
- ANIME_NON_COMPLETED in restrictions && anime.status.toInt() == SAnime.COMPLETED ->
+ ENTRY_NON_COMPLETED in restrictions && anime.status.toInt() == SAnime.COMPLETED ->
  skippedUpdates.add(anime to context.getString(R.string.skipped_reason_completed))
 
- ANIME_HAS_UNSEEN in restrictions && libraryAnime.unseenCount != 0L ->
+ ENTRY_HAS_UNVIEWED in restrictions && libraryAnime.unseenCount != 0L ->
  skippedUpdates.add(anime to context.getString(R.string.skipped_reason_not_caught_up))
 
- ANIME_NON_SEEN in restrictions && libraryAnime.totalEpisodes > 0L && !libraryAnime.hasStarted ->
+ ENTRY_NON_VIEWED in restrictions && libraryAnime.totalEpisodes > 0L && !libraryAnime.hasStarted ->
  skippedUpdates.add(anime to context.getString(R.string.skipped_reason_not_started))
 
  anime.updateStrategy != UpdateStrategy.ALWAYS_UPDATE ->
@@ -282,7 +282,7 @@ class AnimeLibraryUpdateJob(private val context: Context, workerParams: WorkerPa
  }
  } catch (e: Throwable) {
  val errorMessage = when (e) {
- is NoEpisodesException -> context.getString(R.string.no_chapters_error)
+ is NoEpisodesException -> context.getString(R.string.no_episodes_error)
  // failedUpdates will already have the source, don't need to copy it into the message
  is AnimeSourceManager.AnimeSourceNotInstalledException -> context.getString(R.string.loader_not_implemented_error)
  else -> e.message

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/manga/MangaLibraryUpdateJob.kt
@@ -32,9 +32,9 @@ import eu.kanade.tachiyomi.data.preference.DEVICE_BATTERY_NOT_LOW
 import eu.kanade.tachiyomi.data.preference.DEVICE_CHARGING
 import eu.kanade.tachiyomi.data.preference.DEVICE_NETWORK_NOT_METERED
 import eu.kanade.tachiyomi.data.preference.DEVICE_ONLY_ON_WIFI
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import eu.kanade.tachiyomi.data.track.EnhancedMangaTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.data.track.TrackService
@@ -251,13 +251,13 @@ class MangaLibraryUpdateJob(private val context: Context, workerParams: WorkerPa
  manga,
  ) {
  when {
- MANGA_NON_COMPLETED in restrictions && manga.status.toInt() == SManga.COMPLETED ->
+ ENTRY_NON_COMPLETED in restrictions && manga.status.toInt() == SManga.COMPLETED ->
  skippedUpdates.add(manga to context.getString(R.string.skipped_reason_completed))
 
- MANGA_HAS_UNREAD in restrictions && libraryManga.unreadCount != 0L ->
+ ENTRY_HAS_UNVIEWED in restrictions && libraryManga.unreadCount != 0L ->
  skippedUpdates.add(manga to context.getString(R.string.skipped_reason_not_caught_up))
 
- MANGA_NON_READ in restrictions && libraryManga.totalChapters > 0L && !libraryManga.hasStarted ->
+ ENTRY_NON_VIEWED in restrictions && libraryManga.totalChapters > 0L && !libraryManga.hasStarted ->
  skippedUpdates.add(manga to context.getString(R.string.skipped_reason_not_started))
 
  manga.updateStrategy != UpdateStrategy.ALWAYS_UPDATE ->

diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt
@@ -7,13 +7,10 @@ const val DEVICE_NETWORK_NOT_METERED = "network_not_metered"
 const val DEVICE_CHARGING = "ac"
 const val DEVICE_BATTERY_NOT_LOW = "battery_not_low"
 
-const val MANGA_NON_COMPLETED = "manga_ongoing"
-const val MANGA_HAS_UNREAD = "manga_fully_read"
-const val MANGA_NON_READ = "manga_started"
-
-const val ANIME_NON_COMPLETED = "anime_ongoing"
-const val ANIME_HAS_UNSEEN = "anime_fully_seen"
-const val ANIME_NON_SEEN = "anime_started"
+// Not to be touched
+const val ENTRY_NON_COMPLETED = "manga_ongoing"
+const val ENTRY_HAS_UNVIEWED = "manga_fully_read"
+const val ENTRY_NON_VIEWED = "manga_started"
 
 const val FLAG_CATEGORIES = "1"
 const val FLAG_CHAPTERS = "2"

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/anime/AnimeStatsScreenModel.kt
@@ -13,9 +13,9 @@ import eu.kanade.presentation.more.stats.StatsScreenState
 import eu.kanade.presentation.more.stats.data.StatsData
 import eu.kanade.tachiyomi.animesource.model.SAnime
 import eu.kanade.tachiyomi.data.download.anime.AnimeDownloadManager
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import eu.kanade.tachiyomi.data.track.AnimeTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import kotlinx.coroutines.flow.update
@@ -109,9 +109,9 @@ class AnimeStatsScreenModel(
  .fastFilterNot { it.anime.id in excludedMangaIds }
  .fastDistinctBy { it.anime.id }
  .fastCountNot {
- (MANGA_NON_COMPLETED in updateRestrictions && it.anime.status.toInt() == SAnime.COMPLETED) ||
- (MANGA_HAS_UNREAD in updateRestrictions && it.unseenCount != 0L) ||
- (MANGA_NON_READ in updateRestrictions && it.totalEpisodes > 0 && !it.hasStarted)
+ (ENTRY_NON_COMPLETED in updateRestrictions && it.anime.status.toInt() == SAnime.COMPLETED) ||
+ (ENTRY_HAS_UNVIEWED in updateRestrictions && it.unseenCount != 0L) ||
+ (ENTRY_NON_VIEWED in updateRestrictions && it.totalEpisodes > 0 && !it.hasStarted)
  }
  }
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/stats/manga/MangaStatsScreenModel.kt
@@ -12,9 +12,9 @@ import eu.kanade.domain.library.service.LibraryPreferences
 import eu.kanade.presentation.more.stats.StatsScreenState
 import eu.kanade.presentation.more.stats.data.StatsData
 import eu.kanade.tachiyomi.data.download.manga.MangaDownloadManager
-import eu.kanade.tachiyomi.data.preference.MANGA_HAS_UNREAD
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_COMPLETED
-import eu.kanade.tachiyomi.data.preference.MANGA_NON_READ
+import eu.kanade.tachiyomi.data.preference.ENTRY_HAS_UNVIEWED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_COMPLETED
+import eu.kanade.tachiyomi.data.preference.ENTRY_NON_VIEWED
 import eu.kanade.tachiyomi.data.track.MangaTrackService
 import eu.kanade.tachiyomi.data.track.TrackManager
 import eu.kanade.tachiyomi.source.model.SManga
@@ -109,9 +109,9 @@ class MangaStatsScreenModel(
  .fastFilterNot { it.manga.id in excludedMangaIds }
  .fastDistinctBy { it.manga.id }
  .fastCountNot {
- (MANGA_NON_COMPLETED in updateRestrictions && it.manga.status.toInt() == SManga.COMPLETED) ||
- (MANGA_HAS_UNREAD in updateRestrictions && it.unreadCount != 0L) ||
- (MANGA_NON_READ in updateRestrictions && it.totalChapters > 0 && !it.hasStarted)
+ (ENTRY_NON_COMPLETED in updateRestrictions && it.manga.status.toInt() == SManga.COMPLETED) ||
+ (ENTRY_HAS_UNVIEWED in updateRestrictions && it.unreadCount != 0L) ||
+ (ENTRY_NON_VIEWED in updateRestrictions && it.totalChapters > 0 && !it.hasStarted)
  }
  }