Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import kotlinx.coroutines.withContext
import kotlinx.serialization.Serializable
import org.jellyfin.sdk.Jellyfin
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.quickConnectApi
import org.jellyfin.sdk.api.client.extensions.authenticationApi
import org.jellyfin.sdk.api.client.extensions.systemApi
import org.jellyfin.sdk.api.client.extensions.userApi
import org.jellyfin.sdk.model.api.AuthenticationResult
Expand Down Expand Up @@ -322,7 +322,7 @@ class ServerRepository
Timber.e("No user logged in for Quick Connect authorization")
throw IllegalStateException("Must be logged in to authorize Quick Connect")
}
val response = apiClient.quickConnectApi.authorizeQuickConnect(code, userId)
val response = apiClient.authenticationApi.authorizeQuickConnect(code, userId)
response.content
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import kotlinx.coroutines.async
import kotlinx.coroutines.withContext
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.exception.InvalidStatusException
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.request.GetEpisodesRequest
import timber.log.Timber
Expand Down Expand Up @@ -121,7 +121,7 @@ class DatePlayedService
*/
suspend fun invalidate(itemId: UUID) {
val seriesId =
api.userLibraryApi.getItem(itemId = itemId).content.let {
api.libraryApi.getItem(itemId = itemId).content.let {
if (it.type == BaseItemKind.SERIES) {
itemId
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.displayPreferencesApi
import org.jellyfin.sdk.api.client.extensions.displayPreferenceApi
import org.jellyfin.sdk.model.UUID
import javax.inject.Inject
import javax.inject.Singleton
Expand All @@ -24,7 +24,7 @@ class DisplayPreferencesService
userId: UUID,
displayPreferencesId: String = DEFAULT_DISPLAY_PREF_ID,
client: String = DEFAULT_CLIENT,
) = api.displayPreferencesApi
) = api.displayPreferenceApi
.getDisplayPreferences(
userId = userId,
displayPreferencesId = displayPreferencesId,
Expand All @@ -43,7 +43,7 @@ class DisplayPreferencesService
current.customPrefs.toMutableMap().apply {
block.invoke(this)
}
api.displayPreferencesApi.updateDisplayPreferences(
api.displayPreferenceApi.updateDisplayPreferences(
displayPreferencesId = displayPreferencesId,
userId = userId,
client = client,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import com.github.damontecres.wholphin.data.stringRes
import com.github.damontecres.wholphin.ui.isNotNullOrBlank
import dagger.hilt.android.qualifiers.ApplicationContext
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.model.api.ExtraType
import org.jellyfin.sdk.model.api.ImageType
import java.util.UUID
Expand All @@ -34,7 +34,7 @@ class ExtrasService
*/
suspend fun getExtras(itemId: UUID): List<ExtrasItem> {
val extrasMap =
api.userLibraryApi
api.libraryApi
.getSpecialFeatures(itemId)
.content
.filterNot {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package com.github.damontecres.wholphin.services

import com.github.damontecres.wholphin.data.model.BaseItem
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.playStateApi
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.api.client.extensions.userDataApi
import org.jellyfin.sdk.model.api.UserItemDataDto
import java.util.UUID
import javax.inject.Inject
Expand All @@ -25,9 +24,9 @@ class FavoriteWatchManager
): UserItemDataDto {
datePlayedService.invalidate(itemId)
return if (played) {
api.playStateApi.markPlayedItem(itemId).content
api.userDataApi.markPlayedItem(itemId).content
} else {
api.playStateApi.markUnplayedItem(itemId).content
api.userDataApi.markUnplayedItem(itemId).content
}
}

Expand All @@ -36,9 +35,9 @@ class FavoriteWatchManager
favorite: Boolean,
): UserItemDataDto =
if (favorite) {
api.userLibraryApi.markFavoriteItem(itemId).content
api.userDataApi.markFavoriteItem(itemId).content
} else {
api.userLibraryApi.unmarkFavoriteItem(itemId).content
api.userDataApi.unmarkFavoriteItem(itemId).content
}

suspend fun removeContinueWatching(item: BaseItem) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.firstOrNull
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.filterApi
import org.jellyfin.sdk.api.client.extensions.genresApi
import org.jellyfin.sdk.api.client.extensions.genreApi
import org.jellyfin.sdk.api.client.extensions.localizationApi
import org.jellyfin.sdk.api.client.extensions.studiosApi
import org.jellyfin.sdk.api.client.extensions.yearsApi
import org.jellyfin.sdk.api.client.extensions.studioApi
import org.jellyfin.sdk.api.client.extensions.yearApi
import org.jellyfin.sdk.model.UUID
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ItemSortBy
Expand Down Expand Up @@ -96,7 +96,7 @@ class FilterOptionCache
filterOption: FilterBy<*, *>,
) = when (filterOption) {
GenreFilter -> {
api.genresApi
api.genreApi
.getGenres(
parentId = parentId,
userId = userId,
Expand All @@ -105,7 +105,7 @@ class FilterOptionCache
}

StudioFilter -> {
api.studiosApi
api.studioApi
.getStudios(
parentId = parentId,
userId = userId,
Expand Down Expand Up @@ -150,7 +150,7 @@ class FilterOptionCache
}

YearFilter -> {
api.yearsApi
api.yearApi
.getYears(
parentId = parentId,
userId = userId,
Expand All @@ -164,7 +164,7 @@ class FilterOptionCache

DecadeFilter -> {
val items = TreeSet<Int>()
api.yearsApi
api.yearApi
.getYears(
parentId = parentId,
userId = userId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import okhttp3.OkHttpClient
import okhttp3.Request
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.exception.InvalidStatusException
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.api.client.extensions.liveTvApi
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.model.DateTime
import org.jellyfin.sdk.model.api.BaseItemDto
import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
Expand Down Expand Up @@ -279,7 +279,7 @@ class HomeDataService
isPlayed = null, // Server will handle user's preference
)
val latest =
api.userLibraryApi
api.libraryApi
.getLatestMedia(request)
.content
.map { BaseItem(it, row.viewOptions.useSeries) }
Expand Down Expand Up @@ -387,7 +387,7 @@ class HomeDataService

// Not using getItemName because we want to throw the 404
val title =
api.userLibraryApi
api.libraryApi
.getItem(
userId = serverRepository.currentUser?.id,
itemId = row.parentId,
Expand Down Expand Up @@ -641,7 +641,7 @@ class HomeDataService

is HomeRowConfig.Suggestions -> {
val library =
api.userLibraryApi
api.libraryApi
.getItem(itemId = row.parentId)
.content
val title = ResArgStringProvider(R.string.suggestions_for, library.name ?: "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonObject
import kotlinx.serialization.json.jsonPrimitive
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.api.client.extensions.userApi
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.model.UUID
import org.jellyfin.sdk.model.api.CollectionType
import timber.log.Timber
Expand Down Expand Up @@ -579,7 +579,7 @@ class HomeSettingsService
default: StringProvider = StringStringProvider(""),
): StringProvider =
try {
api.userLibraryApi
api.libraryApi
.getItem(
userId = serverRepository.currentUser?.id,
itemId = itemId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisodeIds
import com.github.damontecres.wholphin.ui.nav.Destination
import kotlinx.coroutines.flow.first
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.serializer.toUUIDOrNull
import timber.log.Timber
Expand Down Expand Up @@ -62,7 +62,7 @@ class IntentService
val item =
itemId?.let {
try {
api.userLibraryApi
api.libraryApi
.getItem(itemId)
.content
.let { BaseItem(it) }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers
import kotlinx.serialization.json.Json
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.itemsApi
import org.jellyfin.sdk.api.client.extensions.tvShowsApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import org.jellyfin.sdk.api.client.extensions.showApi
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ItemSortBy
import org.jellyfin.sdk.model.api.MediaType
Expand Down Expand Up @@ -65,7 +65,7 @@ class LatestNextUpService
enableTotalRecordCount = false,
)
val items =
api.itemsApi
api.libraryApi
.getResumeItems(request)
.content
.items
Expand Down Expand Up @@ -100,7 +100,7 @@ class LatestNextUpService
enableTotalRecordCount = false,
)
val nextUp =
api.tvShowsApi
api.showApi
.getNextUp(request)
.content
.items
Expand Down Expand Up @@ -227,7 +227,7 @@ class LatestNextUpService
var changed = false
removed.forEach { (seriesId, timestamp) ->
val item =
api.itemsApi
api.libraryApi
.getItems(
userId = userId,
parentId = seriesId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import kotlinx.coroutines.withContext
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.audioApi
import org.jellyfin.sdk.api.client.extensions.instantMixApi
import org.jellyfin.sdk.api.client.extensions.universalAudioApi
import org.jellyfin.sdk.api.sockets.subscribe
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.ImageType
Expand Down Expand Up @@ -311,7 +311,7 @@ class MusicService
} == true
val url =
if (needsAc3Transcode) {
api.universalAudioApi.getUniversalAudioStreamUrl(
api.audioApi.getUniversalAudioStreamUrl(
itemId = audio.id,
container = listOf("mka"),
transcodingContainer = "mka",
Expand All @@ -320,7 +320,7 @@ class MusicService
audioCodec = Codec.Audio.AC3,
)
} else {
api.universalAudioApi.getUniversalAudioStreamUrl(
api.audioApi.getUniversalAudioStreamUrl(
itemId = audio.id,
container = audioFormats,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import kotlinx.coroutines.withContext
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.exception.InvalidStatusException
import org.jellyfin.sdk.api.client.extensions.liveTvApi
import org.jellyfin.sdk.api.client.extensions.userViewsApi
import org.jellyfin.sdk.api.client.extensions.userViewApi
import org.jellyfin.sdk.model.api.CollectionType
import org.jellyfin.sdk.model.api.UserDto
import timber.log.Timber
Expand Down Expand Up @@ -130,7 +130,7 @@ class NavDrawerService
tvAccess: Boolean,
): List<Library> {
val userViews =
api.userViewsApi
api.userViewApi
.getUserViews(userId = userId)
.content.items
val recordingFolders =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.github.damontecres.wholphin.data.model.Person
import com.github.damontecres.wholphin.ui.letNotEmpty
import dagger.hilt.android.qualifiers.ApplicationContext
import org.jellyfin.sdk.api.client.ApiClient
import org.jellyfin.sdk.api.client.extensions.itemsApi
import org.jellyfin.sdk.api.client.extensions.libraryApi
import javax.inject.Inject
import javax.inject.Singleton

Expand All @@ -25,7 +25,7 @@ class PeopleFavorites
val favorites =
chunks
.map {
api.itemsApi
api.libraryApi
.getItems(ids = it)
.content.items
}.flatten()
Expand Down
Loading
Loading