chore: merge release-v0.2.6 into main

mrjackwills · Aug 25, 2023 · cd6782a · cd6782a
2 parents e5a517a + 7941ee1
commit cd6782a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/.github/release-body.md b/.github/release-body.md
@@ -1,8 +1,7 @@
-### 2023-08-24
+### 2023-08-25
 
-### Chores
-+ Rust 1.72.0 linting, [e89381e08c414b94f0d98c75bd62b43a99a258bb]
-+ dependencies updated, [f8c44cc359b6d794cd25fa1fbffff37af6bc6f84]
+### Features
++ swap base64 crate for data-encoding, [2895a0c89c263fc8cfae58bc0d408b93beb6f5b9]
 
 
 see <a href='https://github.com/mrjackwills/leafcast_pi/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# <a href='https://github.com/mrjackwills/leafcast_pi/releases/tag/v0.2.6'>v0.2.6</a>
+### 2023-08-25
+
+### Features
++ swap base64 crate for data-encoding,[2895a0c8](https://github.com/mrjackwills/leafcast_pi/commit/2895a0c89c263fc8cfae58bc0d408b93beb6f5b9)
+
 # <a href='https://github.com/mrjackwills/leafcast_pi/releases/tag/v0.2.5'>v0.2.5</a>
 ### 2023-08-24
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 name = "leafcast"
-version = "0.2.5"
+version = "0.2.6"
 edition = "2021"
 authors = ["Jack Wills <email@mrjackwills.com>"]
 description = "leafcast pi client"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-base64 = "0.21"
 clap={version="4.4", features = ["derive", "unicode"] }
+data-encoding = "2.4"
 dotenvy = "0.15"
 figlet-rs = "0.1"
 futures-util = "0.3"

diff --git a/src/ws/ws_sender.rs b/src/ws/ws_sender.rs
@@ -1,4 +1,4 @@
-use base64::{engine, Engine};
+use data_encoding::BASE64;
 use futures_util::lock::Mutex;
 use futures_util::SinkExt;
 use std::process;
@@ -81,10 +81,11 @@ impl WSSender {
             date_time.second()
         );
         let pi_info = SysInfo::new(&self.app_envs, connected_at).await;
+
         Response::Photo(Photo {
             image: format!(
                 "data:image/webp;base64,{}",
-                engine::general_purpose::STANDARD.encode(photo_buffer)
+                BASE64.encode(photo_buffer.as_slice())
             ),
             pi_info,
             timestamp,