more impls

Author: clitic

vsd/examples/download.rs

@@ -7,7 +7,7 @@ use std::{path::PathBuf, sync::Arc};
 use vsd::{
     Downloader, Error, Muxer, Result,
     playlist::MediaType,
-    progress::{ProgressCallback, ProgressState},
+    progress::{ByteSize, Eta, ProgressCallback, ProgressState},
     reqwest::Client,
     tokio,
     tokio_util::sync::CancellationToken,
@@ -18,16 +18,18 @@ struct Progress;
 impl ProgressCallback for Progress {
     fn on_progress(&self, state: &ProgressState) {
         println!(
-            "{}% ({}/{})",
-            state.percent, state.downloaded_parts, state.total_parts
+            "{}% | {}/~{} | {}/{} | {}",
+            state.percent,
+            ByteSize(state.downloaded_bytes),
+            ByteSize(state.estimated_bytes),
+            state.downloaded_parts,
+            state.total_parts,
+            Eta(state.eta_seconds)
         );
     }
 
     fn on_finish(&self, state: &ProgressState) {
-        println!(
-            "{}% ({}/{})",
-            state.percent, state.downloaded_parts, state.total_parts
-        );
+        self.on_progress(state);
     }
 }
 

vsd/src/lib.rs

@@ -21,5 +21,5 @@ pub use error::{Error, Result};
 pub use reqwest;
 pub use tokio;
 pub use tokio_util;
-pub use utils::find_ffmpeg;
+pub use utils::{find_ffmpeg, gen_id};
 pub use vsd_mp4;

vsd/src/playlist/types.rs

@@ -1,14 +1,14 @@
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize)]
 pub struct MasterPlaylist {
     pub playlist_type: PlaylistType,
     pub uri: String,
     pub streams: Vec<MediaPlaylist>,
 }
 
-#[derive(Default, Debug, Serialize)]
+#[derive(Debug, Default, Deserialize, Serialize)]
 pub struct MediaPlaylist {
     pub bandwidth: Option<u64>,
     pub channels: Option<f32>,
@@ -27,7 +27,7 @@ pub struct MediaPlaylist {
     pub uri: String,
 }
 
-#[derive(Clone, Debug, Default, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Segment {
     pub duration: f32,
     pub key: Option<Key>,
@@ -36,24 +36,24 @@ pub struct Segment {
     pub uri: String,
 }
 
-#[derive(Clone, Debug, Default, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Key {
     pub default_kid: Option<String>,
     pub iv: Option<String>,
     pub method: KeyMethod,
     pub uri: Option<String>,
 }
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Map {
     pub range: Option<Range>,
     pub uri: String,
 }
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct Range(pub u64, pub u64);
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
 pub enum MediaType {
     Video,
     Audio,
@@ -62,14 +62,14 @@ pub enum MediaType {
     Undefined,
 }
 
-#[derive(Clone, Debug, Default, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
 pub enum PlaylistType {
     Dash,
     #[default]
     Hls,
 }
 
-#[derive(Clone, Debug, Default, PartialEq, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
 pub enum KeyMethod {
     Aes128,
     Cenc,
@@ -79,7 +79,7 @@ pub enum KeyMethod {
     SampleAes,
 }
 
-#[derive(Clone, Debug, Serialize)]
+#[derive(Clone, Debug, Default, Deserialize, Serialize)]
 pub struct StreamMetadata {
     pub bandwidth: Option<u64>,
     pub channels: Option<f32>,

vsd/src/progress.rs

@@ -234,7 +234,7 @@ impl std::fmt::Display for ByteSize {
     }
 }
 
-pub struct Eta(usize);
+pub struct Eta(pub usize);
 
 impl std::fmt::Display for Eta {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {