mirror of
https://github.com/harivansh-afk/deskctl.git
synced 2026-04-16 08:02:22 +00:00
grouped runtime reads and waits selector modes (#5)
- grouped runtime reads and waits selector modes - Fix wait command client timeouts and test failures
This commit is contained in:
Hari
GitHub
parent
cc8f8e548a
commit
a4cf9e32dd
12 changed files with 1323 additions and 77 deletions
357
src/core/refs.rs
357
src/core/refs.rs
|
|
@ -7,6 +7,7 @@ use crate::core::types::WindowInfo;
|
|||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
#[allow(dead_code)]
|
||||
pub struct RefEntry {
|
||||
pub ref_id: String,
|
||||
pub window_id: String,
|
||||
pub backend_window_id: u32,
|
||||
pub app_class: String,
|
||||
|
|
@ -30,6 +31,35 @@ pub struct RefMap {
|
|||
next_window: usize,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum SelectorQuery {
|
||||
Ref(String),
|
||||
WindowId(String),
|
||||
Title(String),
|
||||
Class(String),
|
||||
Focused,
|
||||
Fuzzy(String),
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub enum ResolveResult {
|
||||
Match(RefEntry),
|
||||
NotFound {
|
||||
selector: String,
|
||||
mode: &'static str,
|
||||
},
|
||||
Ambiguous {
|
||||
selector: String,
|
||||
mode: &'static str,
|
||||
candidates: Vec<WindowInfo>,
|
||||
},
|
||||
Invalid {
|
||||
selector: String,
|
||||
mode: &'static str,
|
||||
message: String,
|
||||
},
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl RefMap {
|
||||
pub fn new() -> Self {
|
||||
|
|
@ -65,6 +95,7 @@ impl RefMap {
|
|||
|
||||
let window_id = self.window_id_for_backend(window.native_id);
|
||||
let entry = RefEntry {
|
||||
ref_id: ref_id.clone(),
|
||||
window_id: window_id.clone(),
|
||||
backend_window_id: window.native_id,
|
||||
app_class: window.app_name.clone(),
|
||||
|
|
@ -110,48 +141,205 @@ impl RefMap {
|
|||
window_id
|
||||
}
|
||||
|
||||
/// Resolve a selector to a RefEntry.
|
||||
/// Accepts: "@w1", "w1", "ref=w1", "win1", "id=win1", or a substring match on app_class/title.
|
||||
pub fn resolve(&self, selector: &str) -> Option<&RefEntry> {
|
||||
let normalized = selector
|
||||
.strip_prefix('@')
|
||||
.or_else(|| selector.strip_prefix("ref="))
|
||||
.unwrap_or(selector);
|
||||
|
||||
if let Some(entry) = self.refs.get(normalized) {
|
||||
return Some(entry);
|
||||
}
|
||||
|
||||
let window_id = selector.strip_prefix("id=").unwrap_or(normalized);
|
||||
if let Some(ref_id) = self.window_id_to_ref.get(window_id) {
|
||||
return self.refs.get(ref_id);
|
||||
}
|
||||
|
||||
let lower = selector.to_lowercase();
|
||||
self.refs.values().find(|entry| {
|
||||
entry.app_class.to_lowercase().contains(&lower)
|
||||
|| entry.title.to_lowercase().contains(&lower)
|
||||
})
|
||||
pub fn resolve(&self, selector: &str) -> ResolveResult {
|
||||
self.resolve_query(SelectorQuery::parse(selector), selector)
|
||||
}
|
||||
|
||||
/// Resolve a selector to the center coordinates of the window.
|
||||
pub fn resolve_to_center(&self, selector: &str) -> Option<(i32, i32)> {
|
||||
self.resolve(selector).map(|entry| {
|
||||
(
|
||||
entry.x + entry.width as i32 / 2,
|
||||
entry.y + entry.height as i32 / 2,
|
||||
)
|
||||
})
|
||||
pub fn resolve_to_center(&self, selector: &str) -> ResolveResult {
|
||||
self.resolve(selector)
|
||||
}
|
||||
|
||||
pub fn entries(&self) -> impl Iterator<Item = (&String, &RefEntry)> {
|
||||
self.refs.iter()
|
||||
}
|
||||
|
||||
fn resolve_query(&self, query: SelectorQuery, selector: &str) -> ResolveResult {
|
||||
match query {
|
||||
SelectorQuery::Ref(ref_id) => self
|
||||
.refs
|
||||
.get(&ref_id)
|
||||
.cloned()
|
||||
.map(ResolveResult::Match)
|
||||
.unwrap_or_else(|| ResolveResult::NotFound {
|
||||
selector: selector.to_string(),
|
||||
mode: "ref",
|
||||
}),
|
||||
SelectorQuery::WindowId(window_id) => self
|
||||
.window_id_to_ref
|
||||
.get(&window_id)
|
||||
.and_then(|ref_id| self.refs.get(ref_id))
|
||||
.cloned()
|
||||
.map(ResolveResult::Match)
|
||||
.unwrap_or_else(|| ResolveResult::NotFound {
|
||||
selector: selector.to_string(),
|
||||
mode: "id",
|
||||
}),
|
||||
SelectorQuery::Focused => self.resolve_candidates(
|
||||
selector,
|
||||
"focused",
|
||||
self.refs
|
||||
.values()
|
||||
.filter(|entry| entry.focused)
|
||||
.cloned()
|
||||
.collect(),
|
||||
),
|
||||
SelectorQuery::Title(title) => {
|
||||
if title.is_empty() {
|
||||
return ResolveResult::Invalid {
|
||||
selector: selector.to_string(),
|
||||
mode: "title",
|
||||
message: "title selectors must not be empty".to_string(),
|
||||
};
|
||||
}
|
||||
self.resolve_candidates(
|
||||
selector,
|
||||
"title",
|
||||
self.refs
|
||||
.values()
|
||||
.filter(|entry| entry.title.eq_ignore_ascii_case(&title))
|
||||
.cloned()
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
SelectorQuery::Class(app_class) => {
|
||||
if app_class.is_empty() {
|
||||
return ResolveResult::Invalid {
|
||||
selector: selector.to_string(),
|
||||
mode: "class",
|
||||
message: "class selectors must not be empty".to_string(),
|
||||
};
|
||||
}
|
||||
self.resolve_candidates(
|
||||
selector,
|
||||
"class",
|
||||
self.refs
|
||||
.values()
|
||||
.filter(|entry| entry.app_class.eq_ignore_ascii_case(&app_class))
|
||||
.cloned()
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
SelectorQuery::Fuzzy(value) => {
|
||||
if let Some(entry) = self.refs.get(&value).cloned() {
|
||||
return ResolveResult::Match(entry);
|
||||
}
|
||||
|
||||
if let Some(entry) = self
|
||||
.window_id_to_ref
|
||||
.get(&value)
|
||||
.and_then(|ref_id| self.refs.get(ref_id))
|
||||
.cloned()
|
||||
{
|
||||
return ResolveResult::Match(entry);
|
||||
}
|
||||
|
||||
let lower = value.to_lowercase();
|
||||
self.resolve_candidates(
|
||||
selector,
|
||||
"fuzzy",
|
||||
self.refs
|
||||
.values()
|
||||
.filter(|entry| {
|
||||
entry.app_class.to_lowercase().contains(&lower)
|
||||
|| entry.title.to_lowercase().contains(&lower)
|
||||
})
|
||||
.cloned()
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn resolve_candidates(
|
||||
&self,
|
||||
selector: &str,
|
||||
mode: &'static str,
|
||||
mut candidates: Vec<RefEntry>,
|
||||
) -> ResolveResult {
|
||||
candidates.sort_by(|left, right| left.ref_id.cmp(&right.ref_id));
|
||||
match candidates.len() {
|
||||
0 => ResolveResult::NotFound {
|
||||
selector: selector.to_string(),
|
||||
mode,
|
||||
},
|
||||
1 => ResolveResult::Match(candidates.remove(0)),
|
||||
_ => ResolveResult::Ambiguous {
|
||||
selector: selector.to_string(),
|
||||
mode,
|
||||
candidates: candidates
|
||||
.into_iter()
|
||||
.map(|entry| entry.to_window_info())
|
||||
.collect(),
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SelectorQuery {
|
||||
pub fn parse(selector: &str) -> Self {
|
||||
if let Some(value) = selector.strip_prefix('@') {
|
||||
return Self::Ref(value.to_string());
|
||||
}
|
||||
if let Some(value) = selector.strip_prefix("ref=") {
|
||||
return Self::Ref(value.to_string());
|
||||
}
|
||||
if let Some(value) = selector.strip_prefix("id=") {
|
||||
return Self::WindowId(value.to_string());
|
||||
}
|
||||
if let Some(value) = selector.strip_prefix("title=") {
|
||||
return Self::Title(value.to_string());
|
||||
}
|
||||
if let Some(value) = selector.strip_prefix("class=") {
|
||||
return Self::Class(value.to_string());
|
||||
}
|
||||
if selector == "focused" {
|
||||
return Self::Focused;
|
||||
}
|
||||
Self::Fuzzy(selector.to_string())
|
||||
}
|
||||
|
||||
pub fn needs_live_refresh(&self) -> bool {
|
||||
!matches!(self, Self::Ref(_))
|
||||
}
|
||||
}
|
||||
|
||||
impl RefEntry {
|
||||
pub fn center(&self) -> (i32, i32) {
|
||||
(
|
||||
self.x + self.width as i32 / 2,
|
||||
self.y + self.height as i32 / 2,
|
||||
)
|
||||
}
|
||||
|
||||
pub fn to_window_info(&self) -> WindowInfo {
|
||||
WindowInfo {
|
||||
ref_id: self.ref_id.clone(),
|
||||
window_id: self.window_id.clone(),
|
||||
title: self.title.clone(),
|
||||
app_name: self.app_class.clone(),
|
||||
x: self.x,
|
||||
y: self.y,
|
||||
width: self.width,
|
||||
height: self.height,
|
||||
focused: self.focused,
|
||||
minimized: self.minimized,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ResolveResult {
|
||||
pub fn matched_entry(&self) -> Option<&RefEntry> {
|
||||
match self {
|
||||
Self::Match(entry) => Some(entry),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::RefMap;
|
||||
use super::{RefMap, ResolveResult, SelectorQuery};
|
||||
use crate::backend::BackendWindow;
|
||||
|
||||
fn sample_window(native_id: u32, title: &str) -> BackendWindow {
|
||||
|
|
@ -184,12 +372,18 @@ mod tests {
|
|||
let public = refs.rebuild(&[sample_window(42, "Editor")]);
|
||||
let window_id = public[0].window_id.clone();
|
||||
|
||||
assert_eq!(refs.resolve("@w1").unwrap().window_id, window_id);
|
||||
assert_eq!(refs.resolve(&window_id).unwrap().backend_window_id, 42);
|
||||
assert_eq!(
|
||||
refs.resolve(&format!("id={window_id}")).unwrap().title,
|
||||
"Editor"
|
||||
);
|
||||
match refs.resolve("@w1") {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.window_id, window_id),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
match refs.resolve(&window_id) {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.backend_window_id, 42),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
match refs.resolve(&format!("id={window_id}")) {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.title, "Editor"),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -197,6 +391,95 @@ mod tests {
|
|||
let mut refs = RefMap::new();
|
||||
refs.rebuild(&[sample_window(7, "Browser")]);
|
||||
|
||||
assert_eq!(refs.resolve_to_center("w1"), Some((160, 120)));
|
||||
match refs.resolve_to_center("w1") {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.center(), (160, 120)),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn selector_query_parses_explicit_modes() {
|
||||
assert_eq!(
|
||||
SelectorQuery::parse("@w1"),
|
||||
SelectorQuery::Ref("w1".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
SelectorQuery::parse("ref=w2"),
|
||||
SelectorQuery::Ref("w2".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
SelectorQuery::parse("id=win4"),
|
||||
SelectorQuery::WindowId("win4".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
SelectorQuery::parse("title=Firefox"),
|
||||
SelectorQuery::Title("Firefox".to_string())
|
||||
);
|
||||
assert_eq!(
|
||||
SelectorQuery::parse("class=Navigator"),
|
||||
SelectorQuery::Class("Navigator".to_string())
|
||||
);
|
||||
assert_eq!(SelectorQuery::parse("focused"), SelectorQuery::Focused);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_supports_exact_title_class_and_focused_modes() {
|
||||
let mut refs = RefMap::new();
|
||||
refs.rebuild(&[
|
||||
sample_window(1, "Browser"),
|
||||
BackendWindow {
|
||||
native_id: 2,
|
||||
title: "Editor".to_string(),
|
||||
app_name: "Code".to_string(),
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 10,
|
||||
height: 10,
|
||||
focused: false,
|
||||
minimized: false,
|
||||
},
|
||||
]);
|
||||
|
||||
match refs.resolve("focused") {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.title, "Browser"),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
match refs.resolve("title=Editor") {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.app_class, "Code"),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
match refs.resolve("class=code") {
|
||||
ResolveResult::Match(entry) => assert_eq!(entry.title, "Editor"),
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn fuzzy_resolution_fails_with_candidates_when_ambiguous() {
|
||||
let mut refs = RefMap::new();
|
||||
refs.rebuild(&[
|
||||
sample_window(1, "Firefox"),
|
||||
BackendWindow {
|
||||
native_id: 2,
|
||||
title: "Firefox Settings".to_string(),
|
||||
app_name: "Firefox".to_string(),
|
||||
x: 0,
|
||||
y: 0,
|
||||
width: 10,
|
||||
height: 10,
|
||||
focused: false,
|
||||
minimized: false,
|
||||
},
|
||||
]);
|
||||
|
||||
match refs.resolve("firefox") {
|
||||
ResolveResult::Ambiguous {
|
||||
mode, candidates, ..
|
||||
} => {
|
||||
assert_eq!(mode, "fuzzy");
|
||||
assert_eq!(candidates.len(), 2);
|
||||
}
|
||||
other => panic!("unexpected resolve result: {other:?}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue