diff options
Diffstat (limited to 'client-native-rift')
| -rw-r--r-- | client-native-rift/Cargo.toml | 12 | ||||
| -rw-r--r-- | client-native-rift/src/main.rs | 46 |
2 files changed, 24 insertions, 34 deletions
diff --git a/client-native-rift/Cargo.toml b/client-native-rift/Cargo.toml index 1f5e81f..170b32f 100644 --- a/client-native-rift/Cargo.toml +++ b/client-native-rift/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" [dependencies] client-native-lib = { path = "../client-native-lib" } -clap = { version = "4.0.29", features = ["derive"] } -env_logger = "0.8" +clap = { version = "4.1.6", features = ["derive"] } +env_logger = "0.10.0" log = "0.4" -tokio = { version = "1.21", features = ["full"] } -bytes = "1.2.1" +tokio = { version = "1.25", features = ["full"] } +bytes = "1.4.0" -indicatif = "0.17.1" -humansize = "2.0.0" +indicatif = "0.17.3" +humansize = "2.1.3" diff --git a/client-native-rift/src/main.rs b/client-native-rift/src/main.rs index 45f720a..1f10b83 100644 --- a/client-native-rift/src/main.rs +++ b/client-native-rift/src/main.rs @@ -167,8 +167,7 @@ impl EventHandler for Handler { info!("channel opened"); *writer.write().await = Some(s.args.action.create_writer().await) }) - }) - .await; + }); } { let writer = writer.clone(); @@ -183,8 +182,7 @@ impl EventHandler for Handler { exit(0); } }) - }) - .await; + }); } { let writer = writer.clone(); @@ -218,13 +216,11 @@ impl EventHandler for Handler { }) }) } - .await; dc.on_error(box move |err| { Box::pin(async move { error!("data channel errored: {err}"); }) - }) - .await; + }); } } }) @@ -292,31 +288,27 @@ impl LocalResource for FileSender { { let reader = reader.clone(); let reader_factory = reader_factory.clone(); - channel - .on_open(box move || { - let reader = reader.clone(); - Box::pin(async move { - info!("channel open"); - *reader.write().await = Some(reader_factory.create_reader().await); - }) + channel.on_open(box move || { + let reader = reader.clone(); + Box::pin(async move { + info!("channel open"); + *reader.write().await = Some(reader_factory.create_reader().await); }) - .await; + }) } { let reader = reader.clone(); - channel - .on_close(box move || { - let reader = reader.clone(); - Box::pin(async move { - info!("channel closed"); - *reader.write().await = None; - }) + channel.on_close(box move || { + let reader = reader.clone(); + Box::pin(async move { + info!("channel closed"); + *reader.write().await = None; }) - .await; + }) } { - channel.set_buffered_amount_low_threshold(1 << 20).await; let reader = reader.clone(); + let pos = pos.clone(); let channel2 = channel.clone(); channel .on_buffered_amount_low(box move || { @@ -352,11 +344,9 @@ impl LocalResource for FileSender { }) }) .await; + channel.set_buffered_amount_low_threshold(1).await; } - - channel - .on_error(box move |err| Box::pin(async move { error!("channel error: {err}") })) - .await; + channel.on_error(box move |err| Box::pin(async move { error!("channel error: {err}") })) }) } } |