Skip to content

fix error message encoding #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
changweige wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix error message encoding #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/macos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use core_foundation::string::CFString;
use debug_print::debug_println;
use lru::LruCache;
use parking_lot::Mutex;
use std::io::Error;

static GET_SELECTED_TEXT_METHOD: Mutex<Option<LruCache<String, u8>>> = Mutex::new(None);

Expand Down Expand Up @@ -128,12 +129,14 @@ fn get_selected_text_by_clipboard_using_applescript() -> Result<String, Box<dyn
let content = content.trim();
Ok(content.to_string())
} else {
let err = output
.stderr
.into_iter()
.map(|c| c as char)
.collect::<String>()
.into();
Err(err)
let d = String::from_utf8(output.stderr)
.unwrap_or_else(|_| "Failed to read stderr".to_string());

let err = Error::new(
std::io::ErrorKind::Other,
format!("AppleScript failed: {}", d),
);

Err(Box::new(err))
}
}