Skip to content

Commit f89f630

Browse files
committed
Merge RoomSendQueueUpdate::UploadedMedia and RoomSendQueueUpdate::MediaUploadProgress into RoomSendQueueUpdate::MediaUpload
1 parent c95c389 commit f89f630

File tree

3 files changed

+17
-48
lines changed

3 files changed

+17
-48
lines changed

crates/matrix-sdk-ui/src/timeline/controller/mod.rs

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use matrix_sdk::{
3131
send_queue::{
3232
LocalEcho, LocalEchoContent, RoomSendQueueUpdate, SendHandle, SendReactionHandle,
3333
},
34-
Result, Room, TransmissionProgress,
34+
Result, Room,
3535
};
3636
use ruma::{
3737
api::client::receipt::create_receipt::v3::ReceiptType as SendReceiptType,
@@ -1322,27 +1322,8 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
13221322
.await;
13231323
}
13241324

1325-
RoomSendQueueUpdate::UploadedMedia {
1326-
related_to, bytes, index, is_thumbnail, ..
1327-
} => {
1328-
self.update_event_send_state(
1329-
&related_to,
1330-
EventSendState::NotSentYet {
1331-
progress: Some(EventSendProgress::MediaUpload {
1332-
index,
1333-
is_thumbnail,
1334-
progress: TransmissionProgress { current: bytes, total: bytes },
1335-
}),
1336-
},
1337-
)
1338-
.await;
1339-
}
1340-
1341-
RoomSendQueueUpdate::MediaUploadProgress {
1342-
related_to,
1343-
index,
1344-
is_thumbnail,
1345-
progress,
1325+
RoomSendQueueUpdate::MediaUpload {
1326+
related_to, index, is_thumbnail, progress, ..
13461327
} => {
13471328
self.update_event_send_state(
13481329
&related_to,

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

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,9 @@ impl RoomSendQueue {
612612
let updates = updates.clone();
613613
spawn(async move {
614614
while let Some(progress) = subscriber.next().await {
615-
let _ = updates.send(RoomSendQueueUpdate::MediaUploadProgress {
615+
let _ = updates.send(RoomSendQueueUpdate::MediaUpload {
616616
related_to: related_to.clone(),
617+
file: None,
617618
index,
618619
is_thumbnail,
619620
progress,
@@ -641,12 +642,15 @@ impl RoomSendQueue {
641642
}
642643

643644
SentRequestKey::Media(media_info) => {
644-
let _ = updates.send(RoomSendQueueUpdate::UploadedMedia {
645+
let _ = updates.send(RoomSendQueueUpdate::MediaUpload {
645646
related_to: related_txn_id.as_ref().unwrap_or(&txn_id).clone(),
646-
file: media_info.file,
647-
bytes: media_info.bytes,
647+
file: Some(media_info.file),
648648
index,
649649
is_thumbnail,
650+
progress: TransmissionProgress {
651+
current: media_info.bytes,
652+
total: media_info.bytes,
653+
},
650654
});
651655
}
652656
},
@@ -2150,30 +2154,14 @@ pub enum RoomSendQueueUpdate {
21502154
event_id: OwnedEventId,
21512155
},
21522156

2153-
/// A media has been successfully uploaded.
2154-
UploadedMedia {
2155-
/// The media event this uploaded media relates to.
2156-
related_to: OwnedTransactionId,
2157-
2158-
/// The final media source for the file that was just uploaded.
2159-
file: MediaSource,
2160-
2161-
/// The number of bytes uploaded for the file.
2162-
bytes: usize,
2163-
2164-
/// The index of the media within the transaction. A file and its
2165-
/// thumbnail share the same index.
2166-
index: u64,
2167-
2168-
/// Is this a thumbnail request, or a real one.
2169-
is_thumbnail: bool,
2170-
},
2171-
21722157
/// A media upload has made progress.
2173-
MediaUploadProgress {
2158+
MediaUpload {
21742159
/// The media event this uploaded media relates to.
21752160
related_to: OwnedTransactionId,
21762161

2162+
/// The final media source for the file if it has finished uploading.
2163+
file: Option<MediaSource>,
2164+
21772165
/// The index of the media within the transaction. A file and its
21782166
/// thumbnail share the same index.
21792167
index: u64,

crates/matrix-sdk/tests/integration/send_queue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ macro_rules! assert_update {
164164
// Returns a tuple of (transaction_id, send_handle).
165165
($watch:ident => uploaded { related_to = $related_to:expr, mxc = $mxc:expr }) => {{
166166
assert_let!(
167-
Ok(Ok(RoomSendQueueUpdate::UploadedMedia {
167+
Ok(Ok(RoomSendQueueUpdate::MediaUpload {
168168
related_to,
169169
file,
170170
..
171171
})) = timeout(Duration::from_secs(1), $watch.recv()).await
172172
);
173173

174174
assert_eq!(related_to, $related_to);
175-
assert_let!(MediaSource::Plain(mxc) = file);
175+
assert_let!(Some(MediaSource::Plain(mxc)) = file);
176176
assert_eq!(mxc, $mxc);
177177
}};
178178

0 commit comments

Comments
 (0)