Update dependeices (#46)

* bugfix

* update all dependencies except messageio

Author: sigmaSd

Cargo.lock

@@ -15,26 +15,28 @@ categories = ["command-line-utilities", "command-line-interface"]
 maintenance = { status = "actively-developed" }
 
 [dependencies]
+#message-io = { default-features = false, features = ["udp", "tcp"], version = "0.6.0" }
 message-io = "0.6.0"
-serde = { version = "1.0.118", features = ["derive"] }
+serde = { version = "1.0.124", features = ["derive"] }
 #keep the same version as tui for faster compile time
 crossterm = "0.18.2"
 tui = { version = "0.14.0", default-features = false, features = ['crossterm', 'serde'] }
-whoami = "1.0.3"
+whoami = "1.1.0"
 chrono = "0.4.19"
 clap = "2.33.3"
 unicode-width = "0.1.8"
-resize = "0.5.5"
 shellwords = "1.1.0"
-shellexpand = "2.1"
+shellexpand = "2.1.0"
 toml = "0.5.8"
 dirs-next = "2.0.0"
+rgb = {version="0.8.25", features=["serde"]}
+resize = "0.7.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 v4l = { version = "0.12.0", optional = true }
 
 [dev-dependencies]
-rand = "0.8.1"
+rand = "0.8.3"
 
 [features]
 stream-video = ["v4l"]

Cargo.toml

@@ -188,7 +188,7 @@ impl<'a> Application<'a> {
                 }
             }
             NetMessage::Stream(data) => match data {
-                Some((data, width, height)) if data.len() / 3 == width * height / 2 => {
+                Some((data, width, height)) if data.len() == width * height / 2 => {
                     self.state
                         .windows
                         .entry(endpoint)

src/application.rs

@@ -5,6 +5,8 @@ use crate::message::{NetMessage};
 use crate::util::{Result, Reportable};
 
 use message_io::network::{Network};
+use resize::px::RGB;
+use rgb::RGB8;
 use v4l::prelude::*;
 use v4l::FourCC;
 use v4l::buffer::Type;
@@ -66,7 +68,7 @@ impl Action for SendStream {
             }
         };
         #[allow(non_snake_case)]
-        let data: Vec<u8> = data.chunks_exact(4).fold(vec![], |mut acc, v| {
+        let data: Vec<RGB8> = data.chunks_exact(4).fold(vec![], |mut acc, v| {
             // convert form YUYV to RGB
             let [Y, U, _, V]: [u8; 4] = std::convert::TryFrom::try_from(v).unwrap();
             let Y = Y as f32;
@@ -81,9 +83,8 @@ impl Action for SendStream {
             let r = r as u8;
             let g = g as u8;
             let b = b as u8;
-            acc.push(r);
-            acc.push(g);
-            acc.push(b);
+
+            acc.push(RGB::new(r, g, b));
             acc
         });
 

src/commands/send_stream/linux.rs

@@ -1,3 +1,4 @@
+use rgb::RGB8;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -9,9 +10,9 @@ pub enum Chunk {
 
 #[derive(Serialize, Deserialize)]
 pub enum NetMessage {
-    HelloLan(String, u16),                   // user_name, server_port
-    HelloUser(String),                       // user_name
-    UserMessage(String),                     // content
-    UserData(String, Chunk),                 // file_name, chunk
-    Stream(Option<(Vec<u8>, usize, usize)>), // Option of (stream_data width, height ) None means stream has ended
+    HelloLan(String, u16),                     // user_name, server_port
+    HelloUser(String),                         // user_name
+    UserMessage(String),                       // content
+    UserData(String, Chunk),                   // file_name, chunk
+    Stream(Option<(Vec<RGB8>, usize, usize)>), // Option of (stream_data width, height ) None means stream has ended
 }

src/message.rs

@@ -1,5 +1,6 @@
 use message_io::network::Endpoint;
 use chrono::{DateTime, Local};
+use rgb::RGB8;
 
 use std::collections::HashMap;
 
@@ -38,7 +39,7 @@ impl ChatMessage {
 }
 
 pub struct Window {
-    pub data: Vec<u8>,
+    pub data: Vec<RGB8>,
     pub width: usize,
     pub height: usize,
 }
@@ -259,11 +260,10 @@ impl State {
     pub fn update_window(
         &mut self,
         endpoint: &Endpoint,
-        data: Vec<u8>,
+        data: Vec<RGB8>,
         width: usize,
         height: usize,
-    )
-    {
+    ) {
         let window = self.windows.get_mut(endpoint).expect("Window should exist");
         window.width = width;
         window.height = height;

src/state.rs

@@ -1,4 +1,4 @@
-use resize::Pixel::RGB24;
+use resize::{Pixel::RGB8, px::RGB};
 use resize::Type::Lanczos3;
 use crate::{config::Theme, state::Window};
 
@@ -20,8 +20,7 @@ pub fn draw(
     state: &State,
     chunk: Rect,
     theme: &Theme,
-)
-{
+) {
     let chunks = Layout::default()
         .direction(Direction::Vertical)
         .constraints([Constraint::Min(0), Constraint::Length(6)].as_ref())
@@ -48,8 +47,7 @@ fn draw_messages_panel(
     state: &State,
     chunk: Rect,
     theme: &Theme,
-)
-{
+) {
     let message_colors = &theme.message_colors;
 
     let messages = state
@@ -121,8 +119,7 @@ fn add_progress_bar<'a>(
     panel_width: u16,
     progress: &'a ProgressState,
     theme: &Theme,
-) -> Vec<Span<'a>>
-{
+) -> Vec<Span<'a>> {
     let color = theme.progress_bar_color;
     let width = (panel_width - 20) as usize;
 
@@ -174,8 +171,7 @@ fn draw_input_panel(
     state: &State,
     chunk: Rect,
     theme: &Theme,
-)
-{
+) {
     let inner_width = (chunk.width - 2) as usize;
 
     let input = state.input().iter().collect::<String>();
@@ -244,19 +240,20 @@ impl tui::widgets::Widget for FrameBuffer<'_> {
                 window.height,
                 area.width as usize,
                 area.height as usize,
-                RGB24,
+                RGB8,
                 Lanczos3,
-            );
-            let mut dst = vec![0; (area.width * area.height) as usize * 3];
-            resizer.resize(&window.data, &mut dst);
+            )
+            .unwrap();
+            let mut dst = vec![RGB::new(0, 0, 0); (area.width * area.height) as usize];
+            resizer.resize(&window.data, &mut dst).unwrap();
 
-            let mut dst = dst.chunks(3);
+            let mut dst = dst.iter();
             for j in area.y..area.y + area.height {
                 for i in area.x..area.x + area.width {
-                    let cell = dst.next().unwrap();
-                    let r = cell[0];
-                    let g = cell[1];
-                    let b = cell[2];
+                    let rgb = dst.next().unwrap();
+                    let r = rgb.r;
+                    let g = rgb.g;
+                    let b = rgb.b;
                     buf.get_mut(i, j).set_bg(Color::Rgb(r, g, b));
                 }
             }