diff --git a/build.rs b/build.rs
index b2b1f65..ca8571f 100644
--- a/build.rs
+++ b/build.rs
@@ -25,7 +25,7 @@ fn get_config() -> PathBuf {
*/
#[cfg(target_os = "windows")]
-fn print_config() {
+fn print_config() {
println!("cargo:rustc-link-lib=static=winbridge");
println!("cargo:rustc-link-lib=dylib=user32");
}
@@ -47,10 +47,9 @@ fn print_config() {
println!("cargo:rustc-link-lib=framework=IOKit");
}
-fn main()
-{
+fn main() {
let dst = get_config();
println!("cargo:rustc-link-search=native={}", dst.display());
print_config();
-}
\ No newline at end of file
+}
diff --git a/src/bridge/linux.rs b/src/bridge/linux.rs
index 5c0ec4c..ef04d27 100644
--- a/src/bridge/linux.rs
+++ b/src/bridge/linux.rs
@@ -17,11 +17,11 @@
* along with espanso. If not, see .
*/
-use std::os::raw::{c_void, c_char};
+use std::os::raw::{c_char, c_void};
#[allow(improper_ctypes)]
-#[link(name="linuxbridge", kind="static")]
-extern {
+#[link(name = "linuxbridge", kind = "static")]
+extern "C" {
pub fn check_x11() -> i32;
pub fn initialize(s: *const c_void) -> i32;
pub fn eventloop();
@@ -34,8 +34,9 @@ extern {
pub fn is_current_window_special() -> i32;
// Keyboard
- pub fn register_keypress_callback(cb: extern fn(_self: *mut c_void, *const u8,
- i32, i32, i32));
+ pub fn register_keypress_callback(
+ cb: extern "C" fn(_self: *mut c_void, *const u8, i32, i32, i32),
+ );
pub fn send_string(string: *const c_char);
pub fn delete_string(count: i32);
@@ -52,4 +53,4 @@ extern {
pub fn fast_delete_string(count: i32, delay: i32);
pub fn fast_left_arrow(count: i32);
pub fn fast_send_enter();
-}
\ No newline at end of file
+}
diff --git a/src/bridge/macos.rs b/src/bridge/macos.rs
index 1cfb204..cb87675 100644
--- a/src/bridge/macos.rs
+++ b/src/bridge/macos.rs
@@ -17,7 +17,7 @@
* along with espanso. If not, see .
*/
-use std::os::raw::{c_void, c_char};
+use std::os::raw::{c_char, c_void};
#[repr(C)]
pub struct MacMenuItem {
@@ -27,8 +27,8 @@ pub struct MacMenuItem {
}
#[allow(improper_ctypes)]
-#[link(name="macbridge", kind="static")]
-extern {
+#[link(name = "macbridge", kind = "static")]
+extern "C" {
pub fn initialize(s: *const c_void, icon_path: *const c_char, show_icon: i32);
pub fn eventloop();
pub fn headless_eventloop();
@@ -39,8 +39,8 @@ extern {
pub fn open_settings_panel();
pub fn get_active_app_bundle(buffer: *mut c_char, size: i32) -> i32;
pub fn get_active_app_identifier(buffer: *mut c_char, size: i32) -> i32;
- pub fn get_secure_input_process(pid:*mut i64) -> i32;
- pub fn get_path_from_pid(pid:i64, buffer: *mut c_char, size: i32) -> i32;
+ pub fn get_secure_input_process(pid: *mut i64) -> i32;
+ pub fn get_path_from_pid(pid: i64, buffer: *mut c_char, size: i32) -> i32;
// Clipboard
pub fn get_clipboard(buffer: *mut c_char, size: i32) -> i32;
@@ -48,13 +48,14 @@ extern {
pub fn set_clipboard_image(path: *const c_char) -> i32;
// UI
- pub fn register_icon_click_callback(cb: extern fn(_self: *mut c_void));
+ pub fn register_icon_click_callback(cb: extern "C" fn(_self: *mut c_void));
pub fn show_context_menu(items: *const MacMenuItem, count: i32) -> i32;
- pub fn register_context_menu_click_callback(cb: extern fn(_self: *mut c_void, id: i32));
+ pub fn register_context_menu_click_callback(cb: extern "C" fn(_self: *mut c_void, id: i32));
// Keyboard
- pub fn register_keypress_callback(cb: extern fn(_self: *mut c_void, *const u8,
- i32, i32, i32));
+ pub fn register_keypress_callback(
+ cb: extern "C" fn(_self: *mut c_void, *const u8, i32, i32, i32),
+ );
pub fn send_string(string: *const c_char);
pub fn send_vkey(vk: i32);
@@ -62,4 +63,4 @@ extern {
pub fn delete_string(count: i32);
pub fn trigger_paste();
pub fn trigger_copy();
-}
\ No newline at end of file
+}
diff --git a/src/bridge/mod.rs b/src/bridge/mod.rs
index 3c6b412..3446e17 100644
--- a/src/bridge/mod.rs
+++ b/src/bridge/mod.rs
@@ -24,4 +24,4 @@ pub(crate) mod windows;
pub(crate) mod linux;
#[cfg(target_os = "macos")]
-pub(crate) mod macos;
\ No newline at end of file
+pub(crate) mod macos;
diff --git a/src/bridge/windows.rs b/src/bridge/windows.rs
index 70c71a4..2f75254 100644
--- a/src/bridge/windows.rs
+++ b/src/bridge/windows.rs
@@ -17,7 +17,7 @@
* along with espanso. If not, see .
*/
-use std::os::raw::{c_void};
+use std::os::raw::c_void;
#[repr(C)]
pub struct WindowsMenuItem {
@@ -27,10 +27,15 @@ pub struct WindowsMenuItem {
}
#[allow(improper_ctypes)]
-#[link(name="winbridge", kind="static")]
-extern {
+#[link(name = "winbridge", kind = "static")]
+extern "C" {
pub fn start_daemon_process() -> i32;
- pub fn initialize(s: *const c_void, ico_path: *const u16, bmp_path: *const u16, show_icon: i32) -> i32;
+ pub fn initialize(
+ s: *const c_void,
+ ico_path: *const u16,
+ bmp_path: *const u16,
+ show_icon: i32,
+ ) -> i32;
// SYSTEM
pub fn get_active_window_name(buffer: *mut u16, size: i32) -> i32;
@@ -40,8 +45,8 @@ extern {
pub fn show_notification(message: *const u16) -> i32;
pub fn close_notification();
pub fn show_context_menu(items: *const WindowsMenuItem, count: i32) -> i32;
- pub fn register_icon_click_callback(cb: extern fn(_self: *mut c_void));
- pub fn register_context_menu_click_callback(cb: extern fn(_self: *mut c_void, id: i32));
+ pub fn register_icon_click_callback(cb: extern "C" fn(_self: *mut c_void));
+ pub fn register_context_menu_click_callback(cb: extern "C" fn(_self: *mut c_void, id: i32));
pub fn cleanup_ui();
// CLIPBOARD
@@ -50,8 +55,9 @@ extern {
pub fn set_clipboard_image(path: *const u16) -> i32;
// KEYBOARD
- pub fn register_keypress_callback(cb: extern fn(_self: *mut c_void, *const u16,
- i32, i32, i32, i32, i32));
+ pub fn register_keypress_callback(
+ cb: extern "C" fn(_self: *mut c_void, *const u16, i32, i32, i32, i32, i32),
+ );
pub fn eventloop();
pub fn send_string(string: *const u16);
@@ -64,4 +70,4 @@ extern {
// PROCESSES
pub fn start_process(cmd: *const u16) -> i32;
-}
\ No newline at end of file
+}
diff --git a/src/check.rs b/src/check.rs
index daed087..414efbc 100644
--- a/src/check.rs
+++ b/src/check.rs
@@ -27,20 +27,18 @@ pub fn check_preconditions() -> bool {
let mut result = true;
// Make sure notify-send is installed
- let status = Command::new("notify-send")
- .arg("-v")
- .output();
+ let status = Command::new("notify-send").arg("-v").output();
if status.is_err() {
println!("Error: 'notify-send' command is needed for espanso to work correctly, please install it.");
result = false;
}
// Make sure xclip is installed
- let status = Command::new("xclip")
- .arg("-version")
- .output();
+ let status = Command::new("xclip").arg("-version").output();
if status.is_err() {
- println!("Error: 'xclip' command is needed for espanso to work correctly, please install it.");
+ println!(
+ "Error: 'xclip' command is needed for espanso to work correctly, please install it."
+ );
result = false;
}
@@ -70,4 +68,4 @@ pub fn check_preconditions() -> bool {
pub fn check_preconditions() -> bool {
// Nothing needed on windows
true
-}
\ No newline at end of file
+}
diff --git a/src/clipboard/linux.rs b/src/clipboard/linux.rs
index b3e4e4d..24dda8c 100644
--- a/src/clipboard/linux.rs
+++ b/src/clipboard/linux.rs
@@ -17,18 +17,16 @@
* along with espanso. If not, see .
*/
-use std::process::{Command, Stdio};
-use std::io::{Write};
-use log::{error};
+use log::error;
+use std::io::Write;
use std::path::Path;
+use std::process::{Command, Stdio};
pub struct LinuxClipboardManager {}
impl super::ClipboardManager for LinuxClipboardManager {
- fn get_clipboard(&self) -> Option {
- let res = Command::new("xclip")
- .args(&["-o", "-sel", "clip"])
- .output();
+ fn get_clipboard(&self) -> Option {
+ let res = Command::new("xclip").args(&["-o", "-sel", "clip"]).output();
if let Ok(output) = res {
if output.status.success() {
@@ -71,14 +69,14 @@ impl super::ClipboardManager for LinuxClipboardManager {
Some(ext) => {
let ext = ext.to_string_lossy().to_lowercase();
match ext.as_ref() {
- "png" => {"image/png"},
- "jpg" | "jpeg" => {"image/jpeg"},
- "gif" => {"image/gif"},
- "svg" => {"image/svg"},
- _ => {"image/png"},
+ "png" => "image/png",
+ "jpg" | "jpeg" => "image/jpeg",
+ "gif" => "image/gif",
+ "svg" => "image/svg",
+ _ => "image/png",
}
- },
- None => {"image/png"},
+ }
+ None => "image/png",
};
let image_path = image_path.to_string_lossy().into_owned();
@@ -95,6 +93,6 @@ impl super::ClipboardManager for LinuxClipboardManager {
impl LinuxClipboardManager {
pub fn new() -> LinuxClipboardManager {
- LinuxClipboardManager{}
+ LinuxClipboardManager {}
}
-}
\ No newline at end of file
+}
diff --git a/src/clipboard/macos.rs b/src/clipboard/macos.rs
index 3777d21..8299179 100644
--- a/src/clipboard/macos.rs
+++ b/src/clipboard/macos.rs
@@ -17,20 +17,18 @@
* along with espanso. If not, see .
*/
-use std::os::raw::c_char;
use crate::bridge::macos::*;
-use std::ffi::{CStr, CString};
-use std::path::Path;
use log::{error, warn};
+use std::ffi::{CStr, CString};
+use std::os::raw::c_char;
+use std::path::Path;
-pub struct MacClipboardManager {
-
-}
+pub struct MacClipboardManager {}
impl super::ClipboardManager for MacClipboardManager {
- fn get_clipboard(&self) -> Option {
+ fn get_clipboard(&self) -> Option {
unsafe {
- let mut buffer : [c_char; 2000] = [0; 2000];
+ let mut buffer: [c_char; 2000] = [0; 2000];
let res = get_clipboard(buffer.as_mut_ptr(), buffer.len() as i32);
if res > 0 {
@@ -71,6 +69,6 @@ impl super::ClipboardManager for MacClipboardManager {
impl MacClipboardManager {
pub fn new() -> MacClipboardManager {
- MacClipboardManager{}
+ MacClipboardManager {}
}
-}
\ No newline at end of file
+}
diff --git a/src/clipboard/mod.rs b/src/clipboard/mod.rs
index b04d5c2..41e43de 100644
--- a/src/clipboard/mod.rs
+++ b/src/clipboard/mod.rs
@@ -50,4 +50,4 @@ pub fn get_manager() -> impl ClipboardManager {
#[cfg(target_os = "macos")]
pub fn get_manager() -> impl ClipboardManager {
macos::MacClipboardManager::new()
-}
\ No newline at end of file
+}
diff --git a/src/clipboard/windows.rs b/src/clipboard/windows.rs
index 63fa070..b2e2e1d 100644
--- a/src/clipboard/windows.rs
+++ b/src/clipboard/windows.rs
@@ -17,24 +17,22 @@
* along with espanso. If not, see .
*/
-use widestring::U16CString;
-use crate::bridge::windows::{set_clipboard, get_clipboard, set_clipboard_image};
+use crate::bridge::windows::{get_clipboard, set_clipboard, set_clipboard_image};
use std::path::Path;
+use widestring::U16CString;
-pub struct WindowsClipboardManager {
-
-}
+pub struct WindowsClipboardManager {}
impl WindowsClipboardManager {
pub fn new() -> WindowsClipboardManager {
- WindowsClipboardManager{}
+ WindowsClipboardManager {}
}
}
impl super::ClipboardManager for WindowsClipboardManager {
- fn get_clipboard(&self) -> Option {
+ fn get_clipboard(&self) -> Option {
unsafe {
- let mut buffer : [u16; 2000] = [0; 2000];
+ let mut buffer: [u16; 2000] = [0; 2000];
let res = get_clipboard(buffer.as_mut_ptr(), buffer.len() as i32);
if res > 0 {
@@ -62,4 +60,4 @@ impl super::ClipboardManager for WindowsClipboardManager {
set_clipboard_image(payload_c.as_ptr());
}
}
-}
\ No newline at end of file
+}
diff --git a/src/config/mod.rs b/src/config/mod.rs
index eaa94a9..a2e6d7e 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -19,63 +19,133 @@
extern crate dirs;
-use std::path::{Path, PathBuf};
-use std::{fs};
-use crate::matcher::{Match, MatchVariable};
-use std::fs::{File, create_dir_all};
-use std::io::Read;
-use serde::{Serialize, Deserialize};
use crate::event::KeyModifier;
use crate::keyboard::PasteShortcut;
-use std::collections::{HashSet, HashMap};
-use log::{error};
-use std::fmt;
+use crate::matcher::{Match, MatchVariable};
+use log::error;
+use serde::{Deserialize, Serialize};
+use std::collections::{HashMap, HashSet};
use std::error::Error;
+use std::fmt;
+use std::fs;
+use std::fs::{create_dir_all, File};
+use std::io::Read;
+use std::path::{Path, PathBuf};
use walkdir::WalkDir;
pub(crate) mod runtime;
-const DEFAULT_CONFIG_FILE_CONTENT : &str = include_str!("../res/config.yml");
+const DEFAULT_CONFIG_FILE_CONTENT: &str = include_str!("../res/config.yml");
-pub const DEFAULT_CONFIG_FILE_NAME : &str = "default.yml";
+pub const DEFAULT_CONFIG_FILE_NAME: &str = "default.yml";
pub const USER_CONFIGS_FOLDER_NAME: &str = "user";
// Default values for primitives
-fn default_name() -> String{ "default".to_owned() }
-fn default_parent() -> String{ "self".to_owned() }
-fn default_filter_title() -> String{ "".to_owned() }
-fn default_filter_class() -> String{ "".to_owned() }
-fn default_filter_exec() -> String{ "".to_owned() }
-fn default_log_level() -> i32 { 0 }
-fn default_conflict_check() -> bool{ false }
-fn default_ipc_server_port() -> i32 { 34982 }
-fn default_worker_ipc_server_port() -> i32 { 34983 }
-fn default_use_system_agent() -> bool { true }
-fn default_config_caching_interval() -> i32 { 800 }
-fn default_word_separators() -> Vec { vec![' ', ',', '.', '?', '!', '\r', '\n', 22u8 as char] }
-fn default_toggle_interval() -> u32 { 230 }
-fn default_toggle_key() -> KeyModifier { KeyModifier::ALT }
-fn default_preserve_clipboard() -> bool {true}
-fn default_passive_match_regex() -> String{ "(?P:\\p{L}+)(/(?P.*)/)?".to_owned() }
-fn default_passive_arg_delimiter() -> char { '/' }
-fn default_passive_arg_escape() -> char { '\\' }
-fn default_passive_key() -> KeyModifier { KeyModifier::OFF }
-fn default_enable_passive() -> bool { false }
-fn default_enable_active() -> bool { true }
-fn default_backspace_limit() -> i32 { 3 }
-fn default_backspace_delay() -> i32 { 0 }
-fn default_inject_delay() -> i32 { 0 }
-fn default_restore_clipboard_delay() -> i32 { 300 }
-fn default_exclude_default_entries() -> bool {false}
-fn default_secure_input_watcher_enabled() -> bool {true}
-fn default_secure_input_notification() -> bool {true}
-fn default_show_notifications() -> bool {true}
-fn default_auto_restart() -> bool {false}
-fn default_show_icon() -> bool {true}
-fn default_fast_inject() -> bool {true}
-fn default_secure_input_watcher_interval() -> i32 {5000}
-fn default_matches() -> Vec { Vec::new() }
-fn default_global_vars() -> Vec { Vec::new() }
+fn default_name() -> String {
+ "default".to_owned()
+}
+fn default_parent() -> String {
+ "self".to_owned()
+}
+fn default_filter_title() -> String {
+ "".to_owned()
+}
+fn default_filter_class() -> String {
+ "".to_owned()
+}
+fn default_filter_exec() -> String {
+ "".to_owned()
+}
+fn default_log_level() -> i32 {
+ 0
+}
+fn default_conflict_check() -> bool {
+ false
+}
+fn default_ipc_server_port() -> i32 {
+ 34982
+}
+fn default_worker_ipc_server_port() -> i32 {
+ 34983
+}
+fn default_use_system_agent() -> bool {
+ true
+}
+fn default_config_caching_interval() -> i32 {
+ 800
+}
+fn default_word_separators() -> Vec {
+ vec![' ', ',', '.', '?', '!', '\r', '\n', 22u8 as char]
+}
+fn default_toggle_interval() -> u32 {
+ 230
+}
+fn default_toggle_key() -> KeyModifier {
+ KeyModifier::ALT
+}
+fn default_preserve_clipboard() -> bool {
+ true
+}
+fn default_passive_match_regex() -> String {
+ "(?P:\\p{L}+)(/(?P.*)/)?".to_owned()
+}
+fn default_passive_arg_delimiter() -> char {
+ '/'
+}
+fn default_passive_arg_escape() -> char {
+ '\\'
+}
+fn default_passive_key() -> KeyModifier {
+ KeyModifier::OFF
+}
+fn default_enable_passive() -> bool {
+ false
+}
+fn default_enable_active() -> bool {
+ true
+}
+fn default_backspace_limit() -> i32 {
+ 3
+}
+fn default_backspace_delay() -> i32 {
+ 0
+}
+fn default_inject_delay() -> i32 {
+ 0
+}
+fn default_restore_clipboard_delay() -> i32 {
+ 300
+}
+fn default_exclude_default_entries() -> bool {
+ false
+}
+fn default_secure_input_watcher_enabled() -> bool {
+ true
+}
+fn default_secure_input_notification() -> bool {
+ true
+}
+fn default_show_notifications() -> bool {
+ true
+}
+fn default_auto_restart() -> bool {
+ false
+}
+fn default_show_icon() -> bool {
+ true
+}
+fn default_fast_inject() -> bool {
+ true
+}
+fn default_secure_input_watcher_interval() -> i32 {
+ 5000
+}
+fn default_matches() -> Vec {
+ Vec::new()
+}
+fn default_global_vars() -> Vec {
+ Vec::new()
+}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Configs {
@@ -113,7 +183,7 @@ pub struct Configs {
pub config_caching_interval: i32,
#[serde(default = "default_word_separators")]
- pub word_separators: Vec, // TODO: add parsing test
+ pub word_separators: Vec, // TODO: add parsing test
#[serde(default = "default_toggle_key")]
pub toggle_key: KeyModifier,
@@ -188,8 +258,7 @@ pub struct Configs {
pub matches: Vec,
#[serde(default = "default_global_vars")]
- pub global_vars: Vec
-
+ pub global_vars: Vec,
}
// Macro used to validate config fields
@@ -216,7 +285,11 @@ impl Configs {
fn validate_user_defined_config(&self) -> bool {
let mut result = true;
- validate_field!(result, self.config_caching_interval, default_config_caching_interval());
+ validate_field!(
+ result,
+ self.config_caching_interval,
+ default_config_caching_interval()
+ );
validate_field!(result, self.log_level, default_log_level());
validate_field!(result, self.conflict_check, default_conflict_check());
validate_field!(result, self.toggle_key, default_toggle_key());
@@ -224,16 +297,52 @@ impl Configs {
validate_field!(result, self.backspace_limit, default_backspace_limit());
validate_field!(result, self.ipc_server_port, default_ipc_server_port());
validate_field!(result, self.use_system_agent, default_use_system_agent());
- validate_field!(result, self.preserve_clipboard, default_preserve_clipboard());
- validate_field!(result, self.passive_match_regex, default_passive_match_regex());
- validate_field!(result, self.passive_arg_delimiter, default_passive_arg_delimiter());
- validate_field!(result, self.passive_arg_escape, default_passive_arg_escape());
+ validate_field!(
+ result,
+ self.preserve_clipboard,
+ default_preserve_clipboard()
+ );
+ validate_field!(
+ result,
+ self.passive_match_regex,
+ default_passive_match_regex()
+ );
+ validate_field!(
+ result,
+ self.passive_arg_delimiter,
+ default_passive_arg_delimiter()
+ );
+ validate_field!(
+ result,
+ self.passive_arg_escape,
+ default_passive_arg_escape()
+ );
validate_field!(result, self.passive_key, default_passive_key());
- validate_field!(result, self.restore_clipboard_delay, default_restore_clipboard_delay());
- validate_field!(result, self.secure_input_watcher_enabled, default_secure_input_watcher_enabled());
- validate_field!(result, self.secure_input_watcher_interval, default_secure_input_watcher_interval());
- validate_field!(result, self.secure_input_notification, default_secure_input_notification());
- validate_field!(result, self.show_notifications, default_show_notifications());
+ validate_field!(
+ result,
+ self.restore_clipboard_delay,
+ default_restore_clipboard_delay()
+ );
+ validate_field!(
+ result,
+ self.secure_input_watcher_enabled,
+ default_secure_input_watcher_enabled()
+ );
+ validate_field!(
+ result,
+ self.secure_input_watcher_interval,
+ default_secure_input_watcher_interval()
+ );
+ validate_field!(
+ result,
+ self.secure_input_notification,
+ default_secure_input_notification()
+ );
+ validate_field!(
+ result,
+ self.show_notifications,
+ default_show_notifications()
+ );
validate_field!(result, self.show_icon, default_show_icon());
result
@@ -256,7 +365,7 @@ pub enum BackendType {
// when an injection is possible (only ascii characters in the replacement), and falling
// back to the Clipboard backend otherwise.
// Should only be used on Linux systems.
- Auto
+ Auto,
}
impl Default for BackendType {
// The default backend varies based on the operating system.
@@ -285,18 +394,16 @@ impl Configs {
let res = file.read_to_string(&mut contents);
if res.is_err() {
- return Err(ConfigLoadError::UnableToReadFile)
+ return Err(ConfigLoadError::UnableToReadFile);
}
let config_res = serde_yaml::from_str(&contents);
match config_res {
Ok(config) => Ok(config),
- Err(e) => {
- Err(ConfigLoadError::InvalidYAML(path.to_owned(), e.to_string()))
- }
+ Err(e) => Err(ConfigLoadError::InvalidYAML(path.to_owned(), e.to_string())),
}
- }else{
+ } else {
eprintln!("Error: Cannot load file {:?}", path);
Err(ConfigLoadError::FileNotFound)
}
@@ -309,9 +416,16 @@ impl Configs {
merged_matches.iter().for_each(|m| {
match_trigger_set.extend(m.triggers.clone());
});
- let parent_matches : Vec = self.matches.iter().filter(|&m| {
- !m.triggers.iter().any(|trigger| match_trigger_set.contains(trigger))
- }).cloned().collect();
+ let parent_matches: Vec = self
+ .matches
+ .iter()
+ .filter(|&m| {
+ !m.triggers
+ .iter()
+ .any(|trigger| match_trigger_set.contains(trigger))
+ })
+ .cloned()
+ .collect();
merged_matches.extend(parent_matches);
self.matches = merged_matches;
@@ -322,9 +436,12 @@ impl Configs {
merged_global_vars.iter().for_each(|m| {
vars_name_set.insert(m.name.clone());
});
- let parent_vars : Vec = self.global_vars.iter().filter(|&m| {
- !vars_name_set.contains(&m.name)
- }).cloned().collect();
+ let parent_vars: Vec = self
+ .global_vars
+ .iter()
+ .filter(|&m| !vars_name_set.contains(&m.name))
+ .cloned()
+ .collect();
merged_global_vars.extend(parent_vars);
self.global_vars = merged_global_vars;
@@ -336,9 +453,16 @@ impl Configs {
self.matches.iter().for_each(|m| {
match_trigger_set.extend(m.triggers.clone());
});
- let default_matches : Vec = default.matches.iter().filter(|&m| {
- !m.triggers.iter().any(|trigger| match_trigger_set.contains(trigger))
- }).cloned().collect();
+ let default_matches: Vec = default
+ .matches
+ .iter()
+ .filter(|&m| {
+ !m.triggers
+ .iter()
+ .any(|trigger| match_trigger_set.contains(trigger))
+ })
+ .cloned()
+ .collect();
self.matches.extend(default_matches);
@@ -347,12 +471,14 @@ impl Configs {
self.global_vars.iter().for_each(|m| {
vars_name_set.insert(m.name.clone());
});
- let default_vars : Vec = default.global_vars.iter().filter(|&m| {
- !vars_name_set.contains(&m.name)
- }).cloned().collect();
+ let default_vars: Vec = default
+ .global_vars
+ .iter()
+ .filter(|&m| !vars_name_set.contains(&m.name))
+ .cloned()
+ .collect();
self.global_vars.extend(default_vars);
-
}
}
@@ -365,7 +491,7 @@ pub struct ConfigSet {
impl ConfigSet {
pub fn load(config_dir: &Path, package_dir: &Path) -> Result {
if !config_dir.is_dir() {
- return Err(ConfigLoadError::InvalidConfigDirectory)
+ return Err(ConfigLoadError::InvalidConfigDirectory);
}
// Load default configuration
@@ -404,12 +530,24 @@ impl ConfigSet {
let path = entry.path();
// Skip non-yaml config files
- if path.extension().unwrap_or_default().to_str().unwrap_or_default() != "yml" {
+ if path
+ .extension()
+ .unwrap_or_default()
+ .to_str()
+ .unwrap_or_default()
+ != "yml"
+ {
continue;
}
// Skip hidden files
- if path.file_name().unwrap_or_default().to_str().unwrap_or_default().starts_with(".") {
+ if path
+ .file_name()
+ .unwrap_or_default()
+ .to_str()
+ .unwrap_or_default()
+ .starts_with(".")
+ {
continue;
}
@@ -417,7 +555,7 @@ impl ConfigSet {
// Make sure the config does not contain reserved fields
if !config.validate_user_defined_config() {
- return Err(ConfigLoadError::InvalidParameter(path.to_owned()))
+ return Err(ConfigLoadError::InvalidParameter(path.to_owned()));
}
// No name specified, defaulting to the path name
@@ -431,14 +569,19 @@ impl ConfigSet {
name_set.insert(config.name.clone());
- if config.parent == "self" { // No parent, root config
+ if config.parent == "self" {
+ // No parent, root config
root_configs.push(config);
- }else{ // Children config
+ } else {
+ // Children config
let children_vec = children_map.entry(config.parent.clone()).or_default();
children_vec.push(config);
}
- }else{
- eprintln!("Warning: Unable to read config file: {}", entry.unwrap_err())
+ } else {
+ eprintln!(
+ "Warning: Unable to read config file: {}",
+ entry.unwrap_err()
+ )
}
}
@@ -450,7 +593,7 @@ impl ConfigSet {
}
// Separate default from specific
- let default= configs.get(0).unwrap().clone();
+ let default = configs.get(0).unwrap().clone();
let mut specific = (&configs[1..]).to_vec().clone();
// Add default entries to specific configs when needed
@@ -466,14 +609,13 @@ impl ConfigSet {
let has_conflicts = Self::has_conflicts(&default, &specific);
if has_conflicts {
eprintln!("Warning: some triggers had conflicts and may not behave as intended");
- eprintln!("To turn off this check, add \"conflict_check: false\" in the configuration");
+ eprintln!(
+ "To turn off this check, add \"conflict_check: false\" in the configuration"
+ );
}
}
- Ok(ConfigSet {
- default,
- specific
- })
+ Ok(ConfigSet { default, specific })
}
fn reduce_configs(target: Configs, children_map: &HashMap>) -> Configs {
@@ -484,7 +626,7 @@ impl ConfigSet {
target.merge_config(children);
}
target
- }else{
+ } else {
target
}
}
@@ -500,7 +642,7 @@ impl ConfigSet {
if !default_file.exists() {
let result = fs::write(&default_file, DEFAULT_CONFIG_FILE_CONTENT);
if result.is_err() {
- return Err(ConfigLoadError::UnableToCreateDefaultConfig)
+ return Err(ConfigLoadError::UnableToCreateDefaultConfig);
}
}
@@ -510,34 +652,34 @@ impl ConfigSet {
if !user_config_dir.exists() {
let res = create_dir_all(user_config_dir.as_path());
if res.is_err() {
- return Err(ConfigLoadError::UnableToCreateDefaultConfig)
+ return Err(ConfigLoadError::UnableToCreateDefaultConfig);
}
}
-
// Packages
let package_dir = crate::context::get_package_dir();
let res = create_dir_all(package_dir.as_path());
if res.is_err() {
- return Err(ConfigLoadError::UnableToCreateDefaultConfig) // TODO: change error type
+ return Err(ConfigLoadError::UnableToCreateDefaultConfig); // TODO: change error type
}
return ConfigSet::load(config_dir.as_path(), package_dir.as_path());
}
fn has_conflicts(default: &Configs, specific: &Vec) -> bool {
- let mut sorted_triggers : Vec = default.matches.iter().flat_map(|t| {
- t.triggers.clone()
- }).collect();
+ let mut sorted_triggers: Vec = default
+ .matches
+ .iter()
+ .flat_map(|t| t.triggers.clone())
+ .collect();
sorted_triggers.sort();
let mut has_conflicts = Self::list_has_conflicts(&sorted_triggers);
for s in specific.iter() {
- let mut specific_triggers : Vec = s.matches.iter().flat_map(|t| {
- t.triggers.clone()
- }).collect();
+ let mut specific_triggers: Vec =
+ s.matches.iter().flat_map(|t| t.triggers.clone()).collect();
specific_triggers.sort();
has_conflicts |= Self::list_has_conflicts(&specific_triggers);
}
@@ -547,7 +689,7 @@ impl ConfigSet {
fn list_has_conflicts(sorted_list: &Vec) -> bool {
if sorted_list.len() <= 1 {
- return false
+ return false;
}
let mut has_conflicts = false;
@@ -556,7 +698,10 @@ impl ConfigSet {
let previous = &sorted_list[i];
if item.starts_with(previous) {
has_conflicts = true;
- eprintln!("Warning: trigger '{}' is conflicting with '{}' and may not behave as intended", item, previous);
+ eprintln!(
+ "Warning: trigger '{}' is conflicting with '{}' and may not behave as intended",
+ item, previous
+ );
}
}
@@ -610,17 +755,16 @@ impl Error for ConfigLoadError {
}
}
-
-
#[cfg(test)]
mod tests {
use super::*;
+ use crate::matcher::MatchContentType;
use std::io::Write;
use tempfile::{NamedTempFile, TempDir};
- use crate::matcher::{MatchContentType};
- const TEST_WORKING_CONFIG_FILE : &str = include_str!("../res/test/working_config.yml");
- const TEST_CONFIG_FILE_WITH_BAD_YAML : &str = include_str!("../res/test/config_with_bad_yaml.yml");
+ const TEST_WORKING_CONFIG_FILE: &str = include_str!("../res/test/working_config.yml");
+ const TEST_CONFIG_FILE_WITH_BAD_YAML: &str =
+ include_str!("../res/test/config_with_bad_yaml.yml");
// Test Configs
@@ -646,16 +790,17 @@ mod tests {
let broken_config_file = create_tmp_file(TEST_CONFIG_FILE_WITH_BAD_YAML);
let config = Configs::load_config(broken_config_file.path());
match config {
- Ok(_) => {assert!(false)},
+ Ok(_) => assert!(false),
Err(e) => {
match e {
- ConfigLoadError::InvalidYAML(p, _) => assert_eq!(p, broken_config_file.path().to_owned()),
+ ConfigLoadError::InvalidYAML(p, _) => {
+ assert_eq!(p, broken_config_file.path().to_owned())
+ }
_ => assert!(false),
}
assert!(true);
- },
+ }
}
-
}
#[test]
@@ -674,59 +819,69 @@ mod tests {
#[test]
fn test_user_defined_config_does_not_have_reserved_fields() {
- let working_config_file = create_tmp_file(r###"
+ let working_config_file = create_tmp_file(
+ r###"
backend: Clipboard
- "###);
+ "###,
+ );
let config = Configs::load_config(working_config_file.path());
assert_eq!(config.unwrap().validate_user_defined_config(), true);
}
#[test]
fn test_user_defined_config_has_reserved_fields_config_caching_interval() {
- let working_config_file = create_tmp_file(r###"
+ let working_config_file = create_tmp_file(
+ r###"
# This should not happen in an app-specific config
config_caching_interval: 100
- "###);
+ "###,
+ );
let config = Configs::load_config(working_config_file.path());
assert_eq!(config.unwrap().validate_user_defined_config(), false);
}
#[test]
fn test_user_defined_config_has_reserved_fields_toggle_key() {
- let working_config_file = create_tmp_file(r###"
+ let working_config_file = create_tmp_file(
+ r###"
# This should not happen in an app-specific config
toggle_key: CTRL
- "###);
+ "###,
+ );
let config = Configs::load_config(working_config_file.path());
assert_eq!(config.unwrap().validate_user_defined_config(), false);
}
#[test]
fn test_user_defined_config_has_reserved_fields_toggle_interval() {
- let working_config_file = create_tmp_file(r###"
+ let working_config_file = create_tmp_file(
+ r###"
# This should not happen in an app-specific config
toggle_interval: 1000
- "###);
+ "###,
+ );
let config = Configs::load_config(working_config_file.path());
assert_eq!(config.unwrap().validate_user_defined_config(), false);
}
#[test]
fn test_user_defined_config_has_reserved_fields_backspace_limit() {
- let working_config_file = create_tmp_file(r###"
+ let working_config_file = create_tmp_file(
+ r###"
# This should not happen in an app-specific config
backspace_limit: 10
- "###);
+ "###,
+ );
let config = Configs::load_config(working_config_file.path());
assert_eq!(config.unwrap().validate_user_defined_config(), false);
}
@@ -744,7 +899,9 @@ mod tests {
create_temp_espanso_directories_with_default_content(DEFAULT_CONFIG_FILE_CONTENT)
}
- pub fn create_temp_espanso_directories_with_default_content(default_content: &str) -> (TempDir, TempDir) {
+ pub fn create_temp_espanso_directories_with_default_content(
+ default_content: &str,
+ ) -> (TempDir, TempDir) {
let data_dir = TempDir::new().expect("unable to create data directory");
let package_dir = TempDir::new().expect("unable to create package directory");
@@ -771,7 +928,12 @@ mod tests {
create_temp_file_in_dir(&user_config_dir, name, content)
}
- pub fn create_package_file(package_data_dir: &Path, package_name: &str, filename: &str, content: &str) -> PathBuf {
+ pub fn create_package_file(
+ package_data_dir: &Path,
+ package_name: &str,
+ filename: &str,
+ content: &str,
+ ) -> PathBuf {
let package_dir = package_data_dir.join(package_name);
if !package_dir.exists() {
create_dir_all(&package_dir).unwrap();
@@ -792,7 +954,10 @@ mod tests {
fn test_config_set_load_fail_bad_directory() {
let config_set = ConfigSet::load(Path::new("invalid/path"), Path::new("invalid/path"));
assert_eq!(config_set.is_err(), true);
- assert_eq!(config_set.unwrap_err(), ConfigLoadError::InvalidConfigDirectory);
+ assert_eq!(
+ config_set.unwrap_err(),
+ ConfigLoadError::InvalidConfigDirectory
+ );
}
#[test]
@@ -807,21 +972,20 @@ mod tests {
#[test]
fn test_config_set_invalid_yaml_syntax() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
- TEST_CONFIG_FILE_WITH_BAD_YAML
- );
+ let (data_dir, package_dir) =
+ create_temp_espanso_directories_with_default_content(TEST_CONFIG_FILE_WITH_BAD_YAML);
let default_path = data_dir.path().join(DEFAULT_CONFIG_FILE_NAME);
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
match config_set {
- Ok(_) => {assert!(false)},
+ Ok(_) => assert!(false),
Err(e) => {
match e {
ConfigLoadError::InvalidYAML(p, _) => assert_eq!(p, default_path),
_ => assert!(false),
}
assert!(true);
- },
+ }
}
}
@@ -829,117 +993,179 @@ mod tests {
fn test_config_set_specific_file_with_reserved_fields() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- let user_defined_path = create_user_config_file(data_dir.path(), "specific.yml", r###"
+ let user_defined_path = create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
config_caching_interval: 10000
- "###);
+ "###,
+ );
let user_defined_path_copy = user_defined_path.clone();
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_err());
- assert_eq!(config_set.unwrap_err(), ConfigLoadError::InvalidParameter(user_defined_path_copy))
+ assert_eq!(
+ config_set.unwrap_err(),
+ ConfigLoadError::InvalidParameter(user_defined_path_copy)
+ )
}
#[test]
fn test_config_set_specific_file_missing_name_auto_generated() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- let user_defined_path = create_user_config_file(data_dir.path(), "specific.yml", r###"
+ let user_defined_path = create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
backend: Clipboard
- "###);
+ "###,
+ );
let user_defined_path_copy = user_defined_path.clone();
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- assert_eq!(config_set.unwrap().specific[0].name, user_defined_path_copy.to_str().unwrap_or_default())
+ assert_eq!(
+ config_set.unwrap().specific[0].name,
+ user_defined_path_copy.to_str().unwrap_or_default()
+ )
}
#[test]
fn test_config_set_specific_file_duplicate_name() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
name: specific1
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_err());
- assert!(variant_eq(&config_set.unwrap_err(), &ConfigLoadError::NameDuplicate(PathBuf::new())))
+ assert!(variant_eq(
+ &config_set.unwrap_err(),
+ &ConfigLoadError::NameDuplicate(PathBuf::new())
+ ))
}
#[test]
fn test_user_defined_config_set_merge_with_parent_matches() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ":lol"
replace: "LOL"
- trigger: ":yess"
replace: "Bob"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific1.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific1.yml",
+ r###"
name: specific1
matches:
- trigger: "hello"
replace: "newstring"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.default.matches.len(), 2);
assert_eq!(config_set.specific[0].matches.len(), 3);
- assert!(config_set.specific[0].matches.iter().find(|x| x.triggers[0] == "hello").is_some());
- assert!(config_set.specific[0].matches.iter().find(|x| x.triggers[0] == ":lol").is_some());
- assert!(config_set.specific[0].matches.iter().find(|x| x.triggers[0] == ":yess").is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| x.triggers[0] == "hello")
+ .is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| x.triggers[0] == ":lol")
+ .is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| x.triggers[0] == ":yess")
+ .is_some());
}
#[test]
fn test_user_defined_config_set_merge_with_parent_matches_child_priority() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ":lol"
replace: "LOL"
- trigger: ":yess"
replace: "Bob"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
name: specific1
matches:
- trigger: ":lol"
replace: "newstring"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.default.matches.len(), 2);
assert_eq!(config_set.specific[0].matches.len(), 2);
- assert!(config_set.specific[0].matches.iter().find(|x| {
- if let MatchContentType::Text(content) = &x.content {
- x.triggers[0] == ":lol" && content.replace == "newstring"
- }else{
- false
- }
- }).is_some());
- assert!(config_set.specific[0].matches.iter().find(|x| x.triggers[0] == ":yess").is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| {
+ if let MatchContentType::Text(content) = &x.content {
+ x.triggers[0] == ":lol" && content.replace == "newstring"
+ } else {
+ false
+ }
+ })
+ .is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| x.triggers[0] == ":yess")
+ .is_some());
}
#[test]
fn test_user_defined_config_set_exclude_merge_with_parent_matches() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ":lol"
replace: "LOL"
- trigger: ":yess"
replace: "Bob"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
name: specific1
exclude_default_entries: true
@@ -947,19 +1173,24 @@ mod tests {
matches:
- trigger: "hello"
replace: "newstring"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.default.matches.len(), 2);
assert_eq!(config_set.specific[0].matches.len(), 1);
- assert!(config_set.specific[0].matches.iter().find(|x| {
- if let MatchContentType::Text(content) = &x.content {
- x.triggers[0] == "hello" && content.replace == "newstring"
- }else{
- false
- }
- }).is_some());
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .find(|x| {
+ if let MatchContentType::Text(content) = &x.content {
+ x.triggers[0] == "hello" && content.replace == "newstring"
+ } else {
+ false
+ }
+ })
+ .is_some());
}
#[test]
@@ -971,10 +1202,13 @@ mod tests {
replace: "LOL"
- trigger: ":yess"
replace: "Bob"
- "###
+ "###,
);
- create_user_config_file(data_dir.path(), "specific.zzz", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.zzz",
+ r###"
name: specific1
exclude_default_entries: true
@@ -982,7 +1216,8 @@ mod tests {
matches:
- trigger: "hello"
replace: "newstring"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
@@ -997,10 +1232,13 @@ mod tests {
replace: "LOL"
- trigger: ":yess"
replace: "Bob"
- "###
+ "###,
);
- create_user_config_file(data_dir.path(), ".specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ ".specific.yml",
+ r###"
name: specific1
exclude_default_entries: true
@@ -1008,7 +1246,8 @@ mod tests {
matches:
- trigger: "hello"
replace: "newstring"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
@@ -1018,13 +1257,21 @@ mod tests {
fn test_config_set_no_parent_configs_works_correctly() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
name: specific2
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 2);
@@ -1032,97 +1279,156 @@ mod tests {
#[test]
fn test_config_set_default_parent_works_correctly() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
parent: default
matches:
- trigger: "hello"
replace: "world"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
assert_eq!(config_set.default.matches.len(), 2);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hello"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hello"));
}
#[test]
fn test_config_set_no_parent_should_not_merge() {
- let (data_dir, package_dir)= create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
matches:
- trigger: "hello"
replace: "world"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 1);
assert_eq!(config_set.default.matches.len(), 1);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(!config_set.default.matches.iter().any(|m| m.triggers[0] == "hello"));
- assert!(config_set.specific[0].matches.iter().any(|m| m.triggers[0] == "hello"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(!config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hello"));
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hello"));
}
#[test]
fn test_config_set_default_nested_parent_works_correctly() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: custom1
parent: default
matches:
- trigger: "hello"
replace: "world"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
parent: custom1
matches:
- trigger: "super"
replace: "mario"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
assert_eq!(config_set.default.matches.len(), 3);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hello"));
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "super"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hello"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "super"));
}
#[test]
fn test_config_set_parent_merge_children_priority_should_be_higher() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
parent: default
matches:
- trigger: "hasta"
replace: "world"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
@@ -1130,7 +1436,7 @@ mod tests {
assert!(config_set.default.matches.iter().any(|m| {
if let MatchContentType::Text(content) = &m.content {
m.triggers[0] == "hasta" && content.replace == "world"
- }else{
+ } else {
false
}
}));
@@ -1138,117 +1444,181 @@ mod tests {
#[test]
fn test_config_set_package_configs_default_merge() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_package_file(package_dir.path(), "package1", "package.yml", r###"
+ create_package_file(
+ package_dir.path(),
+ "package1",
+ "package.yml",
+ r###"
parent: default
matches:
- trigger: "harry"
replace: "potter"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
assert_eq!(config_set.default.matches.len(), 2);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "harry"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "harry"));
}
#[test]
fn test_config_set_package_configs_without_merge() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_package_file(package_dir.path(), "package1", "package.yml", r###"
+ create_package_file(
+ package_dir.path(),
+ "package1",
+ "package.yml",
+ r###"
matches:
- trigger: "harry"
replace: "potter"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 1);
assert_eq!(config_set.default.matches.len(), 1);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(config_set.specific[0].matches.iter().any(|m| m.triggers[0] == "harry"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "harry"));
}
#[test]
fn test_config_set_package_configs_multiple_files() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: hasta
replace: Hasta la vista
- "###);
+ "###,
+ );
- create_package_file(package_dir.path(), "package1", "package.yml", r###"
+ create_package_file(
+ package_dir.path(),
+ "package1",
+ "package.yml",
+ r###"
name: package1
matches:
- trigger: "harry"
replace: "potter"
- "###);
+ "###,
+ );
- create_package_file(package_dir.path(), "package1", "addon.yml", r###"
+ create_package_file(
+ package_dir.path(),
+ "package1",
+ "addon.yml",
+ r###"
parent: package1
matches:
- trigger: "ron"
replace: "weasley"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 1);
assert_eq!(config_set.default.matches.len(), 1);
- assert!(config_set.default.matches.iter().any(|m| m.triggers[0] == "hasta"));
- assert!(config_set.specific[0].matches.iter().any(|m| m.triggers[0] == "harry"));
- assert!(config_set.specific[0].matches.iter().any(|m| m.triggers[0] == "ron"));
+ assert!(config_set
+ .default
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "hasta"));
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "harry"));
+ assert!(config_set.specific[0]
+ .matches
+ .iter()
+ .any(|m| m.triggers[0] == "ron"));
}
#[test]
fn test_list_has_conflict_no_conflict() {
- assert_eq!(ConfigSet::list_has_conflicts(&vec!(":ab".to_owned(), ":bc".to_owned())), false);
+ assert_eq!(
+ ConfigSet::list_has_conflicts(&vec!(":ab".to_owned(), ":bc".to_owned())),
+ false
+ );
}
#[test]
fn test_list_has_conflict_conflict() {
- let mut list = vec!("ac".to_owned(), "ab".to_owned(), "abc".to_owned());
+ let mut list = vec!["ac".to_owned(), "ab".to_owned(), "abc".to_owned()];
list.sort();
assert_eq!(ConfigSet::list_has_conflicts(&list), true);
}
#[test]
fn test_has_conflict_no_conflict() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ac
replace: Hasta la vista
- trigger: bc
replace: Jon
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
matches:
- trigger: "hello"
replace: "world"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
- assert_eq!(ConfigSet::has_conflicts(&config_set.default, &config_set.specific), false);
+ assert_eq!(
+ ConfigSet::has_conflicts(&config_set.default, &config_set.specific),
+ false
+ );
}
#[test]
fn test_has_conflict_conflict_in_default() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ac
replace: Hasta la vista
@@ -1256,134 +1626,195 @@ mod tests {
replace: Jon
- trigger: acb
replace: Error
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
matches:
- trigger: "hello"
replace: "world"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
- assert_eq!(ConfigSet::has_conflicts(&config_set.default, &config_set.specific), true);
+ assert_eq!(
+ ConfigSet::has_conflicts(&config_set.default, &config_set.specific),
+ true
+ );
}
#[test]
fn test_has_conflict_conflict_in_specific_and_default() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ac
replace: Hasta la vista
- trigger: bc
replace: Jon
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
matches:
- trigger: "bcd"
replace: "Conflict"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
- assert_eq!(ConfigSet::has_conflicts(&config_set.default, &config_set.specific), true);
+ assert_eq!(
+ ConfigSet::has_conflicts(&config_set.default, &config_set.specific),
+ true
+ );
}
#[test]
fn test_has_conflict_no_conflict_in_specific_and_specific() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
matches:
- trigger: ac
replace: Hasta la vista
- trigger: bc
replace: Jon
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
name: specific1
matches:
- trigger: "bad"
replace: "Conflict"
- "###);
- create_user_config_file(data_dir.path(), "specific2.yml", r###"
+ "###,
+ );
+ create_user_config_file(
+ data_dir.path(),
+ "specific2.yml",
+ r###"
name: specific2
matches:
- trigger: "badass"
replace: "Conflict"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
- assert_eq!(ConfigSet::has_conflicts(&config_set.default, &config_set.specific), false);
+ assert_eq!(
+ ConfigSet::has_conflicts(&config_set.default, &config_set.specific),
+ false
+ );
}
#[test]
fn test_config_set_specific_inherits_default_global_vars() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
global_vars:
- name: testvar
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
global_vars:
- name: specificvar
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 1);
assert_eq!(config_set.default.global_vars.len(), 1);
assert_eq!(config_set.specific[0].global_vars.len(), 2);
- assert!(config_set.specific[0].global_vars.iter().any(|m| m.name == "testvar"));
- assert!(config_set.specific[0].global_vars.iter().any(|m| m.name == "specificvar"));
+ assert!(config_set.specific[0]
+ .global_vars
+ .iter()
+ .any(|m| m.name == "testvar"));
+ assert!(config_set.specific[0]
+ .global_vars
+ .iter()
+ .any(|m| m.name == "specificvar"));
}
#[test]
fn test_config_set_default_get_variables_from_specific() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
global_vars:
- name: testvar
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
parent: default
global_vars:
- name: specificvar
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 0);
assert_eq!(config_set.default.global_vars.len(), 2);
- assert!(config_set.default.global_vars.iter().any(|m| m.name == "testvar"));
- assert!(config_set.default.global_vars.iter().any(|m| m.name == "specificvar"));
+ assert!(config_set
+ .default
+ .global_vars
+ .iter()
+ .any(|m| m.name == "testvar"));
+ assert!(config_set
+ .default
+ .global_vars
+ .iter()
+ .any(|m| m.name == "specificvar"));
}
#[test]
fn test_config_set_specific_dont_inherits_default_global_vars_when_exclude_is_on() {
- let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(r###"
+ let (data_dir, package_dir) = create_temp_espanso_directories_with_default_content(
+ r###"
global_vars:
- name: testvar
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
- create_user_config_file(data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ data_dir.path(),
+ "specific.yml",
+ r###"
exclude_default_entries: true
global_vars:
@@ -1391,12 +1822,16 @@ mod tests {
type: date
params:
format: "%m"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path()).unwrap();
assert_eq!(config_set.specific.len(), 1);
assert_eq!(config_set.default.global_vars.len(), 1);
assert_eq!(config_set.specific[0].global_vars.len(), 1);
- assert!(config_set.specific[0].global_vars.iter().any(|m| m.name == "specificvar"));
+ assert!(config_set.specific[0]
+ .global_vars
+ .iter()
+ .any(|m| m.name == "specificvar"));
}
-}
\ No newline at end of file
+}
diff --git a/src/config/runtime.rs b/src/config/runtime.rs
index 6a07fac..577897c 100644
--- a/src/config/runtime.rs
+++ b/src/config/runtime.rs
@@ -17,13 +17,13 @@
* along with espanso. If not, see .
*/
-use regex::Regex;
+use super::{ConfigSet, Configs};
+use crate::matcher::Match;
use crate::system::SystemManager;
+use log::{debug, warn};
+use regex::Regex;
use std::cell::RefCell;
use std::time::SystemTime;
-use log::{debug, warn};
-use super::{Configs, ConfigSet};
-use crate::matcher::Match;
pub struct RuntimeConfigManager<'a, S: SystemManager> {
set: ConfigSet,
@@ -37,10 +37,10 @@ pub struct RuntimeConfigManager<'a, S: SystemManager> {
// Cache
last_config_update: RefCell,
- last_config: RefCell>
+ last_config: RefCell>,
}
-impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
+impl<'a, S: SystemManager> RuntimeConfigManager<'a, S> {
pub fn new<'b>(set: ConfigSet, system_manager: S) -> RuntimeConfigManager<'b, S> {
// Compile all the regexps
let title_regexps = set.specific.iter().map(
@@ -101,7 +101,7 @@ impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
exec_regexps,
system_manager,
last_config_update,
- last_config
+ last_config,
}
}
@@ -118,10 +118,12 @@ impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
for (i, regex) in self.title_regexps.iter().enumerate() {
if let Some(regex) = regex {
if regex.is_match(&title) {
- debug!("Matched 'filter_title' for '{}' config, using custom settings.",
- self.set.specific[i].name);
+ debug!(
+ "Matched 'filter_title' for '{}' config, using custom settings.",
+ self.set.specific[i].name
+ );
- return &self.set.specific[i]
+ return &self.set.specific[i];
}
}
}
@@ -135,10 +137,12 @@ impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
for (i, regex) in self.exec_regexps.iter().enumerate() {
if let Some(regex) = regex {
if regex.is_match(&executable) {
- debug!("Matched 'filter_exec' for '{}' config, using custom settings.",
- self.set.specific[i].name);
+ debug!(
+ "Matched 'filter_exec' for '{}' config, using custom settings.",
+ self.set.specific[i].name
+ );
- return &self.set.specific[i]
+ return &self.set.specific[i];
}
}
}
@@ -152,10 +156,12 @@ impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
for (i, regex) in self.class_regexps.iter().enumerate() {
if let Some(regex) = regex {
if regex.is_match(&class) {
- debug!("Matched 'filter_class' for '{}' config, using custom settings.",
- self.set.specific[i].name);
+ debug!(
+ "Matched 'filter_class' for '{}' config, using custom settings.",
+ self.set.specific[i].name
+ );
- return &self.set.specific[i]
+ return &self.set.specific[i];
}
}
}
@@ -167,7 +173,7 @@ impl <'a, S: SystemManager> RuntimeConfigManager<'a, S> {
}
}
-impl <'a, S: SystemManager> super::ConfigManager<'a> for RuntimeConfigManager<'a, S> {
+impl<'a, S: SystemManager> super::ConfigManager<'a> for RuntimeConfigManager<'a, S> {
fn active_config(&'a self) -> &'a Configs {
let mut last_config_update = self.last_config_update.borrow_mut();
if let Ok(elapsed) = (*last_config_update).elapsed() {
@@ -204,8 +210,8 @@ impl <'a, S: SystemManager> super::ConfigManager<'a> for RuntimeConfigManager<'a
#[cfg(test)]
mod tests {
use super::*;
- use crate::config::ConfigManager;
use crate::config::tests::{create_temp_espanso_directories, create_user_config_file};
+ use crate::config::ConfigManager;
struct DummySystemManager {
title: RefCell,
@@ -225,10 +231,10 @@ mod tests {
}
impl DummySystemManager {
pub fn new_custom(title: &str, class: &str, exec: &str) -> DummySystemManager {
- DummySystemManager{
+ DummySystemManager {
title: RefCell::new(title.to_owned()),
class: RefCell::new(class.to_owned()),
- exec: RefCell::new(exec.to_owned())
+ exec: RefCell::new(exec.to_owned()),
}
}
@@ -247,21 +253,33 @@ mod tests {
fn test_runtime_constructor_regex_load_correctly() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: myname1
filter_exec: "Title"
- "###);
+ "###,
+ );
- create_user_config_file(&data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific2.yml",
+ r###"
name: myname2
filter_title: "Yeah"
filter_class: "Car"
- "###);
+ "###,
+ );
- create_user_config_file(&data_dir.path(), "specific3.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific3.yml",
+ r###"
name: myname3
filter_title: "Nice"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
@@ -270,12 +288,24 @@ mod tests {
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
- let sp1index = config_manager.set.specific
- .iter().position(|x| x.name == "myname1").unwrap();
- let sp2index = config_manager.set.specific
- .iter().position(|x| x.name == "myname2").unwrap();
- let sp3index = config_manager.set.specific
- .iter().position(|x| x.name == "myname3").unwrap();
+ let sp1index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname1")
+ .unwrap();
+ let sp2index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname2")
+ .unwrap();
+ let sp3index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname3")
+ .unwrap();
assert_eq!(config_manager.exec_regexps.len(), 3);
assert_eq!(config_manager.title_regexps.len(), 3);
@@ -298,21 +328,33 @@ mod tests {
fn test_runtime_constructor_malformed_regexes_are_ignored() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: myname1
filter_exec: "[`-_]"
- "###);
+ "###,
+ );
- create_user_config_file(&data_dir.path(), "specific2.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific2.yml",
+ r###"
name: myname2
filter_title: "[`-_]"
filter_class: "Car"
- "###);
+ "###,
+ );
- create_user_config_file(&data_dir.path(), "specific3.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific3.yml",
+ r###"
name: myname3
filter_title: "Nice"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
@@ -321,12 +363,24 @@ mod tests {
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
- let sp1index = config_manager.set.specific
- .iter().position(|x| x.name == "myname1").unwrap();
- let sp2index = config_manager.set.specific
- .iter().position(|x| x.name == "myname2").unwrap();
- let sp3index = config_manager.set.specific
- .iter().position(|x| x.name == "myname3").unwrap();
+ let sp1index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname1")
+ .unwrap();
+ let sp2index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname2")
+ .unwrap();
+ let sp3index = config_manager
+ .set
+ .specific
+ .iter()
+ .position(|x| x.name == "myname3")
+ .unwrap();
assert_eq!(config_manager.exec_regexps.len(), 3);
assert_eq!(config_manager.title_regexps.len(), 3);
@@ -349,15 +403,20 @@ mod tests {
fn test_runtime_calculate_active_config_specific_title_match() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: chrome
filter_title: "Chrome"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
@@ -368,15 +427,20 @@ mod tests {
fn test_runtime_calculate_active_config_specific_class_match() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: chrome
filter_class: "Chrome"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
@@ -387,15 +451,20 @@ mod tests {
fn test_runtime_calculate_active_config_specific_exec_match() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: chrome
filter_exec: "chrome.exe"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
@@ -406,16 +475,21 @@ mod tests {
fn test_runtime_calculate_active_config_specific_multi_filter_match() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: chrome
filter_class: Browser
filter_exec: "firefox.exe"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Browser", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Browser", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
@@ -426,15 +500,20 @@ mod tests {
fn test_runtime_calculate_active_config_no_match() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: firefox
filter_title: "Firefox"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
@@ -445,25 +524,32 @@ mod tests {
fn test_runtime_active_config_cache() {
let (data_dir, package_dir) = create_temp_espanso_directories();
- create_user_config_file(&data_dir.path(), "specific.yml", r###"
+ create_user_config_file(
+ &data_dir.path(),
+ "specific.yml",
+ r###"
name: firefox
filter_title: "Firefox"
- "###);
+ "###,
+ );
let config_set = ConfigSet::load(data_dir.path(), package_dir.path());
assert!(config_set.is_ok());
- let dummy_system_manager = DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
+ let dummy_system_manager =
+ DummySystemManager::new_custom("Google Chrome", "Chrome", "C:\\Path\\chrome.exe");
let config_manager = RuntimeConfigManager::new(config_set.unwrap(), dummy_system_manager);
assert_eq!(config_manager.active_config().name, "default");
assert_eq!(config_manager.calculate_active_config().name, "default");
- config_manager.system_manager.change("Firefox", "Browser", "C\\Path\\firefox.exe");
+ config_manager
+ .system_manager
+ .change("Firefox", "Browser", "C\\Path\\firefox.exe");
// Active config should have changed, but not cached one
assert_eq!(config_manager.calculate_active_config().name, "firefox");
assert_eq!(config_manager.active_config().name, "default");
}
-}
\ No newline at end of file
+}
diff --git a/src/context/linux.rs b/src/context/linux.rs
index 7089f78..6a4ddb1 100644
--- a/src/context/linux.rs
+++ b/src/context/linux.rs
@@ -17,18 +17,18 @@
* along with espanso. If not, see .
*/
-use std::sync::mpsc::Sender;
-use std::os::raw::{c_void, c_char};
-use crate::event::*;
-use crate::event::KeyModifier::*;
use crate::bridge::linux::*;
-use std::process::exit;
+use crate::config::Configs;
+use crate::event::KeyModifier::*;
+use crate::event::*;
use log::{debug, error};
use std::ffi::CStr;
+use std::os::raw::{c_char, c_void};
+use std::process::exit;
use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
use std::sync::atomic::Ordering::Acquire;
-use crate::config::Configs;
+use std::sync::mpsc::Sender;
+use std::sync::Arc;
#[repr(C)]
pub struct LinuxContext {
@@ -37,11 +37,13 @@ pub struct LinuxContext {
}
impl LinuxContext {
- pub fn new(_: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+ pub fn new(
+ _: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+ ) -> Box {
// Check if the X11 context is available
- let x11_available = unsafe {
- check_x11()
- };
+ let x11_available = unsafe { check_x11() };
if x11_available < 0 {
error!("Error, can't connect to X11 context");
@@ -50,7 +52,7 @@ impl LinuxContext {
let context = Box::new(LinuxContext {
send_channel,
- is_injecting
+ is_injecting,
});
unsafe {
@@ -79,14 +81,21 @@ impl super::Context for LinuxContext {
impl Drop for LinuxContext {
fn drop(&mut self) {
- unsafe { cleanup(); }
+ unsafe {
+ cleanup();
+ }
}
}
// Native bridge code
-extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, _len: i32,
- event_type: i32, key_code: i32) {
+extern "C" fn keypress_callback(
+ _self: *mut c_void,
+ raw_buffer: *const u8,
+ _len: i32,
+ event_type: i32,
+ key_code: i32,
+) {
unsafe {
let _self = _self as *mut LinuxContext;
@@ -98,7 +107,8 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, _len: i32
return;
}
- if event_type == 0 { // Char event
+ if event_type == 0 {
+ // Char event
// Convert the received buffer to a string
let c_str = CStr::from_ptr(raw_buffer as *const c_char);
let char_str = c_str.to_str();
@@ -108,12 +118,13 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, _len: i32
Ok(char_str) => {
let event = Event::Key(KeyEvent::Char(char_str.to_owned()));
(*_self).send_channel.send(event).unwrap();
- },
+ }
Err(e) => {
- debug!("Unable to receive char: {}",e);
- },
+ debug!("Unable to receive char: {}", e);
+ }
}
- }else if event_type == 1 { // Modifier event
+ } else if event_type == 1 {
+ // Modifier event
let modifier: Option = match key_code {
133 => Some(LEFT_META),
@@ -132,13 +143,15 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, _len: i32
if let Some(modifier) = modifier {
let event = Event::Key(KeyEvent::Modifier(modifier));
(*_self).send_channel.send(event).unwrap();
- }else{ // Not one of the default modifiers, send an "other" event
+ } else {
+ // Not one of the default modifiers, send an "other" event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
}
- }else{ // Other type of event
+ } else {
+ // Other type of event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/context/macos.rs b/src/context/macos.rs
index 48641a1..a5c9b54 100644
--- a/src/context/macos.rs
+++ b/src/context/macos.rs
@@ -17,23 +17,23 @@
* along with espanso. If not, see .
*/
-use std::sync::mpsc::Sender;
-use std::os::raw::{c_void, c_char};
use crate::bridge::macos::*;
-use crate::event::{Event, KeyEvent, KeyModifier, ActionType, SystemEvent};
+use crate::config::Configs;
use crate::event::KeyModifier::*;
-use std::ffi::{CString, CStr};
-use std::{fs, thread};
-use log::{info, error, debug};
+use crate::event::{ActionType, Event, KeyEvent, KeyModifier, SystemEvent};
+use crate::system::macos::MacSystemManager;
+use log::{debug, error, info};
+use std::cell::RefCell;
+use std::ffi::{CStr, CString};
+use std::os::raw::{c_char, c_void};
use std::process::exit;
use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
use std::sync::atomic::Ordering::Acquire;
-use crate::config::Configs;
-use std::cell::RefCell;
-use crate::system::macos::MacSystemManager;
+use std::sync::mpsc::Sender;
+use std::sync::Arc;
+use std::{fs, thread};
-const STATUS_ICON_BINARY : &[u8] = include_bytes!("../res/mac/icon.png");
+const STATUS_ICON_BINARY: &[u8] = include_bytes!("../res/mac/icon.png");
pub struct MacContext {
pub send_channel: Sender,
@@ -43,14 +43,20 @@ pub struct MacContext {
}
impl MacContext {
- pub fn new(config: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+ pub fn new(
+ config: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+ ) -> Box {
// Check accessibility
unsafe {
let res = prompt_accessibility();
if res == 0 {
error!("Accessibility must be enabled to make espanso work on MacOS.");
- error!("Please allow espanso in the Security & Privacy panel, then restart espanso.");
+ error!(
+ "Please allow espanso in the Security & Privacy panel, then restart espanso."
+ );
error!("For more information: https://espanso.org/install/mac/");
exit(1);
}
@@ -69,9 +75,12 @@ impl MacContext {
if status_icon_target.exists() {
info!("Status icon already initialized, skipping.");
- }else {
+ } else {
fs::write(&status_icon_target, STATUS_ICON_BINARY).unwrap_or_else(|e| {
- error!("Error copying the Status Icon to the espanso data directory: {}", e);
+ error!(
+ "Error copying the Status Icon to the espanso data directory: {}",
+ e
+ );
});
}
@@ -82,12 +91,9 @@ impl MacContext {
register_icon_click_callback(icon_click_callback);
register_context_menu_click_callback(context_menu_click_callback);
- let status_icon_path = CString::new(status_icon_target.to_str().unwrap_or_default()).unwrap_or_default();
- let show_icon = if config.show_icon {
- 1
- }else{
- 0
- };
+ let status_icon_path =
+ CString::new(status_icon_target.to_str().unwrap_or_default()).unwrap_or_default();
+ let show_icon = if config.show_icon { 1 } else { 0 };
initialize(context_ptr, status_icon_path.as_ptr(), show_icon);
}
@@ -155,8 +161,13 @@ impl super::Context for MacContext {
// Native bridge code
-extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, len: i32,
- event_type: i32, key_code: i32) {
+extern "C" fn keypress_callback(
+ _self: *mut c_void,
+ raw_buffer: *const u8,
+ len: i32,
+ event_type: i32,
+ key_code: i32,
+) {
unsafe {
let _self = _self as *mut MacContext;
@@ -168,7 +179,8 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, len: i32,
return;
}
- if event_type == 0 { // Char event
+ if event_type == 0 {
+ // Char event
// Convert the received buffer to a string
let c_str = CStr::from_ptr(raw_buffer as (*const c_char));
let char_str = c_str.to_str();
@@ -178,12 +190,13 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, len: i32,
Ok(char_str) => {
let event = Event::Key(KeyEvent::Char(char_str.to_owned()));
(*_self).send_channel.send(event).unwrap();
- },
+ }
Err(e) => {
- error!("Unable to receive char: {}",e);
- },
+ error!("Unable to receive char: {}", e);
+ }
}
- }else if event_type == 1 { // Modifier event
+ } else if event_type == 1 {
+ // Modifier event
let modifier: Option = match key_code {
0x37 => Some(LEFT_META),
0x36 => Some(RIGHT_META),
@@ -201,18 +214,20 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u8, len: i32,
if let Some(modifier) = modifier {
let event = Event::Key(KeyEvent::Modifier(modifier));
(*_self).send_channel.send(event).unwrap();
- }else{ // Not one of the default modifiers, send an "other" event
+ } else {
+ // Not one of the default modifiers, send an "other" event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
}
- }else{ // Other type of event
+ } else {
+ // Other type of event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
}
}
}
-extern fn icon_click_callback(_self: *mut c_void) {
+extern "C" fn icon_click_callback(_self: *mut c_void) {
unsafe {
let _self = _self as *mut MacContext;
@@ -221,7 +236,7 @@ extern fn icon_click_callback(_self: *mut c_void) {
}
}
-extern fn context_menu_click_callback(_self: *mut c_void, id: i32) {
+extern "C" fn context_menu_click_callback(_self: *mut c_void, id: i32) {
unsafe {
let _self = _self as *mut MacContext;
diff --git a/src/context/mod.rs b/src/context/mod.rs
index 0508cde..50805fb 100644
--- a/src/context/mod.rs
+++ b/src/context/mod.rs
@@ -26,13 +26,13 @@ mod linux;
#[cfg(target_os = "macos")]
pub(crate) mod macos;
-use std::sync::mpsc::Sender;
-use crate::event::Event;
-use std::path::PathBuf;
-use std::fs::create_dir_all;
-use std::sync::{Once, Arc};
-use std::sync::atomic::AtomicBool;
use crate::config::Configs;
+use crate::event::Event;
+use std::fs::create_dir_all;
+use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
+use std::sync::mpsc::Sender;
+use std::sync::{Arc, Once};
pub trait Context {
fn eventloop(&self);
@@ -40,25 +40,37 @@ pub trait Context {
// MAC IMPLEMENTATION
#[cfg(target_os = "macos")]
-pub fn new(config: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+pub fn new(
+ config: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+) -> Box {
macos::MacContext::new(config, send_channel, is_injecting)
}
// LINUX IMPLEMENTATION
#[cfg(target_os = "linux")]
-pub fn new(config: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+pub fn new(
+ config: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+) -> Box {
linux::LinuxContext::new(config, send_channel, is_injecting)
}
// WINDOWS IMPLEMENTATION
#[cfg(target_os = "windows")]
-pub fn new(config: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+pub fn new(
+ config: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+) -> Box {
windows::WindowsContext::new(config, send_channel, is_injecting)
}
// espanso directories
-static WARING_INIT : Once = Once::new();
+static WARING_INIT: Once = Once::new();
pub fn get_data_dir() -> PathBuf {
let data_dir = dirs::data_local_dir().expect("Can't obtain data_local_dir(), terminating.");
@@ -75,7 +87,10 @@ pub fn get_config_dir() -> PathBuf {
if let Some(parent) = exe_dir {
let config_dir = parent.join(".espanso");
if config_dir.exists() {
- println!("PORTABLE MODE, using config folder: '{}'", config_dir.to_string_lossy());
+ println!(
+ "PORTABLE MODE, using config folder: '{}'",
+ config_dir.to_string_lossy()
+ );
return config_dir;
}
}
@@ -110,7 +125,7 @@ pub fn get_config_dir() -> PathBuf {
espanso_dir
}
-const PACKAGES_FOLDER_NAME : &str = "packages";
+const PACKAGES_FOLDER_NAME: &str = "packages";
pub fn get_package_dir() -> PathBuf {
// Deprecated $HOME/.espanso/packages directory compatibility check
@@ -125,4 +140,4 @@ pub fn get_package_dir() -> PathBuf {
let package_dir = data_dir.join(PACKAGES_FOLDER_NAME);
create_dir_all(&package_dir).expect("Error creating espanso packages directory");
package_dir
-}
\ No newline at end of file
+}
diff --git a/src/context/windows.rs b/src/context/windows.rs
index 9465faf..ec92b57 100644
--- a/src/context/windows.rs
+++ b/src/context/windows.rs
@@ -17,21 +17,21 @@
* along with espanso. If not, see .
*/
-use std::sync::mpsc::Sender;
use crate::bridge::windows::*;
-use crate::event::{Event, KeyEvent, KeyModifier, ActionType};
-use crate::event::KeyModifier::*;
-use std::ffi::c_void;
-use std::{fs};
-use widestring::{U16CString, U16CStr};
-use log::{info, error, debug};
-use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
-use std::sync::atomic::Ordering::Acquire;
use crate::config::Configs;
+use crate::event::KeyModifier::*;
+use crate::event::{ActionType, Event, KeyEvent, KeyModifier};
+use log::{debug, error, info};
+use std::ffi::c_void;
+use std::fs;
+use std::sync::atomic::AtomicBool;
+use std::sync::atomic::Ordering::Acquire;
+use std::sync::mpsc::Sender;
+use std::sync::Arc;
+use widestring::{U16CStr, U16CString};
-const BMP_BINARY : &[u8] = include_bytes!("../res/win/espanso.bmp");
-const ICO_BINARY : &[u8] = include_bytes!("../res/win/espanso.ico");
+const BMP_BINARY: &[u8] = include_bytes!("../res/win/espanso.bmp");
+const ICO_BINARY: &[u8] = include_bytes!("../res/win/espanso.ico");
pub struct WindowsContext {
send_channel: Sender,
@@ -39,31 +39,42 @@ pub struct WindowsContext {
}
impl WindowsContext {
- pub fn new(config: Configs, send_channel: Sender, is_injecting: Arc) -> Box {
+ pub fn new(
+ config: Configs,
+ send_channel: Sender,
+ is_injecting: Arc,
+ ) -> Box {
// Initialize image resources
let espanso_dir = super::get_data_dir();
- info!("Initializing Espanso resources in {}", espanso_dir.as_path().display());
+ info!(
+ "Initializing Espanso resources in {}",
+ espanso_dir.as_path().display()
+ );
let espanso_bmp_image = espanso_dir.join("espansoicon.bmp");
if espanso_bmp_image.exists() {
info!("BMP already initialized, skipping.");
- }else {
- fs::write(&espanso_bmp_image, BMP_BINARY)
- .expect("Unable to write windows bmp file");
+ } else {
+ fs::write(&espanso_bmp_image, BMP_BINARY).expect("Unable to write windows bmp file");
- info!("Extracted bmp icon to: {}", espanso_bmp_image.to_str().unwrap_or("error"));
+ info!(
+ "Extracted bmp icon to: {}",
+ espanso_bmp_image.to_str().unwrap_or("error")
+ );
}
let espanso_ico_image = espanso_dir.join("espanso.ico");
if espanso_ico_image.exists() {
info!("ICO already initialized, skipping.");
- }else {
- fs::write(&espanso_ico_image, ICO_BINARY)
- .expect("Unable to write windows ico file");
+ } else {
+ fs::write(&espanso_ico_image, ICO_BINARY).expect("Unable to write windows ico file");
- info!("Extracted 'ico' icon to: {}", espanso_ico_image.to_str().unwrap_or("error"));
+ info!(
+ "Extracted 'ico' icon to: {}",
+ espanso_ico_image.to_str().unwrap_or("error")
+ );
}
let bmp_icon = espanso_bmp_image.to_str().unwrap_or_default();
@@ -71,7 +82,7 @@ impl WindowsContext {
let send_channel = send_channel;
- let context = Box::new(WindowsContext{
+ let context = Box::new(WindowsContext {
send_channel,
is_injecting,
});
@@ -87,14 +98,15 @@ impl WindowsContext {
let ico_file_c = U16CString::from_str(ico_icon).unwrap();
let bmp_file_c = U16CString::from_str(bmp_icon).unwrap();
- let show_icon = if config.show_icon {
- 1
- }else{
- 0
- };
+ let show_icon = if config.show_icon { 1 } else { 0 };
// Initialize the windows
- let res = initialize(context_ptr, ico_file_c.as_ptr(), bmp_file_c.as_ptr(), show_icon);
+ let res = initialize(
+ context_ptr,
+ ico_file_c.as_ptr(),
+ bmp_file_c.as_ptr(),
+ show_icon,
+ );
if res != 1 {
panic!("Can't initialize Windows context")
}
@@ -114,8 +126,15 @@ impl super::Context for WindowsContext {
// Native bridge code
-extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u16, len: i32,
- event_type: i32, key_code: i32, variant: i32, is_key_down: i32) {
+extern "C" fn keypress_callback(
+ _self: *mut c_void,
+ raw_buffer: *const u16,
+ len: i32,
+ event_type: i32,
+ key_code: i32,
+ variant: i32,
+ is_key_down: i32,
+) {
unsafe {
let _self = _self as *mut WindowsContext;
@@ -127,8 +146,10 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u16, len: i32
return;
}
- if event_type == 0 { // Char event
- if is_key_down != 0 { // KEY DOWN EVENT
+ if event_type == 0 {
+ // Char event
+ if is_key_down != 0 {
+ // KEY DOWN EVENT
// Convert the received buffer to a string
let buffer = std::slice::from_raw_parts(raw_buffer, len as usize);
let c_string = U16CStr::from_slice_with_nul(buffer);
@@ -141,17 +162,19 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u16, len: i32
Ok(string) => {
let event = Event::Key(KeyEvent::Char(string));
(*_self).send_channel.send(event).unwrap();
- },
+ }
Err(e) => {
error!("Unable to receive char: {}", e);
- },
+ }
}
} else {
error!("unable to decode widechar");
}
}
- }else if event_type == 1 { // Modifier event
- if is_key_down == 1 { // Keyup event
+ } else if event_type == 1 {
+ // Modifier event
+ if is_key_down == 1 {
+ // Keyup event
let modifier: Option = match (key_code, variant) {
(0x5B, _) => Some(LEFT_META),
(0x5C, _) => Some(RIGHT_META),
@@ -169,12 +192,13 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u16, len: i32
if let Some(modifier) = modifier {
let event = Event::Key(KeyEvent::Modifier(modifier));
(*_self).send_channel.send(event).unwrap();
- }else{ // Not one of the default modifiers, send an "other" event
+ } else {
+ // Not one of the default modifiers, send an "other" event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
}
}
- }else{
+ } else {
// Other type of event
let event = Event::Key(KeyEvent::Other);
(*_self).send_channel.send(event).unwrap();
@@ -182,7 +206,7 @@ extern fn keypress_callback(_self: *mut c_void, raw_buffer: *const u16, len: i32
}
}
-extern fn icon_click_callback(_self: *mut c_void) {
+extern "C" fn icon_click_callback(_self: *mut c_void) {
unsafe {
let _self = _self as *mut WindowsContext;
@@ -191,12 +215,11 @@ extern fn icon_click_callback(_self: *mut c_void) {
}
}
-
-extern fn context_menu_click_callback(_self: *mut c_void, id: i32) {
+extern "C" fn context_menu_click_callback(_self: *mut c_void, id: i32) {
unsafe {
let _self = _self as *mut WindowsContext;
let event = Event::Action(ActionType::from(id));
(*_self).send_channel.send(event).unwrap();
}
-}
\ No newline at end of file
+}
diff --git a/src/edit.rs b/src/edit.rs
index 25d6377..fc1e802 100644
--- a/src/edit.rs
+++ b/src/edit.rs
@@ -20,11 +20,17 @@
use std::path::Path;
#[cfg(target_os = "linux")]
-fn default_editor() -> String{ "/bin/nano".to_owned() }
+fn default_editor() -> String {
+ "/bin/nano".to_owned()
+}
#[cfg(target_os = "macos")]
-fn default_editor() -> String{ "/usr/bin/nano".to_owned() }
+fn default_editor() -> String {
+ "/usr/bin/nano".to_owned()
+}
#[cfg(target_os = "windows")]
-fn default_editor() -> String{ "C:\\Windows\\System32\\notepad.exe".to_owned() }
+fn default_editor() -> String {
+ "C:\\Windows\\System32\\notepad.exe".to_owned()
+}
pub fn open_editor(file_path: &Path) -> bool {
use std::process::Command;
@@ -34,20 +40,18 @@ pub fn open_editor(file_path: &Path) -> bool {
let visual_var = std::env::var_os("VISUAL");
// Prioritize the editors specified by the environment variable, use the default one
- let editor : String = if let Some(editor_var) = editor_var {
+ let editor: String = if let Some(editor_var) = editor_var {
editor_var.to_string_lossy().to_string()
- }else if let Some(visual_var) = visual_var {
+ } else if let Some(visual_var) = visual_var {
visual_var.to_string_lossy().to_string()
- }else{
+ } else {
default_editor()
};
// Start the editor and wait for its termination
let status = if cfg!(target_os = "windows") {
- Command::new(&editor)
- .arg(file_path)
- .spawn()
- }else{
+ Command::new(&editor).arg(file_path).spawn()
+ } else {
// On Unix, spawn the editor using the shell so that it can
// accept parameters. See issue #245
Command::new("/bin/bash")
@@ -56,18 +60,17 @@ pub fn open_editor(file_path: &Path) -> bool {
.spawn()
};
-
if let Ok(mut child) = status {
// Wait for the user to edit the configuration
let result = child.wait();
if let Ok(exit_status) = result {
exit_status.success()
- }else{
+ } else {
false
}
- }else{
+ } else {
println!("Error: could not start editor at: {}", &editor);
false
}
-}
\ No newline at end of file
+}
diff --git a/src/engine.rs b/src/engine.rs
index 50a41f0..f349847 100644
--- a/src/engine.rs
+++ b/src/engine.rs
@@ -17,25 +17,31 @@
* along with espanso. If not, see .
*/
-use crate::matcher::{Match, MatchReceiver};
-use crate::keyboard::KeyboardManager;
-use crate::config::ConfigManager;
-use crate::config::BackendType;
use crate::clipboard::ClipboardManager;
-use log::{info, warn, debug, error};
-use crate::ui::{UIManager, MenuItem, MenuItemType};
-use crate::event::{ActionEventReceiver, ActionType, SystemEventReceiver, SystemEvent};
-use crate::render::{Renderer, RenderResult};
+use crate::config::BackendType;
+use crate::config::ConfigManager;
+use crate::event::{ActionEventReceiver, ActionType, SystemEvent, SystemEventReceiver};
+use crate::keyboard::KeyboardManager;
+use crate::matcher::{Match, MatchReceiver};
+use crate::protocol::{send_command_or_warn, IPCCommand, Service};
+use crate::render::{RenderResult, Renderer};
+use crate::ui::{MenuItem, MenuItemType, UIManager};
+use log::{debug, error, info, warn};
+use regex::Regex;
use std::cell::RefCell;
use std::process::exit;
-use regex::{Regex};
-use std::sync::Arc;
use std::sync::atomic::AtomicBool;
use std::sync::atomic::Ordering::Release;
-use crate::protocol::{Service, IPCCommand, send_command_or_warn};
+use std::sync::Arc;
-pub struct Engine<'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>,
- U: UIManager, R: Renderer> {
+pub struct Engine<
+ 'a,
+ S: KeyboardManager,
+ C: ClipboardManager,
+ M: ConfigManager<'a>,
+ U: UIManager,
+ R: Renderer,
+> {
keyboard_manager: &'a S,
clipboard_manager: &'a C,
config_manager: &'a M,
@@ -46,14 +52,27 @@ pub struct Engine<'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<
enabled: RefCell,
}
-impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIManager, R: Renderer>
- Engine<'a, S, C, M, U, R> {
- pub fn new(keyboard_manager: &'a S, clipboard_manager: &'a C,
- config_manager: &'a M, ui_manager: &'a U,
- renderer: &'a R, is_injecting: Arc) -> Engine<'a, S, C, M, U, R> {
+impl<
+ 'a,
+ S: KeyboardManager,
+ C: ClipboardManager,
+ M: ConfigManager<'a>,
+ U: UIManager,
+ R: Renderer,
+ > Engine<'a, S, C, M, U, R>
+{
+ pub fn new(
+ keyboard_manager: &'a S,
+ clipboard_manager: &'a C,
+ config_manager: &'a M,
+ ui_manager: &'a U,
+ renderer: &'a R,
+ is_injecting: Arc,
+ ) -> Engine<'a, S, C, M, U, R> {
let enabled = RefCell::new(true);
- Engine{keyboard_manager,
+ Engine {
+ keyboard_manager,
clipboard_manager,
config_manager,
ui_manager,
@@ -67,36 +86,32 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
let mut menu = Vec::new();
let enabled = self.enabled.borrow();
- let toggle_text = if *enabled {
- "Disable"
- }else{
- "Enable"
- }.to_owned();
- menu.push(MenuItem{
+ let toggle_text = if *enabled { "Disable" } else { "Enable" }.to_owned();
+ menu.push(MenuItem {
item_type: MenuItemType::Button,
item_name: toggle_text,
item_id: ActionType::Toggle as i32,
});
- menu.push(MenuItem{
+ menu.push(MenuItem {
item_type: MenuItemType::Separator,
item_name: "".to_owned(),
item_id: 998,
});
- menu.push(MenuItem{
+ menu.push(MenuItem {
item_type: MenuItemType::Button,
item_name: "Reload configs".to_owned(),
item_id: ActionType::RestartWorker as i32,
});
- menu.push(MenuItem{
+ menu.push(MenuItem {
item_type: MenuItemType::Separator,
item_name: "".to_owned(),
item_id: 999,
});
- menu.push(MenuItem{
+ menu.push(MenuItem {
item_type: MenuItemType::Button,
item_name: "Exit espanso".to_owned(),
item_id: ActionType::Exit as i32,
@@ -110,10 +125,10 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
// clipboard content in order to restore it later.
if self.config_manager.default_config().preserve_clipboard {
match self.clipboard_manager.get_clipboard() {
- Some(clipboard) => {Some(clipboard)},
- None => {None},
+ Some(clipboard) => Some(clipboard),
+ None => None,
}
- }else {
+ } else {
None
}
}
@@ -123,9 +138,15 @@ lazy_static! {
static ref VAR_REGEX: Regex = Regex::new("\\{\\{\\s*(?P\\w+)\\s*\\}\\}").unwrap();
}
-impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIManager, R: Renderer>
- MatchReceiver for Engine<'a, S, C, M, U, R>{
-
+impl<
+ 'a,
+ S: KeyboardManager,
+ C: ClipboardManager,
+ M: ConfigManager<'a>,
+ U: UIManager,
+ R: Renderer,
+ > MatchReceiver for Engine<'a, S, C, M, U, R>
+{
fn on_match(&self, m: &Match, trailing_separator: Option, trigger_offset: usize) {
let config = self.config_manager.active_config();
@@ -138,23 +159,26 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
let char_count = if trailing_separator.is_none() {
m.triggers[trigger_offset].chars().count() as i32
- }else{
+ } else {
m.triggers[trigger_offset].chars().count() as i32 + 1 // Count also the separator
};
self.keyboard_manager.delete_string(&config, char_count);
- let mut previous_clipboard_content : Option = None;
+ let mut previous_clipboard_content: Option = None;
- let rendered = self.renderer.render_match(m, trigger_offset, config, vec![]);
+ let rendered = self
+ .renderer
+ .render_match(m, trigger_offset, config, vec![]);
match rendered {
RenderResult::Text(mut target_string) => {
// If a trailing separator was counted in the match, add it back to the target string
if let Some(trailing_separator) = trailing_separator {
- if trailing_separator == '\r' { // If the trailing separator is a carriage return,
- target_string.push('\n'); // convert it to new line
- }else{
+ if trailing_separator == '\r' {
+ // If the trailing separator is a carriage return,
+ target_string.push('\n'); // convert it to new line
+ } else {
target_string.push(trailing_separator);
}
}
@@ -177,26 +201,28 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
// Subtract also 3, equal to the number of chars of the placeholder "$|$"
let moves = (total_size - char_index - 3) as i32;
Some(moves)
- }else{
+ } else {
None
};
let backend = if m.force_clipboard {
&BackendType::Clipboard
- }else if config.backend == BackendType::Auto {
+ } else if config.backend == BackendType::Auto {
if cfg!(target_os = "linux") {
let all_ascii = target_string.chars().all(|c| c.is_ascii());
if all_ascii {
- debug!("All elements of the replacement are ascii, using Inject backend");
+ debug!(
+ "All elements of the replacement are ascii, using Inject backend"
+ );
&BackendType::Inject
- }else{
+ } else {
debug!("There are non-ascii characters, using Clipboard backend");
&BackendType::Clipboard
}
- }else{
+ } else {
&BackendType::Inject
}
- }else{
+ } else {
&config.backend
};
@@ -212,15 +238,16 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
self.keyboard_manager.send_string(&config, split);
}
- },
+ }
BackendType::Clipboard => {
// If the preserve_clipboard option is enabled, save the current
// clipboard content to restore it later.
- previous_clipboard_content = self.return_content_if_preserve_clipboard_is_enabled();
+ previous_clipboard_content =
+ self.return_content_if_preserve_clipboard_is_enabled();
self.clipboard_manager.set_clipboard(&target_string);
self.keyboard_manager.trigger_paste(&config);
- },
+ }
_ => {
error!("Unsupported backend type evaluation.");
return;
@@ -231,7 +258,7 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
// Simulate left arrow key presses to bring the cursor into the desired position
self.keyboard_manager.move_cursor_left(&config, moves);
}
- },
+ }
RenderResult::Image(image_path) => {
// If the preserve_clipboard option is enabled, save the current
// clipboard content to restore it later.
@@ -239,19 +266,22 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
self.clipboard_manager.set_clipboard_image(&image_path);
self.keyboard_manager.trigger_paste(&config);
- },
+ }
RenderResult::Error => {
error!("Could not render match: {}", m.triggers[trigger_offset]);
- },
+ }
}
// Restore previous clipboard content
if let Some(previous_clipboard_content) = previous_clipboard_content {
// Sometimes an expansion gets overwritten before pasting by the previous content
// A delay is needed to mitigate the problem
- std::thread::sleep(std::time::Duration::from_millis(config.restore_clipboard_delay as u64));
+ std::thread::sleep(std::time::Duration::from_millis(
+ config.restore_clipboard_delay as u64,
+ ));
- self.clipboard_manager.set_clipboard(&previous_clipboard_content);
+ self.clipboard_manager
+ .set_clipboard(&previous_clipboard_content);
}
// Re-allow espanso to interpret actions
@@ -261,7 +291,7 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
fn on_enable_update(&self, status: bool) {
let message = if status {
"espanso enabled"
- }else{
+ } else {
"espanso disabled"
};
@@ -293,13 +323,13 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
let previous_clipboard = self.clipboard_manager.get_clipboard();
// Sleep for a while, giving time to effectively copy the text
- std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding
+ std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding
// Trigger a copy shortcut to transfer the content of the selection to the clipboard
self.keyboard_manager.trigger_copy(&config);
// Sleep for a while, giving time to effectively copy the text
- std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding
+ std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding
// Then get the text from the clipboard and render the match output
let clipboard = self.clipboard_manager.get_clipboard();
@@ -308,7 +338,7 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
// Don't expand empty clipboards, as usually they are the result of an empty passive selection
if clipboard.trim().is_empty() {
info!("Avoiding passive expansion, as the user didn't select anything");
- }else{
+ } else {
if let Some(previous_content) = previous_clipboard {
// Because of issue #213, we need to make sure the user selected something.
if clipboard == previous_content {
@@ -316,8 +346,7 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
} else {
info!("Passive mode activated");
- let rendered = self.renderer.render_passive(&clipboard,
- &config);
+ let rendered = self.renderer.render_passive(&clipboard, &config);
match rendered {
RenderResult::Text(payload) => {
@@ -326,10 +355,8 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
std::thread::sleep(std::time::Duration::from_millis(100)); // TODO: avoid hardcoding
self.keyboard_manager.trigger_paste(&config);
- },
- _ => {
- warn!("Cannot expand passive match")
- },
+ }
+ _ => warn!("Cannot expand passive match"),
}
}
}
@@ -341,34 +368,50 @@ impl <'a, S: KeyboardManager, C: ClipboardManager, M: ConfigManager<'a>, U: UIMa
}
}
-impl <'a, S: KeyboardManager, C: ClipboardManager,
- M: ConfigManager<'a>, U: UIManager, R: Renderer> ActionEventReceiver for Engine<'a, S, C, M, U, R>{
-
+impl<
+ 'a,
+ S: KeyboardManager,
+ C: ClipboardManager,
+ M: ConfigManager<'a>,
+ U: UIManager,
+ R: Renderer,
+ > ActionEventReceiver for Engine<'a, S, C, M, U, R>
+{
fn on_action_event(&self, e: ActionType) {
let config = self.config_manager.default_config();
match e {
ActionType::IconClick => {
self.ui_manager.show_menu(self.build_menu());
- },
+ }
ActionType::ExitWorker => {
info!("terminating worker process");
self.ui_manager.cleanup();
exit(0);
- },
+ }
ActionType::Exit => {
send_command_or_warn(Service::Daemon, config.clone(), IPCCommand::exit());
- },
+ }
ActionType::RestartWorker => {
- send_command_or_warn(Service::Daemon, config.clone(), IPCCommand::restart_worker());
- },
+ send_command_or_warn(
+ Service::Daemon,
+ config.clone(),
+ IPCCommand::restart_worker(),
+ );
+ }
_ => {}
}
}
}
-impl <'a, S: KeyboardManager, C: ClipboardManager,
- M: ConfigManager<'a>, U: UIManager, R: Renderer> SystemEventReceiver for Engine<'a, S, C, M, U, R>{
-
+impl<
+ 'a,
+ S: KeyboardManager,
+ C: ClipboardManager,
+ M: ConfigManager<'a>,
+ U: UIManager,
+ R: Renderer,
+ > SystemEventReceiver for Engine<'a, S, C, M, U, R>
+{
fn on_system_event(&self, e: SystemEvent) {
match e {
// MacOS specific
@@ -379,16 +422,16 @@ impl <'a, S: KeyboardManager, C: ClipboardManager,
if config.secure_input_notification && config.show_notifications {
self.ui_manager.notify_delay(&format!("{} has activated SecureInput. Espanso won't work until you disable it.", app_name), 5000);
}
- },
+ }
SystemEvent::SecureInputDisabled => {
info!("SecureInput has been disabled.");
- },
+ }
SystemEvent::NotifyRequest(message) => {
let config = self.config_manager.default_config();
if config.show_notifications {
self.ui_manager.notify(&message);
}
- },
+ }
}
}
-}
\ No newline at end of file
+}
diff --git a/src/event/manager.rs b/src/event/manager.rs
index db920c1..5bafec4 100644
--- a/src/event/manager.rs
+++ b/src/event/manager.rs
@@ -17,7 +17,7 @@
* along with espanso. If not, see .
*/
-use crate::event::{KeyEventReceiver, ActionEventReceiver, Event, SystemEventReceiver};
+use crate::event::{ActionEventReceiver, Event, KeyEventReceiver, SystemEventReceiver};
use std::sync::mpsc::Receiver;
pub trait EventManager {
@@ -32,37 +32,44 @@ pub struct DefaultEventManager<'a> {
}
impl<'a> DefaultEventManager<'a> {
- pub fn new(receive_channel: Receiver, key_receivers: Vec<&'a dyn KeyEventReceiver>,
- action_receivers: Vec<&'a dyn ActionEventReceiver>,
- system_receivers: Vec<&'a dyn SystemEventReceiver>) -> DefaultEventManager<'a> {
+ pub fn new(
+ receive_channel: Receiver,
+ key_receivers: Vec<&'a dyn KeyEventReceiver>,
+ action_receivers: Vec<&'a dyn ActionEventReceiver>,
+ system_receivers: Vec<&'a dyn SystemEventReceiver>,
+ ) -> DefaultEventManager<'a> {
DefaultEventManager {
receive_channel,
key_receivers,
action_receivers,
- system_receivers
+ system_receivers,
}
}
}
-impl <'a> EventManager for DefaultEventManager<'a> {
+impl<'a> EventManager for DefaultEventManager<'a> {
fn eventloop(&self) {
loop {
match self.receive_channel.recv() {
- Ok(event) => {
- match event {
- Event::Key(key_event) => {
- self.key_receivers.iter().for_each(move |&receiver| receiver.on_key_event(key_event.clone()));
- },
- Event::Action(action_event) => {
- self.action_receivers.iter().for_each(|&receiver| receiver.on_action_event(action_event.clone()));
- }
- Event::System(system_event) => {
- self.system_receivers.iter().for_each(move |&receiver| receiver.on_system_event(system_event.clone()));
- }
+ Ok(event) => match event {
+ Event::Key(key_event) => {
+ self.key_receivers
+ .iter()
+ .for_each(move |&receiver| receiver.on_key_event(key_event.clone()));
+ }
+ Event::Action(action_event) => {
+ self.action_receivers
+ .iter()
+ .for_each(|&receiver| receiver.on_action_event(action_event.clone()));
+ }
+ Event::System(system_event) => {
+ self.system_receivers.iter().for_each(move |&receiver| {
+ receiver.on_system_event(system_event.clone())
+ });
}
},
Err(e) => panic!("Broken event channel {}", e),
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/event/mod.rs b/src/event/mod.rs
index dcecb82..600c5b6 100644
--- a/src/event/mod.rs
+++ b/src/event/mod.rs
@@ -19,7 +19,7 @@
pub(crate) mod manager;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
#[allow(dead_code)]
#[derive(Debug, Clone)]
@@ -60,7 +60,7 @@ impl From for ActionType {
pub enum KeyEvent {
Char(String),
Modifier(KeyModifier),
- Other
+ Other,
}
#[allow(non_camel_case_types)]
@@ -99,44 +99,24 @@ impl KeyModifier {
match config {
KeyModifier::CTRL => {
current == &LEFT_CTRL || current == &RIGHT_CTRL || current == &CTRL
- },
+ }
KeyModifier::SHIFT => {
current == &LEFT_SHIFT || current == &RIGHT_SHIFT || current == &SHIFT
- },
- KeyModifier::ALT => {
- current == &LEFT_ALT || current == &RIGHT_ALT || current == &ALT
- },
+ }
+ KeyModifier::ALT => current == &LEFT_ALT || current == &RIGHT_ALT || current == &ALT,
KeyModifier::META => {
current == &LEFT_META || current == &RIGHT_META || current == &META
- },
- KeyModifier::BACKSPACE => {
- current == &BACKSPACE
- },
- KeyModifier::LEFT_CTRL => {
- current == &LEFT_CTRL
- },
- KeyModifier::RIGHT_CTRL => {
- current == &RIGHT_CTRL
- },
- KeyModifier::LEFT_ALT => {
- current == &LEFT_ALT
- },
- KeyModifier::RIGHT_ALT => {
- current == &RIGHT_ALT
- },
- KeyModifier::LEFT_META => {
- current == &LEFT_META
- },
- KeyModifier::RIGHT_META => {
- current == &RIGHT_META
- },
- KeyModifier::LEFT_SHIFT => {
- current == &LEFT_SHIFT
- },
- KeyModifier::RIGHT_SHIFT => {
- current == &RIGHT_SHIFT
- },
- _ => {false},
+ }
+ KeyModifier::BACKSPACE => current == &BACKSPACE,
+ KeyModifier::LEFT_CTRL => current == &LEFT_CTRL,
+ KeyModifier::RIGHT_CTRL => current == &RIGHT_CTRL,
+ KeyModifier::LEFT_ALT => current == &LEFT_ALT,
+ KeyModifier::RIGHT_ALT => current == &RIGHT_ALT,
+ KeyModifier::LEFT_META => current == &LEFT_META,
+ KeyModifier::RIGHT_META => current == &RIGHT_META,
+ KeyModifier::LEFT_SHIFT => current == &LEFT_SHIFT,
+ KeyModifier::RIGHT_SHIFT => current == &RIGHT_SHIFT,
+ _ => false,
}
}
}
@@ -145,11 +125,11 @@ impl KeyModifier {
#[derive(Debug, Clone)]
pub enum SystemEvent {
// MacOS specific
- SecureInputEnabled(String, String), // AppName, App Path
+ SecureInputEnabled(String, String), // AppName, App Path
SecureInputDisabled,
// Notification
- NotifyRequest(String)
+ NotifyRequest(String),
}
// Receivers
@@ -170,8 +150,8 @@ pub trait SystemEventReceiver {
#[cfg(test)]
mod tests {
- use super::*;
use super::KeyModifier::*;
+ use super::*;
#[test]
fn test_shallow_equals_ctrl() {
@@ -225,4 +205,4 @@ mod tests {
assert!(!KeyModifier::shallow_equals(&OFF, &META));
assert!(!KeyModifier::shallow_equals(&OFF, &SHIFT));
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/clipboard.rs b/src/extension/clipboard.rs
index c8442cd..60846ca 100644
--- a/src/extension/clipboard.rs
+++ b/src/extension/clipboard.rs
@@ -17,8 +17,8 @@
* along with espanso. If not, see .
*/
-use serde_yaml::{Mapping};
use crate::clipboard::ClipboardManager;
+use serde_yaml::Mapping;
pub struct ClipboardExtension {
clipboard_manager: Box,
@@ -26,9 +26,7 @@ pub struct ClipboardExtension {
impl ClipboardExtension {
pub fn new(clipboard_manager: Box) -> ClipboardExtension {
- ClipboardExtension{
- clipboard_manager
- }
+ ClipboardExtension { clipboard_manager }
}
}
@@ -40,4 +38,4 @@ impl super::Extension for ClipboardExtension {
fn calculate(&self, _: &Mapping, _: &Vec) -> Option {
self.clipboard_manager.get_clipboard()
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/date.rs b/src/extension/date.rs
index 431b4e5..ac15295 100644
--- a/src/extension/date.rs
+++ b/src/extension/date.rs
@@ -17,14 +17,14 @@
* along with espanso. If not, see .
*/
-use serde_yaml::{Mapping, Value};
use chrono::{DateTime, Local};
+use serde_yaml::{Mapping, Value};
pub struct DateExtension {}
impl DateExtension {
pub fn new() -> DateExtension {
- DateExtension{}
+ DateExtension {}
}
}
@@ -40,10 +40,10 @@ impl super::Extension for DateExtension {
let date = if let Some(format) = format {
now.format(format.as_str().unwrap()).to_string()
- }else{
+ } else {
now.to_rfc2822()
};
Some(date)
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/dummy.rs b/src/extension/dummy.rs
index c9932e8..6bbb1dd 100644
--- a/src/extension/dummy.rs
+++ b/src/extension/dummy.rs
@@ -23,7 +23,7 @@ pub struct DummyExtension {}
impl DummyExtension {
pub fn new() -> DummyExtension {
- DummyExtension{}
+ DummyExtension {}
}
}
@@ -37,8 +37,8 @@ impl super::Extension for DummyExtension {
if let Some(echo) = echo {
Some(echo.as_str().unwrap_or_default().to_owned())
- }else{
+ } else {
None
}
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/mod.rs b/src/extension/mod.rs
index 9db489a..9a363c5 100644
--- a/src/extension/mod.rs
+++ b/src/extension/mod.rs
@@ -17,22 +17,22 @@
* along with espanso. If not, see .
*/
-use serde_yaml::Mapping;
use crate::clipboard::ClipboardManager;
+use serde_yaml::Mapping;
-mod date;
-mod shell;
-mod script;
-mod random;
mod clipboard;
+mod date;
pub mod dummy;
+mod random;
+mod script;
+mod shell;
pub trait Extension {
fn name(&self) -> String;
fn calculate(&self, params: &Mapping, args: &Vec) -> Option;
}
-pub fn get_extensions(clipboard_manager: Box) -> Vec>{
+pub fn get_extensions(clipboard_manager: Box) -> Vec> {
vec![
Box::new(date::DateExtension::new()),
Box::new(shell::ShellExtension::new()),
@@ -41,4 +41,4 @@ pub fn get_extensions(clipboard_manager: Box) -> Vec.
*/
-use serde_yaml::{Mapping, Value};
+use log::{error, warn};
use rand::seq::SliceRandom;
-use log::{warn, error};
+use serde_yaml::{Mapping, Value};
pub struct RandomExtension {}
impl RandomExtension {
pub fn new() -> RandomExtension {
- RandomExtension{}
+ RandomExtension {}
}
}
@@ -38,13 +38,14 @@ impl super::Extension for RandomExtension {
let choices = params.get(&Value::from("choices"));
if choices.is_none() {
warn!("No 'choices' parameter specified for random variable");
- return None
+ return None;
}
let choices = choices.unwrap().as_sequence();
if let Some(choices) = choices {
- let str_choices = choices.iter().map(|arg| {
- arg.as_str().unwrap_or_default().to_string()
- }).collect::>();
+ let str_choices = choices
+ .iter()
+ .map(|arg| arg.as_str().unwrap_or_default().to_string())
+ .collect::>();
// Select a random choice between the possibilities
let choice = str_choices.choose(&mut rand::thread_rng());
@@ -54,14 +55,13 @@ impl super::Extension for RandomExtension {
// Render arguments
let output = crate::render::utils::render_args(output, args);
- return Some(output)
- },
+ return Some(output);
+ }
None => {
error!("Could not select a random choice.");
- return None
- },
+ return None;
+ }
}
-
}
error!("choices array have an invalid format '{:?}'", choices);
@@ -77,11 +77,7 @@ mod tests {
#[test]
fn test_random_basic() {
let mut params = Mapping::new();
- let choices = vec!(
- "first",
- "second",
- "third",
- );
+ let choices = vec!["first", "second", "third"];
params.insert(Value::from("choices"), Value::from(choices.clone()));
let extension = RandomExtension::new();
@@ -97,11 +93,7 @@ mod tests {
#[test]
fn test_random_with_args() {
let mut params = Mapping::new();
- let choices = vec!(
- "first $0$",
- "second $0$",
- "$0$ third",
- );
+ let choices = vec!["first $0$", "second $0$", "$0$ third"];
params.insert(Value::from("choices"), Value::from(choices.clone()));
let extension = RandomExtension::new();
@@ -111,12 +103,8 @@ mod tests {
let output = output.unwrap();
- let rendered_choices = vec!(
- "first test",
- "second test",
- "test third",
- );
+ let rendered_choices = vec!["first test", "second test", "test third"];
assert!(rendered_choices.iter().any(|x| x == &output));
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/script.rs b/src/extension/script.rs
index ac233bc..875abe6 100644
--- a/src/extension/script.rs
+++ b/src/extension/script.rs
@@ -17,16 +17,16 @@
* along with espanso. If not, see .
*/
+use log::{error, warn};
use serde_yaml::{Mapping, Value};
-use std::process::Command;
-use log::{warn, error};
use std::path::PathBuf;
+use std::process::Command;
pub struct ScriptExtension {}
impl ScriptExtension {
pub fn new() -> ScriptExtension {
- ScriptExtension{}
+ ScriptExtension {}
}
}
@@ -39,17 +39,21 @@ impl super::Extension for ScriptExtension {
let args = params.get(&Value::from("args"));
if args.is_none() {
warn!("No 'args' parameter specified for script variable");
- return None
+ return None;
}
let args = args.unwrap().as_sequence();
if let Some(args) = args {
- let mut str_args = args.iter().map(|arg| {
- arg.as_str().unwrap_or_default().to_string()
- }).collect::>();
+ let mut str_args = args
+ .iter()
+ .map(|arg| arg.as_str().unwrap_or_default().to_string())
+ .collect::>();
// The user has to enable argument concatenation explicitly
- let inject_args = params.get(&Value::from("inject_args"))
- .unwrap_or(&Value::from(false)).as_bool().unwrap_or(false);
+ let inject_args = params
+ .get(&Value::from("inject_args"))
+ .unwrap_or(&Value::from(false))
+ .as_bool()
+ .unwrap_or(false);
if inject_args {
str_args.extend(user_args.clone());
}
@@ -71,17 +75,12 @@ impl super::Extension for ScriptExtension {
}
});
-
let output = if str_args.len() > 1 {
- Command::new(&str_args[0])
- .args(&str_args[1..])
- .output()
- }else{
- Command::new(&str_args[0])
- .output()
+ Command::new(&str_args[0]).args(&str_args[1..]).output()
+ } else {
+ Command::new(&str_args[0]).output()
};
-
match output {
Ok(output) => {
let output_str = String::from_utf8_lossy(output.stdout.as_slice());
@@ -94,12 +93,12 @@ impl super::Extension for ScriptExtension {
warn!("Script command reported error: \n{}", error_str);
}
- return Some(output_str.into_owned())
- },
+ return Some(output_str.into_owned());
+ }
Err(e) => {
error!("Could not execute script '{:?}', error: {}", args, e);
- return None
- },
+ return None;
+ }
}
}
@@ -117,7 +116,10 @@ mod tests {
#[cfg(not(target_os = "windows"))]
fn test_script_basic() {
let mut params = Mapping::new();
- params.insert(Value::from("args"), Value::from(vec!["echo", "hello world"]));
+ params.insert(
+ Value::from("args"),
+ Value::from(vec!["echo", "hello world"]),
+ );
let extension = ScriptExtension::new();
let output = extension.calculate(¶ms, &vec![]);
@@ -130,7 +132,10 @@ mod tests {
#[cfg(not(target_os = "windows"))]
fn test_script_inject_args_off() {
let mut params = Mapping::new();
- params.insert(Value::from("args"), Value::from(vec!["echo", "hello world"]));
+ params.insert(
+ Value::from("args"),
+ Value::from(vec!["echo", "hello world"]),
+ );
let extension = ScriptExtension::new();
let output = extension.calculate(¶ms, &vec!["jon".to_owned()]);
@@ -143,7 +148,10 @@ mod tests {
#[cfg(not(target_os = "windows"))]
fn test_script_inject_args_on() {
let mut params = Mapping::new();
- params.insert(Value::from("args"), Value::from(vec!["echo", "hello world"]));
+ params.insert(
+ Value::from("args"),
+ Value::from(vec!["echo", "hello world"]),
+ );
params.insert(Value::from("inject_args"), Value::from(true));
let extension = ScriptExtension::new();
@@ -152,4 +160,4 @@ mod tests {
assert!(output.is_some());
assert_eq!(output.unwrap(), "hello world jon\n");
}
-}
\ No newline at end of file
+}
diff --git a/src/extension/shell.rs b/src/extension/shell.rs
index ab27fe5..d769a0a 100644
--- a/src/extension/shell.rs
+++ b/src/extension/shell.rs
@@ -17,15 +17,15 @@
* along with espanso. If not, see .
*/
+use log::{error, warn};
+use regex::{Captures, Regex};
use serde_yaml::{Mapping, Value};
use std::process::{Command, Output};
-use log::{warn, error};
-use regex::{Regex, Captures};
lazy_static! {
static ref POS_ARG_REGEX: Regex = if cfg!(target_os = "windows") {
Regex::new("%(?P\\d+)").unwrap()
- }else{
+ } else {
Regex::new("\\$(?P\\d+)").unwrap()
};
}
@@ -39,33 +39,15 @@ pub enum Shell {
}
impl Shell {
- fn execute_cmd(&self, cmd: &str) -> std::io::Result