summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsigoden <sigoden@gmail.com>2023-11-07 16:36:40 +0800
committerGitHub <noreply@github.com>2023-11-07 16:36:40 +0800
commit534733b77cb1baef1459faa16a45d75c5f6275e3 (patch)
tree4a8d47962d97a8332f32d6ad1e07eb0b4d49b990
parentd40f104f667073f320a01d9c1a91aa88225ccaeb (diff)
downloadaichat-534733b77cb1baef1459faa16a45d75c5f6275e3.tar.gz
fix: unable to build on android using termux (#222)
-rw-r--r--Cargo.toml4
-rw-r--r--src/repl/mod.rs17
-rw-r--r--src/utils/clipboard.rs20
-rw-r--r--src/utils/mod.rs2
4 files changed, 28 insertions, 15 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 80ac6e1..b5f799b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,7 +35,6 @@ base64 = "0.21.0"
rustc-hash = "1.1.0"
bstr = "1.3.0"
nu-ansi-term = "0.47.0"
-arboard = { version = "3.2.0", default-features = false }
async-trait = "0.1.74"
textwrap = "0.16.0"
ansi_colours = "1.2.2"
@@ -53,6 +52,9 @@ version = "5.0.0"
default-features = false
features = ["parsing", "regex-onig", "plist-load"]
+[target.'cfg(not(any(target_os = "android", target_os = "emscripten")))'.dependencies]
+arboard = { version = "3.2.0", default-features = false }
+
[profile.release]
lto = true
strip = true
diff --git a/src/repl/mod.rs b/src/repl/mod.rs
index 4f51020..3962229 100644
--- a/src/repl/mod.rs
+++ b/src/repl/mod.rs
@@ -11,10 +11,9 @@ use self::validator::ReplValidator;
use crate::client::init_client;
use crate::config::GlobalConfig;
use crate::render::{render_error, render_stream};
-use crate::utils::{create_abort_signal, AbortSignal};
+use crate::utils::{create_abort_signal, set_text, AbortSignal};
use anyhow::{bail, Context, Result};
-use arboard::Clipboard;
use crossbeam::sync::WaitGroup;
use fancy_regex::Regex;
use lazy_static::lazy_static;
@@ -24,7 +23,6 @@ use reedline::{
ColumnarMenu, EditMode, Emacs, KeyCode, KeyModifiers, Keybindings, Reedline, ReedlineEvent,
ReedlineMenu, Vi,
};
-use std::cell::RefCell;
use std::io::Read;
const MENU_NAME: &str = "completion_menu";
@@ -56,7 +54,6 @@ pub struct Repl {
editor: Reedline,
prompt: ReplPrompt,
abort: AbortSignal,
- clipboard: std::result::Result<RefCell<Clipboard>, arboard::Error>,
}
impl Repl {
@@ -67,13 +64,10 @@ impl Repl {
let abort = create_abort_signal();
- let clipboard = Clipboard::new().map(RefCell::new);
-
Ok(Self {
config: config.clone(),
editor,
prompt,
- clipboard,
abort,
})
}
@@ -315,13 +309,8 @@ Type ".help" for more information.
if text.is_empty() {
bail!("No text")
}
- match self.clipboard.as_ref() {
- Err(err) => bail!("{}", err),
- Ok(clip) => {
- clip.borrow_mut().set_text(text)?;
- Ok(())
- }
- }
+ set_text(text)?;
+ Ok(())
}
}
diff --git a/src/utils/clipboard.rs b/src/utils/clipboard.rs
new file mode 100644
index 0000000..c96057f
--- /dev/null
+++ b/src/utils/clipboard.rs
@@ -0,0 +1,20 @@
+#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
+lazy_static::lazy_static! {
+ static ref CLIPBOARD: std::sync::Arc<std::sync::Mutex<Option<arboard::Clipboard>>> =
+ std::sync::Arc::new(std::sync::Mutex::new(arboard::Clipboard::new().ok()));
+}
+
+#[cfg(not(any(target_os = "android", target_os = "emscripten")))]
+pub fn set_text(text: &str) -> anyhow::Result<()> {
+ let mut clipboard = CLIPBOARD.lock().unwrap();
+ match clipboard.as_mut() {
+ Some(clipboard) => clipboard.set_text(text)?,
+ None => anyhow::bail!("No available clipboard"),
+ }
+ Ok(())
+}
+
+#[cfg(any(target_os = "android", target_os = "emscripten"))]
+pub fn set_text(_text: &str) -> anyhow::Result<()> {
+ anyhow::bail!("No available clipboard")
+}
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
index c9fa608..b94f83e 100644
--- a/src/utils/mod.rs
+++ b/src/utils/mod.rs
@@ -1,9 +1,11 @@
mod abort_signal;
+mod clipboard;
mod prompt_input;
mod split_line;
mod tiktoken;
pub use self::abort_signal::{create_abort_signal, AbortSignal};
+pub use self::clipboard::set_text;
pub use self::prompt_input::*;
pub use self::split_line::*;
pub use self::tiktoken::cl100k_base_singleton;