Centralize requested item fields

jellyfin · Dec 28, 2024 · 832ab68 · 832ab68
1 parent 7e6f88e
commit 832ab68
Show file tree

Hide file tree

Showing 18 changed files with 103 additions and 334 deletions.
diff --git a/app/src/main/java/org/jellyfin/androidtv/data/repository/ItemRepository.kt b/app/src/main/java/org/jellyfin/androidtv/data/repository/ItemRepository.kt
@@ -0,0 +1,26 @@
+package org.jellyfin.androidtv.data.repository
+
+import org.jellyfin.sdk.model.api.ItemFields
+
+object ItemRepository {
+	val itemFields = setOf(
+		ItemFields.CAN_DELETE,
+		ItemFields.CHANNEL_INFO,
+		ItemFields.CHAPTERS,
+		ItemFields.CHILD_COUNT,
+		ItemFields.CUMULATIVE_RUN_TIME_TICKS,
+		ItemFields.DATE_CREATED,
+		ItemFields.DISPLAY_PREFERENCES_ID,
+		ItemFields.GENRES,
+		ItemFields.ITEM_COUNTS,
+		ItemFields.MEDIA_SOURCE_COUNT,
+		ItemFields.MEDIA_SOURCES,
+		ItemFields.MEDIA_STREAMS,
+		ItemFields.OVERVIEW,
+		ItemFields.PATH,
+		ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
+		ItemFields.SERIES_PRIMARY_IMAGE,
+		ItemFields.TAGLINES,
+		ItemFields.TRICKPLAY,
+	)
+}
diff --git a/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt b/app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt
@@ -21,6 +21,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.androidtv.data.repository.UserViewsRepository
 import org.jellyfin.androidtv.integration.provider.ImageProvider
 import org.jellyfin.androidtv.preference.UserPreferences
@@ -41,7 +42,6 @@ import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemKind
 import org.jellyfin.sdk.model.api.ImageFormat
 import org.jellyfin.sdk.model.api.ImageType
-import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.MediaType
 import org.jellyfin.sdk.model.extensions.ticks
 import org.koin.core.component.KoinComponent
@@ -270,7 +270,7 @@ class LeanbackChannelWorker(
 		withContext(Dispatchers.IO) {
 			val resume = async {
 				api.itemsApi.getResumeItems(
-					fields = listOf(ItemFields.DATE_CREATED),
+					fields = ItemRepository.itemFields,
 					imageTypeLimit = 1,
 					limit = 10,
 					mediaTypes = listOf(MediaType.VIDEO),
@@ -284,7 +284,7 @@ class LeanbackChannelWorker(
 					imageTypeLimit = 1,
 					limit = 10,
 					enableResumable = false,
-					fields = listOf(ItemFields.DATE_CREATED),
+					fields = ItemRepository.itemFields,
 				).content.items
 			}
 
@@ -296,9 +296,7 @@ class LeanbackChannelWorker(
 		withContext(Dispatchers.IO) {
 			val latestEpisodes = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = listOf(
-						ItemFields.OVERVIEW,
-					),
+					fields = ItemRepository.itemFields,
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.EPISODE),
 					isPlayed = false
@@ -307,9 +305,7 @@ class LeanbackChannelWorker(
 
 			val latestMovies = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = listOf(
-						ItemFields.OVERVIEW,
-					),
+					fields = ItemRepository.itemFields,
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.MOVIE),
 					isPlayed = false
@@ -318,9 +314,7 @@ class LeanbackChannelWorker(
 
 			val latestMedia = async {
 				api.userLibraryApi.getLatestMedia(
-					fields = listOf(
-						ItemFields.OVERVIEW,
-					),
+					fields = ItemRepository.itemFields,
 					limit = 50,
 					includeItemTypes = listOf(BaseItemKind.MOVIE, BaseItemKind.SERIES),
 					isPlayed = false

diff --git a/app/src/main/java/org/jellyfin/androidtv/integration/MediaContentProvider.kt b/app/src/main/java/org/jellyfin/androidtv/integration/MediaContentProvider.kt
@@ -12,6 +12,7 @@ import android.provider.BaseColumns
 import kotlinx.coroutines.runBlocking
 import org.jellyfin.androidtv.BuildConfig
 import org.jellyfin.androidtv.R
+import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.androidtv.integration.provider.ImageProvider
 import org.jellyfin.androidtv.util.ImageHelper
 import org.jellyfin.androidtv.util.sdk.isUsable
@@ -21,7 +22,6 @@ import org.jellyfin.sdk.api.client.extensions.imageApi
 import org.jellyfin.sdk.api.client.extensions.itemsApi
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.ImageType
-import org.jellyfin.sdk.model.api.ItemFields
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
@@ -75,7 +75,7 @@ class MediaContentProvider : ContentProvider(), KoinComponent {
 			searchTerm = query,
 			recursive = true,
 			limit = limit,
-			fields = setOf(ItemFields.TAGLINES)
+			fields = ItemRepository.itemFields
 		)
 
 		items

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/ItemListViewHelper.kt b/app/src/main/java/org/jellyfin/androidtv/ui/ItemListViewHelper.kt
@@ -3,9 +3,9 @@ package org.jellyfin.androidtv.ui
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
+import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.itemsApi
-import org.jellyfin.sdk.model.api.ItemFields
 import org.koin.java.KoinJavaComponent
 
 fun ItemListView.refresh() {
@@ -14,14 +14,7 @@ fun ItemListView.refresh() {
 	findViewTreeLifecycleOwner()?.lifecycleScope?.launch {
 		val response by api.itemsApi.getItems(
 			ids = mItemIds,
-			fields = setOf(
-				ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-				ItemFields.OVERVIEW,
-				ItemFields.ITEM_COUNTS,
-				ItemFields.DISPLAY_PREFERENCES_ID,
-				ItemFields.CHILD_COUNT,
-				ItemFields.MEDIA_SOURCES,
-			)
+			fields = ItemRepository.itemFields
 		)
 
 		response.items?.forEachIndexed { index, item ->

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseViewFragmentHelper.kt b/app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseViewFragmentHelper.kt
@@ -2,12 +2,12 @@ package org.jellyfin.androidtv.ui.browsing
 
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
+import org.jellyfin.androidtv.data.repository.ItemRepository
 import org.jellyfin.sdk.api.client.ApiClient
 import org.jellyfin.sdk.api.client.extensions.liveTvApi
 import org.jellyfin.sdk.model.api.BaseItemDto
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.BaseItemKind
-import org.jellyfin.sdk.model.api.ItemFields
 import org.jellyfin.sdk.model.api.LocationType
 import org.jellyfin.sdk.model.api.MediaType
 import org.jellyfin.sdk.model.api.TimerInfoDto
@@ -24,11 +24,7 @@ fun EnhancedBrowseFragment.getLiveTvRecordingsAndTimers(
 	lifecycleScope.launch {
 		runCatching {
 			val recordings by api.liveTvApi.getRecordings(
-				fields = setOf(
-					ItemFields.OVERVIEW,
-					ItemFields.PRIMARY_IMAGE_ASPECT_RATIO,
-					ItemFields.CHILD_COUNT,
-				),
+				fields = ItemRepository.itemFields,
 				enableImages = true,
 				limit = 40,
 			)