Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 @@ -9,6 +9,7 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers
import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.api.VideoType
import org.jellyfin.sdk.model.api.request.GetAlbumArtistsRequest
import org.jellyfin.sdk.model.api.request.GetArtistsRequest
import org.jellyfin.sdk.model.api.request.GetItemsRequest
import org.jellyfin.sdk.model.api.request.GetPersonsRequest
Expand Down Expand Up @@ -155,6 +156,22 @@ data class GetItemsFilter(
},
)

fun applyTo(req: GetAlbumArtistsRequest) =
req.copy(
minCommunityRating = minCommunityRating,
isFavorite = favorite,
genreIds = genres,
personIds = persons,
studioIds = studios,
tags = tags,
officialRatings = officialRatings,
years =
buildSet {
years?.letNotEmpty(::addAll)
decades?.forEach { addAll(it..<(it + 10)) }
},
)

/**
* Merge another [GetItemsFilter] onto this one, replacing only unset values
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ import com.github.damontecres.wholphin.util.ApiRequestPager
import com.github.damontecres.wholphin.util.BlockingList
import com.github.damontecres.wholphin.util.DataLoadingState
import com.github.damontecres.wholphin.util.ExceptionHandler
import com.github.damontecres.wholphin.util.GetAlbumArtistsHandler
import com.github.damontecres.wholphin.util.GetArtistsHandler
import com.github.damontecres.wholphin.util.GetItemsRequestHandler
import com.github.damontecres.wholphin.util.GetPersonsHandler
Expand Down Expand Up @@ -96,6 +97,7 @@ import org.jellyfin.sdk.model.api.CollectionType
import org.jellyfin.sdk.model.api.ImageType
import org.jellyfin.sdk.model.api.ItemSortBy
import org.jellyfin.sdk.model.api.SortOrder
import org.jellyfin.sdk.model.api.request.GetAlbumArtistsRequest
import org.jellyfin.sdk.model.api.request.GetArtistsRequest
import org.jellyfin.sdk.model.api.request.GetItemsRequest
import org.jellyfin.sdk.model.api.request.GetPersonsRequest
Expand Down Expand Up @@ -147,6 +149,9 @@ class CollectionFolderViewModel
private val _state = MutableStateFlow(CollectionFolderState(viewOptions = defaultViewOptions))
val state: StateFlow<CollectionFolderState> = _state

private val artistSource: ArtistSource
get() = state.value.viewOptions.artistSource

var position: Int
get() = savedStateHandle.get<Int>("position") ?: 0
set(value) {
Expand Down Expand Up @@ -287,7 +292,17 @@ class CollectionFolderViewModel

override fun saveViewOptions(viewOptions: ViewOptions) {
position = 0
val artistSourceChanged = viewOptions.artistSource != artistSource
_state.update { it.copy(viewOptions = viewOptions) }
if (artistSourceChanged && state.value.filter.override == GetItemsFilterOverride.ARTIST) {
loadResults(
true,
state.value.sortAndDirection,
recursive,
state.value.filter,
useSeriesForPrimary,
)
}
viewModelScope.launch(ExceptionHandler() + WholphinDispatchers.IO) {
saveLibraryDisplayInfo(viewOptions = viewOptions)
if (!viewOptions.showBackdrop) {
Expand Down Expand Up @@ -429,13 +444,27 @@ class CollectionFolderViewModel
}

GetItemsFilterOverride.ARTIST -> {
ApiRequestPager(
api,
createGetArtistsRequest(filter),
GetArtistsHandler,
viewModelScope,
useSeriesForPrimary = useSeriesForPrimary,
)
when (artistSource) {
ArtistSource.ARTIST -> {
ApiRequestPager(
api,
createGetArtistsRequest(filter),
GetArtistsHandler,
viewModelScope,
useSeriesForPrimary = useSeriesForPrimary,
)
}

ArtistSource.ALBUM_ARTIST -> {
ApiRequestPager(
api,
createGetAlbumArtistsRequest(filter),
GetAlbumArtistsHandler,
viewModelScope,
useSeriesForPrimary = useSeriesForPrimary,
)
}
}
}
}

Expand All @@ -454,6 +483,17 @@ class CollectionFolderViewModel
)
}

private fun createGetAlbumArtistsRequest(filter: GetItemsFilter): GetAlbumArtistsRequest {
val item = state.value.item.successValue
return filter.applyTo(
GetAlbumArtistsRequest(
parentId = item?.id,
enableImageTypes = listOf(ImageType.PRIMARY, ImageType.THUMB),
fields = SlimItemFields,
),
)
}

private fun createGetItemsRequest(
sortAndDirection: SortAndDirection,
recursive: Boolean,
Expand Down Expand Up @@ -525,18 +565,37 @@ class CollectionFolderViewModel
val filter = state.value.filter
when (filter.override) {
GetItemsFilterOverride.ARTIST -> {
GetArtistsHandler.countMatching(
api = api,
request =
createGetArtistsRequest(filter).copy(
enableImageTypes = null,
fields = null,
nameLessThan = letter.toString(),
limit = 0,
enableTotalRecordCount = true,
enableUserData = false,
),
)
when (artistSource) {
ArtistSource.ARTIST -> {
GetArtistsHandler.countMatching(
api = api,
request =
createGetArtistsRequest(filter).copy(
enableImageTypes = null,
fields = null,
nameLessThan = letter.toString(),
limit = 0,
enableTotalRecordCount = true,
enableUserData = false,
),
)
}

ArtistSource.ALBUM_ARTIST -> {
GetAlbumArtistsHandler.countMatching(
api = api,
request =
createGetAlbumArtistsRequest(filter).copy(
enableImageTypes = null,
fields = null,
nameLessThan = letter.toString(),
limit = 0,
enableTotalRecordCount = true,
enableUserData = false,
),
)
}
}
}

// GetPersonsRequest has no nameLessThan or startIndex, so /Persons cannot be
Expand Down Expand Up @@ -1077,6 +1136,7 @@ fun CollectionFolderViewContent(
ViewOptionsDialog(
viewOptions = state.viewOptions,
defaultViewOptions = defaultViewOptions,
showArtistSource = state.filter.override == GetItemsFilterOverride.ARTIST,
onDismissRequest = {
showViewOptions = false
viewActions.saveViewOptions(state.viewOptions)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ fun ViewOptionsDialog(
onDismissRequest: () -> Unit,
onViewOptionsChange: (ViewOptions) -> Unit,
defaultViewOptions: ViewOptions = ViewOptions(),
showArtistSource: Boolean = false,
) {
val focusRequester = remember { FocusRequester() }
LaunchedEffect(Unit) { focusRequester.tryRequestFocus() }
Expand All @@ -72,12 +73,12 @@ fun ViewOptionsDialog(
window.setDimAmount(0f)
}
val options =
remember(viewOptions.type) {
remember(viewOptions.type, showArtistSource) {
when (viewOptions.type) {
ViewOptionsType.GRID -> ViewOptions.GRID_OPTIONS
ViewOptionsType.LIST -> ViewOptions.LIST_OPTIONS
ViewOptionsType.DENSE_LIST -> ViewOptions.LIST_OPTIONS
}
}.filter { showArtistSource || it != ViewOptions.ViewOptionsArtistSource }
}
Column(
verticalArrangement = Arrangement.spacedBy(0.dp),
Expand Down Expand Up @@ -130,6 +131,12 @@ fun ViewOptionsDialog(
}
}

/** Which Jellyfin artists list backs the Music > Artists tab */
enum class ArtistSource {
ARTIST,
ALBUM_ARTIST,
}

/**
* Stores the customizable view changes from the user
*
Expand All @@ -146,6 +153,7 @@ data class ViewOptions(
val imageType: ViewOptionImageType = ViewOptionImageType.PRIMARY,
val showTitles: Boolean = true,
val type: ViewOptionsType = ViewOptionsType.GRID,
val artistSource: ArtistSource = ArtistSource.ARTIST,
) {
companion object {
val ViewOptionsColumns =
Expand Down Expand Up @@ -250,6 +258,17 @@ data class ViewOptions(
valueToIndex = { it.ordinal },
)

val ViewOptionsArtistSource =
AppChoicePreference<ViewOptions, ArtistSource>(
title = R.string.artist_source,
defaultValue = ArtistSource.ARTIST,
displayValues = R.array.artist_sources,
getter = { it.artistSource },
setter = { viewOptions, value -> viewOptions.copy(artistSource = value) },
indexToValue = { ArtistSource.entries[it] },
valueToIndex = { it.ordinal },
)

val ViewOptionsReset =
AppClickablePreference<ViewOptions>(
title = R.string.reset,
Expand All @@ -266,6 +285,7 @@ data class ViewOptions(
ViewOptionsColumns,
ViewOptionsSpacing,
ViewOptionsContentScale,
ViewOptionsArtistSource,
ViewOptionsReset,
)

Expand All @@ -275,6 +295,7 @@ data class ViewOptions(
ViewOptionsDetailHeader,
ViewOptionsBackdrop,
ViewOptionsSpacing,
ViewOptionsArtistSource,
ViewOptionsReset,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import org.jellyfin.sdk.api.client.extensions.tvShowsApi
import org.jellyfin.sdk.api.client.extensions.userLibraryApi
import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
import org.jellyfin.sdk.model.api.GetProgramsDto
import org.jellyfin.sdk.model.api.request.GetAlbumArtistsRequest
import org.jellyfin.sdk.model.api.request.GetArtistsRequest
import org.jellyfin.sdk.model.api.request.GetEpisodesRequest
import org.jellyfin.sdk.model.api.request.GetGenresRequest
Expand Down Expand Up @@ -401,6 +402,25 @@ object GetArtistsHandler : RequestHandler<GetArtistsRequest> {
): Response<BaseItemDtoQueryResult> = api.artistsApi.getArtists((request))
}

@Serializable
object GetAlbumArtistsHandler : RequestHandler<GetAlbumArtistsRequest> {
override fun prepare(
request: GetAlbumArtistsRequest,
startIndex: Int,
limit: Int,
enableTotalRecordCount: Boolean,
): GetAlbumArtistsRequest =
request.copy(
startIndex = startIndex,
limit = limit,
)

override suspend fun execute(
api: ApiClient,
request: GetAlbumArtistsRequest,
): Response<BaseItemDtoQueryResult> = api.artistsApi.getAlbumArtists(request)
}

val requestSerializersModule =
SerializersModule {
polymorphic(Any::class) {
Expand All @@ -417,5 +437,6 @@ val requestSerializersModule =
subclass(GetRecordingsRequest::class)
subclass(GetLiveTvChannelsRequest::class)
subclass(GetArtistsHandler::class)
subclass(GetAlbumArtistsHandler::class)
}
}
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,11 @@
<string name="creator">Creator</string>
<string name="artist">Artist</string>
<string name="album_artist">Album artist</string>
<string name="artist_source">Artist source</string>
<string-array name="artist_sources">
<item>@string/artist</item>
<item>@string/album_artist</item>
</string-array>
<string name="album">Album</string>
<string name="popular_songs">Popular songs</string>
<string name="play_next">Play next</string>
Expand Down
Loading
Loading