refactor(media): Add method to split Thumbnail into parts

Signed-off-by: Kévin Commaille <[email protected]>

Author: zecakeh

crates/matrix-sdk/src/attachment.rs

@@ -180,6 +180,20 @@ pub struct Thumbnail {
     pub info: Option<BaseThumbnailInfo>,
 }
 
+impl Thumbnail {
+    /// Convert this `Thumbnail` into a `(data, content_type, info)` tuple.
+    pub fn into_parts(self) -> (Vec<u8>, mime::Mime, Box<ThumbnailInfo>) {
+        let thumbnail_info = assign!(
+            self.info
+                .as_ref()
+                .map(|info| ThumbnailInfo::from(info.clone()))
+                .unwrap_or_default(),
+            { mimetype: Some(self.content_type.to_string()) }
+        );
+        (self.data, self.content_type, Box::new(thumbnail_info))
+    }
+}
+
 /// Configuration for sending an attachment.
 #[derive(Debug, Default)]
 pub struct AttachmentConfig {

crates/matrix-sdk/src/encryption/mod.rs

@@ -485,20 +485,15 @@ impl Client {
             return Ok(None);
         };
 
-        let mut cursor = Cursor::new(thumbnail.data);
+        let (data, content_type, thumbnail_info) = thumbnail.into_parts();
+        let mut cursor = Cursor::new(data);
 
         let file = self
-            .upload_encrypted_file(&thumbnail.content_type, &mut cursor)
+            .upload_encrypted_file(&content_type, &mut cursor)
             .with_send_progress_observable(send_progress)
             .await?;
 
-        #[rustfmt::skip]
-            let thumbnail_info =
-                assign!(thumbnail.info.map(ThumbnailInfo::from).unwrap_or_default(), {
-                    mimetype: Some(thumbnail.content_type.as_ref().to_owned())
-                });
-
-        Ok(Some((MediaSource::Encrypted(Box::new(file)), Box::new(thumbnail_info))))
+        Ok(Some((MediaSource::Encrypted(Box::new(file)), thumbnail_info)))
     }
 
     /// Claim one-time keys creating new Olm sessions.

crates/matrix-sdk/src/media.rs

@@ -669,20 +669,14 @@ impl Media {
             return Ok(None);
         };
 
+        let (data, content_type, thumbnail_info) = thumbnail.into_parts();
+
         let response = self
-            .upload(&thumbnail.content_type, thumbnail.data, None)
+            .upload(&content_type, data, None)
             .with_send_progress_observable(send_progress)
             .await?;
         let url = response.content_uri;
 
-        let thumbnail_info = assign!(
-            thumbnail.info
-                .as_ref()
-                .map(|info| ThumbnailInfo::from(info.clone()))
-                .unwrap_or_default(),
-            { mimetype: Some(thumbnail.content_type.as_ref().to_owned()) }
-        );
-
-        Ok(Some((MediaSource::Plain(url), Box::new(thumbnail_info))))
+        Ok(Some((MediaSource::Plain(url), thumbnail_info)))
     }
 }

crates/matrix-sdk/src/send_queue/upload.rs

@@ -24,11 +24,10 @@ use matrix_sdk_base::{
 };
 use mime::Mime;
 use ruma::{
-    assign,
     events::{
         room::{
             message::{FormattedBody, MessageType, RoomMessageEventContent},
-            MediaSource, ThumbnailInfo,
+            MediaSource,
         },
         AnyMessageLikeEventContent,
     },
@@ -183,13 +182,16 @@ impl RoomSendQueue {
 
             // Process the thumbnail, if it's been provided.
             if let Some(thumbnail) = config.thumbnail.take() {
+                // Create the information required for filling the thumbnail section of the
+                // media event.
+                let (data, content_type, thumbnail_info) = thumbnail.into_parts();
+
                 // Normalize information to retrieve the thumbnail in the cache store.
-                let info = thumbnail.info.as_ref();
-                let height = info.and_then(|info| info.height).unwrap_or_else(|| {
+                let height = thumbnail_info.height.unwrap_or_else(|| {
                     trace!("thumbnail height is unknown, using 0 for the cache entry");
                     uint!(0)
                 });
-                let width = info.and_then(|info| info.width).unwrap_or_else(|| {
+                let width = thumbnail_info.width.unwrap_or_else(|| {
                     trace!("thumbnail width is unknown, using 0 for the cache entry");
                     uint!(0)
                 });
@@ -201,25 +203,17 @@ impl RoomSendQueue {
                 let thumbnail_media_request =
                     make_local_thumbnail_media_request(&txn, height, width);
                 cache_store
-                    .add_media_content(&thumbnail_media_request, thumbnail.data.clone())
+                    .add_media_content(&thumbnail_media_request, data)
                     .await
                     .map_err(RoomSendQueueStorageError::EventCacheStoreError)?;
 
-                // Create the information required for filling the thumbnail section of the
-                // media event.
-                let thumbnail_info = Box::new(
-                    assign!(thumbnail.info.map(ThumbnailInfo::from).unwrap_or_default(), {
-                        mimetype: Some(thumbnail.content_type.as_ref().to_owned())
-                    }),
-                );
-
                 (
                     Some(txn.clone()),
                     Some((thumbnail_media_request.source.clone(), thumbnail_info)),
                     Some((
                         FinishUploadThumbnailInfo { txn, width, height },
                         thumbnail_media_request,
-                        thumbnail.content_type,
+                        content_type,
                     )),
                 )
             } else {