From dfdc32f89addd9a093fefb1a7c276ea7373b5dee Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Wed, 20 Sep 2023 09:58:17 +0200 Subject: [PATCH] feat(ffi): Rename `TimelineError` to `MediaInfoError`. The `TimelineError` type only contains error variants used for `ImageInfo`, `AudioInfo`, `VideoInfo`, `FileInfo` and so on. It's never used for something strictly related to the `Timeline`. This patch then renames `TimelineError` to `MediaInfoError`. The `MissingMediaInfoField` variant becomes `MediaField`. The `InvalidMediaInfoField` becomes `InvalidField`. --- bindings/matrix-sdk-ffi/src/error.rs | 6 +- bindings/matrix-sdk-ffi/src/timeline.rs | 74 ++++++++++++------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/bindings/matrix-sdk-ffi/src/error.rs b/bindings/matrix-sdk-ffi/src/error.rs index 2cb52ba02..94ac63f15 100644 --- a/bindings/matrix-sdk-ffi/src/error.rs +++ b/bindings/matrix-sdk-ffi/src/error.rs @@ -119,11 +119,11 @@ pub enum RoomError { #[derive(Debug, thiserror::Error, uniffi::Error)] #[uniffi(flat_error)] -pub enum TimelineError { +pub enum MediaInfoError { #[error("Required value missing from the media info")] - MissingMediaInfoField, + MissingField, #[error("Media info field invalid")] - InvalidMediaInfoField, + InvalidField, } #[derive(Debug, thiserror::Error, uniffi::Error)] diff --git a/bindings/matrix-sdk-ffi/src/timeline.rs b/bindings/matrix-sdk-ffi/src/timeline.rs index 62ef4e122..a94aa3b91 100644 --- a/bindings/matrix-sdk-ffi/src/timeline.rs +++ b/bindings/matrix-sdk-ffi/src/timeline.rs @@ -36,7 +36,7 @@ use ruma::{assign, UInt}; use tracing::{info, warn}; use crate::{ - error::{ClientError, TimelineError}, + error::{ClientError, MediaInfoError}, helpers::unwrap_or_clone_arc, room::AssetType, }; @@ -733,16 +733,16 @@ impl From for RumaImageInfo { } impl TryFrom<&ImageInfo> for BaseImageInfo { - type Error = TimelineError; + type Error = MediaInfoError; - fn try_from(value: &ImageInfo) -> Result { - let height = UInt::try_from(value.height.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let width = UInt::try_from(value.width.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let size = UInt::try_from(value.size.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let blurhash = value.blurhash.clone().ok_or(TimelineError::MissingMediaInfoField)?; + fn try_from(value: &ImageInfo) -> Result { + let height = UInt::try_from(value.height.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let width = UInt::try_from(value.width.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let size = UInt::try_from(value.size.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let blurhash = value.blurhash.clone().ok_or(MediaInfoError::MissingField)?; Ok(BaseImageInfo { height: Some(height), @@ -771,12 +771,12 @@ impl From for RumaAudioInfo { } impl TryFrom<&AudioInfo> for BaseAudioInfo { - type Error = TimelineError; + type Error = MediaInfoError; - fn try_from(value: &AudioInfo) -> Result { - let duration = value.duration.ok_or(TimelineError::MissingMediaInfoField)?; - let size = UInt::try_from(value.size.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; + fn try_from(value: &AudioInfo) -> Result { + let duration = value.duration.ok_or(MediaInfoError::MissingField)?; + let size = UInt::try_from(value.size.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; Ok(BaseAudioInfo { duration: Some(duration), size: Some(size) }) } @@ -838,17 +838,17 @@ impl From for RumaVideoInfo { } impl TryFrom<&VideoInfo> for BaseVideoInfo { - type Error = TimelineError; + type Error = MediaInfoError; - fn try_from(value: &VideoInfo) -> Result { - let duration = value.duration.ok_or(TimelineError::MissingMediaInfoField)?; - let height = UInt::try_from(value.height.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let width = UInt::try_from(value.width.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let size = UInt::try_from(value.size.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let blurhash = value.blurhash.clone().ok_or(TimelineError::MissingMediaInfoField)?; + fn try_from(value: &VideoInfo) -> Result { + let duration = value.duration.ok_or(MediaInfoError::MissingField)?; + let height = UInt::try_from(value.height.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let width = UInt::try_from(value.width.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let size = UInt::try_from(value.size.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let blurhash = value.blurhash.clone().ok_or(MediaInfoError::MissingField)?; Ok(BaseVideoInfo { duration: Some(duration), @@ -880,11 +880,11 @@ impl From for RumaFileInfo { } impl TryFrom<&FileInfo> for BaseFileInfo { - type Error = TimelineError; + type Error = MediaInfoError; - fn try_from(value: &FileInfo) -> Result { - let size = UInt::try_from(value.size.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; + fn try_from(value: &FileInfo) -> Result { + let size = UInt::try_from(value.size.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; Ok(BaseFileInfo { size: Some(size) }) } @@ -910,15 +910,15 @@ impl From for RumaThumbnailInfo { } impl TryFrom<&ThumbnailInfo> for BaseThumbnailInfo { - type Error = TimelineError; + type Error = MediaInfoError; - fn try_from(value: &ThumbnailInfo) -> Result { - let height = UInt::try_from(value.height.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let width = UInt::try_from(value.width.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; - let size = UInt::try_from(value.size.ok_or(TimelineError::MissingMediaInfoField)?) - .map_err(|_| TimelineError::InvalidMediaInfoField)?; + fn try_from(value: &ThumbnailInfo) -> Result { + let height = UInt::try_from(value.height.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let width = UInt::try_from(value.width.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; + let size = UInt::try_from(value.size.ok_or(MediaInfoError::MissingField)?) + .map_err(|_| MediaInfoError::InvalidField)?; Ok(BaseThumbnailInfo { height: Some(height), width: Some(width), size: Some(size) }) }