TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-09-14 08:21:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(portable): remove expect() anyway

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou
2026-09-02 13:33:53 +08:00
parent 8e1e9a33b7
commit 14a7088e21
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libs/portable/src/bin_reader.rs
View File

@@ -8,8 +8,6 @@ use std::{
// The generic payload, shared by every customer and compiled in once per release. // The generic payload, shared by every customer and compiled in once per release.
#[cfg(windows)] #[cfg(windows)]
const BIN_DATA: &[u8] = include_bytes!("../data.bin"); const BIN_DATA: &[u8] = include_bytes!("../data.bin");
#[cfg(not(windows))]
const BIN_DATA: &[u8] = &[];
// The per-customer payload, injected into the RCDATA resource after the template // The per-customer payload, injected into the RCDATA resource after the template
// has been built, so that customizing a client needs no recompilation. // has been built, so that customizing a client needs no recompilation.
@@ -44,7 +42,7 @@ impl BinaryReader {
pub fn new() -> Result<Self, String> { pub fn new() -> Result<Self, String> {
let package = read_package()?; let package = read_package()?;
let package_paths = package.0.iter().map(|f| f.path.clone()).collect(); let package_paths = package.0.iter().map(|f| f.path.clone()).collect();
let (files, exe) = merge(read_embedded(), package); let (files, exe) = merge(read_embedded()?, package);
Ok(Self { Ok(Self {
files, files,
exe, exe,
@@ -139,13 +137,13 @@ fn parse(blob: &'static [u8]) -> Option<(Vec<BinaryData>, String)> {
} }
#[cfg(windows)] #[cfg(windows)]
fn read_embedded() -> (Vec<BinaryData>, String) { fn read_embedded() -> Result<(Vec<BinaryData>, String), String> {
parse(BIN_DATA).expect("bin file is not valid!") parse(BIN_DATA).ok_or_else(|| "bin file is not valid!".to_owned())
} }
#[cfg(not(windows))] #[cfg(not(windows))]
fn read_embedded() -> (Vec<BinaryData>, String) { fn read_embedded() -> Result<(Vec<BinaryData>, String), String> {
parse(BIN_DATA).unwrap_or_default() Ok(Default::default())
} }
fn parse_package_blob(blob: Option<&'static [u8]>) -> Result<(Vec<BinaryData>, String), String> { fn parse_package_blob(blob: Option<&'static [u8]>) -> Result<(Vec<BinaryData>, String), String> {