justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 23:51:21 +02:00
Code Issues Projects Packages Wiki Activity Actions

Fix uuid serialization

Browse source
This commit is contained in:
Damontecres 2025-10-18 19:56:15 -04:00
parent dc3193e2dc
commit 5bb46bf34b
No known key found for this signature in database
6 changed files with 18 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/github/damontecres/wholphin/data/model/GetItemsFilter.kt
View file

@ -1,11 +1,11 @@
@file:UseSerializers(UuidSerializer::class) @file:UseSerializers(UUIDSerializer::class)
package com.github.damontecres.wholphin.data.model package com.github.damontecres.wholphin.data.model
import com.github.damontecres.wholphin.util.UuidSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers import kotlinx.serialization.UseSerializers
import org.jellyfin.sdk.model.api.request.GetItemsRequest import org.jellyfin.sdk.model.api.request.GetItemsRequest
import org.jellyfin.sdk.model.serializer.UUIDSerializer
import java.util.UUID import java.util.UUID
@Serializable @Serializable

4
app/src/main/java/com/github/damontecres/wholphin/data/model/ItemPlayback.kt
View file

@ -1,4 +1,4 @@
@file:UseSerializers(UuidSerializer::class) @file:UseSerializers(UUIDSerializer::class)
package com.github.damontecres.wholphin.data.model package com.github.damontecres.wholphin.data.model
@ -10,7 +10,6 @@ import com.github.damontecres.wholphin.data.JellyfinUser
import com.github.damontecres.wholphin.preferences.UserPreferences import com.github.damontecres.wholphin.preferences.UserPreferences
import com.github.damontecres.wholphin.ui.isNotNullOrBlank import com.github.damontecres.wholphin.ui.isNotNullOrBlank
import com.github.damontecres.wholphin.ui.letNotEmpty import com.github.damontecres.wholphin.ui.letNotEmpty
import com.github.damontecres.wholphin.util.UuidSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.UseSerializers import kotlinx.serialization.UseSerializers
import org.jellyfin.sdk.model.api.BaseItemDto import org.jellyfin.sdk.model.api.BaseItemDto
@ -18,6 +17,7 @@ import org.jellyfin.sdk.model.api.MediaSourceInfo
import org.jellyfin.sdk.model.api.MediaStream import org.jellyfin.sdk.model.api.MediaStream
import org.jellyfin.sdk.model.api.MediaStreamType import org.jellyfin.sdk.model.api.MediaStreamType
import org.jellyfin.sdk.model.api.SubtitlePlaybackMode import org.jellyfin.sdk.model.api.SubtitlePlaybackMode
import org.jellyfin.sdk.model.serializer.UUIDSerializer
import org.jellyfin.sdk.model.serializer.toUUIDOrNull import org.jellyfin.sdk.model.serializer.toUUIDOrNull
import java.util.UUID import java.util.UUID

6
app/src/main/java/com/github/damontecres/wholphin/ui/detail/ItemViewModel.kt
View file

@ -82,8 +82,10 @@ abstract class LoadingItemViewModel(
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e, "Failed to load item $itemId") Timber.e(e, "Failed to load item $itemId")
item.value = null withContext(Dispatchers.Main) {
loading.value = LoadingState.Error("Error loading item $itemId", e) item.value = null
loading.value = LoadingState.Error("Error loading item $itemId", e)
}
} }
} }
} }

14
app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt
View file

@ -104,12 +104,14 @@ class MovieViewModel
chosenStreams.value = result chosenStreams.value = result
} }
} }
people.value = withContext(Dispatchers.Main) {
item.data.people people.value =
?.letNotEmpty { people -> item.data.people
people.map { Person.fromDto(it, api) } ?.letNotEmpty { people ->
}.orEmpty() people.map { Person.fromDto(it, api) }
chapters.value = Chapter.fromDto(item.data, api) }.orEmpty()
chapters.value = Chapter.fromDto(item.data, api)
}
} }
} }
} }

4
app/src/main/java/com/github/damontecres/wholphin/ui/nav/Destination.kt
View file

@ -1,4 +1,4 @@
@file:UseSerializers(UuidSerializer::class) @file:UseSerializers(UUIDSerializer::class)
package com.github.damontecres.wholphin.ui.nav package com.github.damontecres.wholphin.ui.nav
@ -8,11 +8,11 @@ import com.github.damontecres.wholphin.data.model.GetItemsFilter
import com.github.damontecres.wholphin.data.model.ItemPlayback import com.github.damontecres.wholphin.data.model.ItemPlayback
import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisode import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisode
import com.github.damontecres.wholphin.ui.preferences.PreferenceScreenOption import com.github.damontecres.wholphin.ui.preferences.PreferenceScreenOption
import com.github.damontecres.wholphin.util.UuidSerializer
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.Transient import kotlinx.serialization.Transient
import kotlinx.serialization.UseSerializers import kotlinx.serialization.UseSerializers
import org.jellyfin.sdk.model.api.BaseItemKind import org.jellyfin.sdk.model.api.BaseItemKind
import org.jellyfin.sdk.model.serializer.UUIDSerializer
import java.util.UUID import java.util.UUID
/** /**

24
app/src/main/java/com/github/damontecres/wholphin/util/UuidSerializer.kt
View file

@ -1,24 +0,0 @@
package com.github.damontecres.wholphin.util
import kotlinx.serialization.KSerializer
import kotlinx.serialization.descriptors.PrimitiveKind
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import java.util.UUID
class UuidSerializer : KSerializer<UUID> {
override val descriptor: SerialDescriptor
get() = PrimitiveSerialDescriptor("UUID", PrimitiveKind.LONG)
override fun deserialize(decoder: Decoder): UUID = UUID(decoder.decodeLong(), decoder.decodeLong())
override fun serialize(
encoder: Encoder,
value: UUID,
) {
encoder.encodeLong(value.mostSignificantBits)
encoder.encodeLong(value.leastSignificantBits)
}
}