MindWorkAI/AI-Studio
MindWorkAI/AI-Studio
1
0
Fork 0
mirror of https://github.com/MindWorkAI/AI-Studio.git synced 2026-08-11 21:12:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Document & deduplicate global shortcut code

Browse Source
This commit is contained in:
Thorsten Sommer 2026-07-18 17:41:34 +02:00
parent aaa8096f4a
commit 078a183797
Signed by untrusted user who does not match committer: tsommer
GPG Key ID: 371BBA77A02C0108
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
runtime/src/global_shortcuts.rs
View File

@ -20,7 +20,7 @@ use ashpd::desktop::{CreateSessionOptions, ResponseError};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
use ashpd::desktop::global_shortcuts::{ use ashpd::desktop::global_shortcuts::{
BindShortcutsOptions, GlobalShortcuts, ListShortcutsOptions, NewShortcut, BindShortcutsOptions, GlobalShortcuts, ListShortcutsOptions, NewShortcut, Shortcut as AshpdShortcut,
}; };
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
@ -510,6 +510,18 @@ struct PortalShortcutInfo {
effective_display_name: String, effective_display_name: String,
} }
#[cfg(target_os = "linux")]
/// Normalizes shortcuts returned by `ashpd` for backend-independent processing.
fn normalize_portal_shortcuts(shortcuts: &[AshpdShortcut]) -> Vec<PortalShortcutInfo> {
shortcuts
.iter()
.map(|shortcut| PortalShortcutInfo {
id: shortcut.id().to_string(),
effective_display_name: shortcut.trigger_description().to_string(),
})
.collect()
}
/// Abstracts portal listing and binding operations for deterministic lifecycle tests. /// Abstracts portal listing and binding operations for deterministic lifecycle tests.
trait PortalAdapter { trait PortalAdapter {
/// Lists shortcuts restored into the current portal session. /// Lists shortcuts restored into the current portal session.
@ -576,14 +588,7 @@ impl PortalAdapter for AshpdPortalAdapter<'_> {
.and_then(|request| request.response()) .and_then(|request| request.response())
.map_err(PortalFailure::from_error)?; .map_err(PortalFailure::from_error)?;
Ok(response Ok(normalize_portal_shortcuts(response.shortcuts()))
.shortcuts()
.iter()
.map(|shortcut| PortalShortcutInfo {
id: shortcut.id().to_string(),
effective_display_name: shortcut.trigger_description().to_string(),
})
.collect())
} }
/// Binds one shortcut through the XDG portal and normalizes its response. /// Binds one shortcut through the XDG portal and normalizes its response.
@ -601,14 +606,7 @@ impl PortalAdapter for AshpdPortalAdapter<'_> {
.and_then(|request| request.response()) .and_then(|request| request.response())
.map_err(PortalFailure::from_error)?; .map_err(PortalFailure::from_error)?;
Ok(response Ok(normalize_portal_shortcuts(response.shortcuts()))
.shortcuts()
.iter()
.map(|shortcut| PortalShortcutInfo {
id: shortcut.id().to_string(),
effective_display_name: shortcut.trigger_description().to_string(),
})
.collect())
} }
} }