,
-}
-
-impl IconStatusMiddleware {
- pub fn new() -> Self {
- Self {
- enabled: RefCell::new(true),
- secure_input_enabled: RefCell::new(false),
- }
- }
-}
-
-impl Middleware for IconStatusMiddleware {
- fn name(&self) -> &'static str {
- "icon_status"
- }
-
- fn next(&self, event: Event, dispatch: &mut dyn FnMut(Event)) -> Event {
- let mut enabled = self.enabled.borrow_mut();
- let mut secure_input_enabled = self.secure_input_enabled.borrow_mut();
-
- let mut did_update = true;
- match &event.etype {
- EventType::Enabled => *enabled = true,
- EventType::Disabled => *enabled = false,
- EventType::SecureInputEnabled(_) => *secure_input_enabled = true,
- EventType::SecureInputDisabled => *secure_input_enabled = false,
- _ => did_update = false,
- }
-
- if did_update {
- let status = if *enabled {
- if *secure_input_enabled {
- IconStatus::SecureInputDisabled
- } else {
- IconStatus::Enabled
- }
- } else {
- IconStatus::Disabled
- };
-
- dispatch(Event::caused_by(event.source_id, EventType::IconStatusChange(IconStatusChangeEvent {
- status,
- })));
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/image_resolve.rs b/espanso/src/engine/process/middleware/image_resolve.rs
deleted file mode 100644
index 7710611..0000000
--- a/espanso/src/engine/process/middleware/image_resolve.rs
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use std::{
- path::Path,
-};
-
-use log::{error};
-
-use super::super::Middleware;
-use crate::engine::event::{Event, EventType, internal::ImageResolvedEvent};
-
-pub trait PathProvider {
- fn get_config_path(&self) -> &Path;
-}
-
-pub struct ImageResolverMiddleware<'a> {
- provider: &'a dyn PathProvider,
-}
-
-impl<'a> ImageResolverMiddleware<'a> {
- pub fn new(provider: &'a dyn PathProvider) -> Self {
- Self { provider }
- }
-}
-
-impl<'a> Middleware for ImageResolverMiddleware<'a> {
- fn name(&self) -> &'static str {
- "image_resolve"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if let EventType::ImageRequested(m_event) = &event.etype {
- // On Windows, we have to replace the forward / with the backslash \ in the path
- let path = if cfg!(target_os = "windows") {
- m_event.image_path.replace("/", "\\")
- } else {
- m_event.image_path.to_owned()
- };
-
- let path = if path.contains("$CONFIG") {
- let config_path = match self.provider.get_config_path().canonicalize() {
- Ok(path) => path,
- Err(err) => {
- error!("unable to canonicalize the config path into the image resolver: {}", err);
- self.provider.get_config_path().to_owned()
- },
- };
- path.replace("$CONFIG", &config_path.to_string_lossy())
- } else {
- path
- };
-
- return Event::caused_by(event.source_id, EventType::ImageResolved(ImageResolvedEvent {
- image_path: path,
- }))
- }
-
-
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/markdown.rs b/espanso/src/engine/process/middleware/markdown.rs
deleted file mode 100644
index 7ba0d8e..0000000
--- a/espanso/src/engine/process/middleware/markdown.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use super::super::Middleware;
-use crate::engine::event::{Event, EventType, effect::{HtmlInjectRequest}};
-
-// Convert markdown injection requests to HTML on the fly
-pub struct MarkdownMiddleware {}
-
-impl MarkdownMiddleware {
- pub fn new() -> Self {
- Self {}
- }
-}
-
-impl Middleware for MarkdownMiddleware {
- fn name(&self) -> &'static str {
- "markdown"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if let EventType::MarkdownInject(m_event) = &event.etype {
- // Render the markdown into HTML
- let html = markdown::to_html(&m_event.markdown);
- let mut html = html.trim();
-
- // Remove the surrounding paragraph
- if html.starts_with("") {
- html = html.trim_start_matches("
");
- }
- if html.ends_with("
") {
- html = html.trim_end_matches("");
- }
-
- return Event::caused_by(event.source_id, EventType::HtmlInject(HtmlInjectRequest {
- html: html.to_owned(),
- }))
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/match_select.rs b/espanso/src/engine/process/middleware/match_select.rs
deleted file mode 100644
index 6929e63..0000000
--- a/espanso/src/engine/process/middleware/match_select.rs
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use log::{debug, error};
-
-use super::super::Middleware;
-use crate::engine::{event::{Event, EventType, internal::{MatchSelectedEvent}}, process::{MatchFilter, MatchSelector}};
-
-pub struct MatchSelectMiddleware<'a> {
- match_filter: &'a dyn MatchFilter,
- match_selector: &'a dyn MatchSelector,
-}
-
-impl<'a> MatchSelectMiddleware<'a> {
- pub fn new(match_filter: &'a dyn MatchFilter, match_selector: &'a dyn MatchSelector) -> Self {
- Self {
- match_filter,
- match_selector,
- }
- }
-}
-
-impl<'a> Middleware for MatchSelectMiddleware<'a> {
- fn name(&self) -> &'static str {
- "match_select"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if let EventType::MatchesDetected(m_event) = event.etype {
- let matches_ids: Vec = m_event.matches.iter().map(|m| m.id).collect();
-
- // Find the matches that are actually valid in the current context
- let valid_ids = self.match_filter.filter_active(&matches_ids);
-
- return match valid_ids.len() {
- 0 => Event::caused_by(event.source_id, EventType::NOOP), // No valid matches, consume the event
- 1 => {
- // Only one match, no need to show a selection dialog
- let m = m_event
- .matches
- .into_iter()
- .find(|m| m.id == *valid_ids.first().unwrap());
- if let Some(m) = m {
- Event::caused_by(event.source_id, EventType::MatchSelected(MatchSelectedEvent { chosen: m }))
- } else {
- error!("MatchSelectMiddleware could not find the correspondent match");
- Event::caused_by(event.source_id, EventType::NOOP)
- }
- }
- _ => {
- // Multiple matches, we need to ask the user which one to use
- if let Some(selected_id) = self.match_selector.select(&valid_ids) {
- let m = m_event
- .matches
- .into_iter()
- .find(|m| m.id == selected_id);
- if let Some(m) = m {
- Event::caused_by(event.source_id, EventType::MatchSelected(MatchSelectedEvent { chosen: m }))
- } else {
- error!("MatchSelectMiddleware could not find the correspondent match");
- Event::caused_by(event.source_id, EventType::NOOP)
- }
- } else {
- debug!("MatchSelectMiddleware did not receive any match selection");
- Event::caused_by(event.source_id, EventType::NOOP)
- }
- }
- };
- }
-
- event
- }
-}
-
-// TODO: test
\ No newline at end of file
diff --git a/espanso/src/engine/process/middleware/matcher.rs b/espanso/src/engine/process/middleware/matcher.rs
deleted file mode 100644
index 6d54c52..0000000
--- a/espanso/src/engine/process/middleware/matcher.rs
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use log::trace;
-use std::{cell::RefCell, collections::VecDeque};
-
-use super::super::Middleware;
-use crate::engine::{
- event::{
- input::{Key, Status},
- internal::{DetectedMatch, MatchesDetectedEvent},
- Event, EventType,
- },
- process::{Matcher, MatcherEvent},
-};
-
-pub trait MatcherMiddlewareConfigProvider {
- fn max_history_size(&self) -> usize;
-}
-
-pub struct MatcherMiddleware<'a, State> {
- matchers: &'a [&'a dyn Matcher<'a, State>],
-
- matcher_states: RefCell>>,
-
- max_history_size: usize,
-}
-
-impl<'a, State> MatcherMiddleware<'a, State> {
- pub fn new(matchers: &'a [&'a dyn Matcher<'a, State>], options_provider: &'a dyn MatcherMiddlewareConfigProvider) -> Self {
- let max_history_size = options_provider.max_history_size();
-
- Self {
- matchers,
- matcher_states: RefCell::new(VecDeque::new()),
- max_history_size,
- }
- }
-}
-
-impl<'a, State> Middleware for MatcherMiddleware<'a, State> {
- fn name(&self) -> &'static str {
- "matcher"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if is_event_of_interest(&event.etype) {
- let mut matcher_states = self.matcher_states.borrow_mut();
- let prev_states = if !matcher_states.is_empty() {
- matcher_states.get(matcher_states.len() - 1)
- } else {
- None
- };
-
- if let EventType::Keyboard(keyboard_event) = &event.etype {
- // Backspace handling
- if keyboard_event.key == Key::Backspace {
- trace!("popping the last matcher state");
- matcher_states.pop_back();
- return event;
- }
- }
-
- // Some keys (such as the arrow keys) and mouse clicks prevent espanso from building
- // an accurate key buffer, so we need to invalidate it.
- if is_invalidating_event(&event.etype) {
- trace!("invalidating event detected, clearing matching state");
- matcher_states.clear();
- return event;
- }
-
- let mut all_results = Vec::new();
-
- if let Some(matcher_event) = convert_to_matcher_event(&event.etype) {
- let mut new_states = Vec::new();
- for (i, matcher) in self.matchers.iter().enumerate() {
- let prev_state = prev_states.and_then(|states| states.get(i));
-
- let (state, results) = matcher.process(prev_state, &matcher_event);
- all_results.extend(results);
-
- new_states.push(state);
- }
-
- matcher_states.push_back(new_states);
- if matcher_states.len() > self.max_history_size {
- matcher_states.pop_front();
- }
-
- if !all_results.is_empty() {
- return Event::caused_by(
- event.source_id,
- EventType::MatchesDetected(MatchesDetectedEvent {
- matches: all_results
- .into_iter()
- .map(|result| DetectedMatch {
- id: result.id,
- trigger: Some(result.trigger),
- right_separator: result.right_separator,
- left_separator: result.left_separator,
- args: result.args,
- })
- .collect(),
- }),
- );
- }
- }
- }
-
- event
- }
-}
-
-fn is_event_of_interest(event_type: &EventType) -> bool {
- match event_type {
- EventType::Keyboard(keyboard_event) => {
- if keyboard_event.status != Status::Pressed {
- // Skip non-press events
- false
- } else {
- match keyboard_event.key {
- // Skip modifier keys
- Key::Alt => false,
- Key::Shift => false,
- Key::CapsLock => false,
- Key::Meta => false,
- Key::NumLock => false,
- Key::Control => false,
-
- _ => true,
- }
- }
- }
- EventType::Mouse(mouse_event) => mouse_event.status == Status::Pressed,
- EventType::MatchInjected => true,
- _ => false,
- }
-}
-
-fn convert_to_matcher_event(event_type: &EventType) -> Option {
- match event_type {
- EventType::Keyboard(keyboard_event) => Some(MatcherEvent::Key {
- key: keyboard_event.key.clone(),
- chars: keyboard_event.value.clone(),
- }),
- EventType::Mouse(_) => Some(MatcherEvent::VirtualSeparator),
- EventType::MatchInjected => Some(MatcherEvent::VirtualSeparator),
- _ => None,
- }
-}
-
-fn is_invalidating_event(event_type: &EventType) -> bool {
- match event_type {
- EventType::Keyboard(keyboard_event) => match keyboard_event.key {
- Key::ArrowDown => true,
- Key::ArrowLeft => true,
- Key::ArrowRight => true,
- Key::ArrowUp => true,
- Key::End => true,
- Key::Home => true,
- Key::PageDown => true,
- Key::PageUp => true,
- Key::Escape => true,
- _ => false,
- },
- EventType::Mouse(_) => true,
- _ => false,
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/mod.rs b/espanso/src/engine/process/middleware/mod.rs
deleted file mode 100644
index d585c07..0000000
--- a/espanso/src/engine/process/middleware/mod.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-pub mod action;
-pub mod cause;
-pub mod context_menu;
-pub mod cursor_hint;
-pub mod delay_modifiers;
-pub mod disable;
-pub mod exit;
-pub mod hotkey;
-pub mod icon_status;
-pub mod image_resolve;
-pub mod match_select;
-pub mod matcher;
-pub mod markdown;
-pub mod multiplex;
-pub mod past_discard;
-pub mod render;
-pub mod search;
diff --git a/espanso/src/engine/process/middleware/multiplex.rs b/espanso/src/engine/process/middleware/multiplex.rs
deleted file mode 100644
index 41e4b83..0000000
--- a/espanso/src/engine/process/middleware/multiplex.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use log::error;
-
-use super::super::Middleware;
-use crate::engine::{
- event::{Event, EventType},
- process::Multiplexer,
-};
-
-pub struct MultiplexMiddleware<'a> {
- multiplexer: &'a dyn Multiplexer,
-}
-
-impl<'a> MultiplexMiddleware<'a> {
- pub fn new(multiplexer: &'a dyn Multiplexer) -> Self {
- Self { multiplexer }
- }
-}
-
-impl<'a> Middleware for MultiplexMiddleware<'a> {
- fn name(&self) -> &'static str {
- "multiplex"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if let EventType::CauseCompensatedMatch(m_event) = event.etype {
- return match self.multiplexer.convert(m_event.m) {
- Some(new_event) => Event::caused_by(event.source_id, new_event),
- None => {
- error!("match multiplexing failed");
- Event::caused_by(event.source_id, EventType::NOOP)
- }
- };
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/past_discard.rs b/espanso/src/engine/process/middleware/past_discard.rs
deleted file mode 100644
index c2ad8d7..0000000
--- a/espanso/src/engine/process/middleware/past_discard.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use std::cell::RefCell;
-
-use log::trace;
-
-use super::super::Middleware;
-use crate::engine::{event::{Event, EventType, SourceId}};
-
-/// This middleware discards all events that have a source_id smaller than its
-/// configured threshold. This useful to discard past events that might have
-/// been stuck in the event queue for too long.
-pub struct PastEventsDiscardMiddleware {
- source_id_threshold: RefCell,
-}
-
-impl PastEventsDiscardMiddleware {
- pub fn new() -> Self {
- Self {
- source_id_threshold: RefCell::new(0),
- }
- }
-}
-
-impl Middleware for PastEventsDiscardMiddleware {
- fn name(&self) -> &'static str {
- "past_discard"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- let mut source_id_threshold = self.source_id_threshold.borrow_mut();
-
- // Filter out previous events
- if event.source_id < *source_id_threshold {
- trace!("discarding previous event: {:?}", event);
- return Event::caused_by(event.source_id, EventType::NOOP);
- }
-
- // Update the minimum threshold
- if let EventType::DiscardPrevious(m_event) = &event.etype {
- trace!("updating minimum source id threshold for events to: {}", m_event.minimum_source_id);
- *source_id_threshold = m_event.minimum_source_id;
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/render.rs b/espanso/src/engine/process/middleware/render.rs
deleted file mode 100644
index 128e0b4..0000000
--- a/espanso/src/engine/process/middleware/render.rs
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use log::error;
-
-use super::super::Middleware;
-use crate::engine::{
- event::{
- internal::RenderedEvent,
- Event, EventType,
- },
- process::{Renderer, RendererError},
-};
-
-pub struct RenderMiddleware<'a> {
- renderer: &'a dyn Renderer<'a>,
-}
-
-impl<'a> RenderMiddleware<'a> {
- pub fn new(renderer: &'a dyn Renderer<'a>) -> Self {
- Self { renderer }
- }
-}
-
-impl<'a> Middleware for RenderMiddleware<'a> {
- fn name(&self) -> &'static str {
- "render"
- }
-
- fn next(&self, event: Event, _: &mut dyn FnMut(Event)) -> Event {
- if let EventType::RenderingRequested(m_event) = event.etype {
- match self.renderer.render(
- m_event.match_id,
- m_event.trigger.as_deref(),
- m_event.trigger_args,
- ) {
- Ok(body) => {
- let body = if let Some(right_separator) = m_event.right_separator {
- format!("{}{}", body, right_separator)
- } else {
- body
- };
-
- return Event::caused_by(
- event.source_id,
- EventType::Rendered(RenderedEvent {
- match_id: m_event.match_id,
- body,
- format: m_event.format,
- }),
- );
- }
- Err(err) => match err.downcast_ref::() {
- Some(RendererError::Aborted) => return Event::caused_by(event.source_id, EventType::NOOP),
- _ => {
- error!("error during rendering: {}", err);
- return Event::caused_by(event.source_id, EventType::ProcessingError("An error has occurred during rendering, please examine the logs or contact support.".to_string()));
- }
- },
- }
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/middleware/search.rs b/espanso/src/engine/process/middleware/search.rs
deleted file mode 100644
index 90becca..0000000
--- a/espanso/src/engine/process/middleware/search.rs
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use std::collections::HashMap;
-
-use super::super::Middleware;
-use crate::engine::{event::{
- internal::{DetectedMatch, MatchesDetectedEvent},
- Event, EventType,
- }};
-
-pub trait MatchProvider {
- fn get_all_matches_ids(&self) -> Vec;
-}
-
-pub struct SearchMiddleware<'a> {
- match_provider: &'a dyn MatchProvider,
-}
-
-impl<'a> SearchMiddleware<'a> {
- pub fn new(match_provider: &'a dyn MatchProvider) -> Self {
- Self { match_provider }
- }
-}
-
-impl<'a> Middleware for SearchMiddleware<'a> {
- fn name(&self) -> &'static str {
- "search"
- }
-
- fn next(&self, event: Event, dispatch: &mut dyn FnMut(Event)) -> Event {
- if let EventType::ShowSearchBar = event.etype {
- let detected_matches = Event::caused_by(
- event.source_id,
- EventType::MatchesDetected(MatchesDetectedEvent {
- matches: self
- .match_provider
- .get_all_matches_ids()
- .into_iter()
- .map(|id| DetectedMatch {
- id,
- trigger: None,
- left_separator: None,
- right_separator: None,
- args: HashMap::new(),
- })
- .collect(),
- }),
- );
- dispatch(detected_matches);
-
- return Event::caused_by(event.source_id, EventType::NOOP);
- }
-
- event
- }
-}
-
-// TODO: test
diff --git a/espanso/src/engine/process/mod.rs b/espanso/src/engine/process/mod.rs
deleted file mode 100644
index 9c3f26a..0000000
--- a/espanso/src/engine/process/mod.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * This file is part of espanso.
- *
- * Copyright (C) 2019-2021 Federico Terzi
- *
- * espanso is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * espanso is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with espanso. If not, see .
- */
-
-use super::{Event, event::{EventType, input::Key, internal::DetectedMatch}};
-use anyhow::Result;
-use std::collections::HashMap;
-use thiserror::Error;
-
-mod default;
-mod middleware;
-
-pub trait Middleware {
- fn name(&self) -> &'static str;
- fn next(&self, event: Event, dispatch: &mut dyn FnMut(Event)) -> Event;
-}
-
-pub trait Processor {
- fn process(&mut self, event: Event) -> Vec;
-}
-
-// Dependency inversion entities
-
-// TODO: move these traits inside the various modules and then re-export it
-
-pub trait Matcher<'a, State> {
- fn process(
- &'a self,
- prev_state: Option<&State>,
- event: &MatcherEvent,
- ) -> (State, Vec);
-}
-
-#[derive(Debug)]
-pub enum MatcherEvent {
- Key { key: Key, chars: Option },
- VirtualSeparator,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub struct MatchResult {
- pub id: i32,
- pub trigger: String,
- pub left_separator: Option,
- pub right_separator: Option,
- pub args: HashMap,
-}
-
-pub trait MatchFilter {
- fn filter_active(&self, matches_ids: &[i32]) -> Vec;
-}
-
-pub trait MatchSelector {
- fn select(&self, matches_ids: &[i32]) -> Option;
-}
-
-pub trait Multiplexer {
- fn convert(
- &self,
- m: DetectedMatch,
- ) -> Option;
-}
-
-pub trait Renderer<'a> {
- fn render(&'a self, match_id: i32, trigger: Option<&str>, trigger_args: HashMap) -> Result;
-}
-
-#[derive(Error, Debug)]
-pub enum RendererError {
- #[error("rendering error")]
- RenderingError(#[from] anyhow::Error),
-
- #[error("match not found")]
- NotFound,
-
- #[error("aborted")]
- Aborted,
-}
-
-pub use middleware::action::{MatchInfoProvider, EventSequenceProvider};
-pub use middleware::delay_modifiers::ModifierStatusProvider;
-pub use middleware::image_resolve::PathProvider;
-pub use middleware::disable::DisableOptions;
-pub use middleware::matcher::MatcherMiddlewareConfigProvider;
-pub use middleware::search::MatchProvider;
-
-pub fn default<'a, MatcherState>(
- matchers: &'a [&'a dyn Matcher<'a, MatcherState>],
- match_filter: &'a dyn MatchFilter,
- match_selector: &'a dyn MatchSelector,
- multiplexer: &'a dyn Multiplexer,
- renderer: &'a dyn Renderer<'a>,
- match_info_provider: &'a dyn MatchInfoProvider,
- modifier_status_provider: &'a dyn ModifierStatusProvider,
- event_sequence_provider: &'a dyn EventSequenceProvider,
- path_provider: &'a dyn PathProvider,
- disable_options: DisableOptions,
- matcher_options_provider: &'a dyn MatcherMiddlewareConfigProvider,
- match_provider: &'a dyn MatchProvider,
-) -> impl Processor + 'a {
- default::DefaultProcessor::new(
- matchers,
- match_filter,
- match_selector,
- multiplexer,
- renderer,
- match_info_provider,
- modifier_status_provider,
- event_sequence_provider,
- path_provider,
- disable_options,
- matcher_options_provider,
- match_provider,
- )
-}
diff --git a/espanso/src/main.rs b/espanso/src/main.rs
index 0a1f90c..356d59a 100644
--- a/espanso/src/main.rs
+++ b/espanso/src/main.rs
@@ -42,7 +42,6 @@ mod capabilities;
mod cli;
mod common_flags;
mod config;
-mod engine;
mod exit_code;
mod gui;
mod icon;