DeCarabas/fwd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Sometimes you can't get a clipboard, don't fail

Browse source 
This should fix CI as well, but there are possibly folks out there
that don't have a functioning clipboard and still want to run.
This commit is contained in:
John Doty 2024-08-10 07:29:54 -07:00
parent bb8c87bad9
commit 69b9bc9824
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/client/ui.rs
View file

@ -13,7 +13,7 @@ use crossterm::{
EnterAlternateScreen, LeaveAlternateScreen,
},
};
use log::{error, info, Level, Metadata, Record};
use log::{error, info, warn, Level, Metadata, Record};
use std::collections::vec_deque::VecDeque;
use std::collections::{HashMap, HashSet};
use std::io::stdout;
@ -218,7 +218,7 @@ pub struct UI {
show_help: bool,
alternate_screen: bool,
raw_mode: bool,
clipboard: ClipboardContext,
clipboard: Option<ClipboardContext>,
}
impl UI {
@ -228,6 +228,8 @@ impl UI {
ports.insert(*port, Listener::from_config(config.clone()));
}
let clipboard = ClipboardContext::new().ok();
UI {
events,
ports,
@ -240,8 +242,7 @@ impl UI {
config,
alternate_screen: false,
raw_mode: false,
clipboard: ClipboardContext::new()
.expect("Unable to initialize clipboard context"),
clipboard,
}
}
@ -672,10 +673,14 @@ impl UI {
}
Some(UIEvent::SetClipboard(contents)) => {
let length = contents.len();
if let Err(e) = self.clipboard.set_contents(contents) {
error!("Error setting clipboard contents: {e:#}");
if let Some(clipboard) = self.clipboard.as_mut() {
if let Err(e) = clipboard.set_contents(contents) {
error!("Error setting clipboard contents: {e:#}");
} else {
info!("Received clipboard contents ({length} bytes)");
}
} else {
info!("Received clipboard contents ({length} bytes)");
warn!("No clipboard available, contents discarded");
}
}
None => {