Fixed 1. Formatting Issue

2. Convert ProgressPayload fields to camel case
3. Added the transferSpeed field in the ProgressPayload type in typescript
pull/1797/head
VirtualPirate 9 months ago
parent 6da2ae2aea
commit 5760308216
No known key found for this signature in database
GPG Key ID: 09C986E655FAABF9

@ -7,6 +7,7 @@ import { invoke, Channel } from '@tauri-apps/api/core'
interface ProgressPayload { interface ProgressPayload {
progress: number progress: number
total: number total: number
transferSpeed: number
} }
type ProgressHandler = (progress: ProgressPayload) => void type ProgressHandler = (progress: ProgressPayload) => void

@ -58,6 +58,7 @@ impl Serialize for Error {
} }
#[derive(Clone, Serialize)] #[derive(Clone, Serialize)]
#[serde(rename_all = "camelCase")]
struct ProgressPayload { struct ProgressPayload {
progress: u64, progress: u64,
total: u64, total: u64,
@ -150,7 +151,11 @@ fn file_to_body(channel: Channel<ProgressPayload>, file: File) -> reqwest::Body
stream, stream,
Box::new(move |progress, total| { Box::new(move |progress, total| {
stats.record_chunk_transfer(progress as usize); stats.record_chunk_transfer(progress as usize);
let _ = channel.send(ProgressPayload { progress, total, transfer_speed: stats.transfer_speed }); let _ = channel.send(ProgressPayload {
progress,
total,
transfer_speed: stats.transfer_speed,
});
}), }),
)) ))
} }

@ -29,7 +29,8 @@ impl TransferStats {
// If the accumulated time exceeds the granularity, calculate the transfer speed. // If the accumulated time exceeds the granularity, calculate the transfer speed.
if self.accumulated_time >= self.granularity as u128 { if self.accumulated_time >= self.granularity as u128 {
self.transfer_speed = (self.accumulated_chunk_len as u128 / self.accumulated_time * 1024) as u64; self.transfer_speed =
(self.accumulated_chunk_len as u128 / self.accumulated_time * 1024) as u64;
self.accumulated_chunk_len = 0; self.accumulated_chunk_len = 0;
self.accumulated_time = 0; self.accumulated_time = 0;
} }

Loading…
Cancel
Save