Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa35eff2 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-22.2' into a15

parents 719a6de2 77df6b0d

app/src/main/java/org/lineageos/twelve/datasources/JellyfinDataSource.kt

+9 −0
Original line number Diff line number Diff line
@@ -141,6 +141,15 @@ class JellyfinDataSource( 
            .setGenreName(genres?.firstOrNull())

            .setYear(productionYear)

            .setIsFavorite(isFavorite == true)

            .apply {

                albumId?.let { albumId ->

                    setThumbnail(

                        Thumbnail.Builder()

                            .setUri(client.getAlbumThumbnail(albumId).toUri())

                            .build()

                    )

                }

            }

            .build()



        fun Item.toMediaItemGenre() = Genre.Builder(getGenreUri(id.toString()))

app/src/main/java/org/lineageos/twelve/datasources/jellyfin/JellyfinClient.kt

+5 −0
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ class JellyfinClient( 
            "Images",

            "Primary",

        ),

        queryParameters = listOf(

            "fillHeight" to "512",

            "fillWidth" to "512",

            "quality" to "96",

        )

    )



    private fun getSortParameter(sortingRule: SortingRule) = buildList {

app/src/main/java/org/lineageos/twelve/datasources/jellyfin/models/Item.kt

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ data class Item( 
    @SerialName("Id") val id: UUID,

    @SerialName("Name") val name: String? = null,

    @SerialName("Artists") val artists: List<String>? = null,

    @SerialName("AlbumId") val albumId: UUID? = null,

    @SerialName("ProductionYear") val productionYear: Int? = null,

    @SerialName("Container") val container: String? = null,

    @SerialName("SourceType") val sourceType: String? = null,