From 1575d441724a27854c8f9fe1510a47a3050ae28d Mon Sep 17 00:00:00 2001 From: sigoden Date: Fri, 27 Oct 2023 23:45:26 +0800 Subject: fix: .copy don't works on some linux distro (#161) --- src/repl/handler.rs | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'src/repl/handler.rs') diff --git a/src/repl/handler.rs b/src/repl/handler.rs index a061742..1952ebe 100644 --- a/src/repl/handler.rs +++ b/src/repl/handler.rs @@ -2,13 +2,13 @@ use crate::client::init_client; use crate::config::SharedConfig; use crate::print_now; use crate::render::render_stream; -use crate::utils::copy; use std::fs; use std::io::Read; use super::abort::SharedAbortSignal; -use anyhow::{Context, Result}; +use anyhow::{bail, Context, Result}; +use arboard::Clipboard; use crossbeam::channel::Sender; use crossbeam::sync::WaitGroup; use std::cell::RefCell; @@ -32,16 +32,19 @@ pub struct ReplCmdHandler { config: SharedConfig, reply: RefCell, abort: SharedAbortSignal, + clipboard: std::result::Result, arboard::Error>, } impl ReplCmdHandler { #[allow(clippy::unnecessary_wraps)] pub fn init(config: SharedConfig, abort: SharedAbortSignal) -> Result { let reply = RefCell::new(String::new()); + let clipboard = Clipboard::new().map(RefCell::new); Ok(Self { config, reply, abort, + clipboard, }) } @@ -67,7 +70,7 @@ impl ReplCmdHandler { let buffer = ret?; self.config.read().save_message(&input, &buffer)?; if self.config.read().auto_copy { - let _ = copy(&buffer); + let _ = self.copy(&buffer); } self.config.write().save_conversation(&input, &buffer)?; *self.reply.borrow_mut() = buffer; @@ -105,7 +108,8 @@ impl ReplCmdHandler { print_now!("\n"); } ReplCmd::Copy => { - copy(&self.reply.borrow()).with_context(|| "Failed to copy the last output")?; + self.copy(&self.reply.borrow()) + .with_context(|| "Failed to copy the last output")?; print_now!("\n"); } ReplCmd::ReadFile(file) => { @@ -118,6 +122,16 @@ impl ReplCmdHandler { } Ok(()) } + + fn copy(&self, text: &str) -> Result<()> { + match self.clipboard.as_ref() { + Err(err) => bail!("{}", err), + Ok(clip) => { + clip.borrow_mut().set_text(text)?; + Ok(()) + } + } + } } #[allow(clippy::module_name_repetitions)] -- cgit v1.2.3