github/awatcher
1
1
Fork 0
mirror of https://github.com/2e3s/awatcher.git synced 2025-06-06 11:35:46 +00:00
Code Issues 17 Packages Projects Releases Wiki Activity

Print watcher type on error and simplify creating

Browse Source
This commit is contained in:
Demmie 2023-04-16 13:48:40 -04:00
parent 71deb6eebe
commit 9dbc6fce80
No known key found for this signature in database
GPG Key ID: B06DAA3D432C6E9A
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main.rs
View File

@ -32,7 +32,7 @@ trait Watcher: Send {
type BoxedWatcher = Box<dyn Watcher>; type BoxedWatcher = Box<dyn Watcher>;
type WatcherConstructor = fn() -> Result<BoxedWatcher, BoxedError>; type WatcherConstructor = (&'static str, fn() -> Result<BoxedWatcher, BoxedError>);
type WatcherConstructors = [WatcherConstructor]; type WatcherConstructors = [WatcherConstructor];
trait WatchersFilter { trait WatchersFilter {
@ -41,21 +41,29 @@ trait WatchersFilter {
impl WatchersFilter for WatcherConstructors { impl WatchersFilter for WatcherConstructors {
fn filter_first_supported(&self) -> Option<BoxedWatcher> { fn filter_first_supported(&self) -> Option<BoxedWatcher> {
self.iter().find_map(|watcher| match watcher() { self.iter().find_map(|(name, watcher)| match watcher() {
Ok(watcher) => Some(watcher), Ok(watcher) => Some(watcher),
Err(e) => { Err(e) => {
info!("Watcher cannot run: {e}"); info!("{name} cannot run: {e}");
None None
} }
}) })
} }
} }
const IDLE_WATCHERS: [WatcherConstructor; 1] = [|| Ok(Box::new(KwinIdleWatcher::new()?))]; macro_rules! watcher {
($watcher_struct:ty) => {
(stringify!($watcher_struct), || {
Ok(Box::new(<$watcher_struct>::new()?))
})
};
}
const ACTIVE_WINDOW_WATCHERS: [WatcherConstructor; 2] = [ const IDLE_WATCHERS: &[WatcherConstructor] = &[watcher!(KwinIdleWatcher)];
|| Ok(Box::new(WlrForeignToplevelWatcher::new()?)),
|| Ok(Box::new(KwinWindowWatcher::new()?)), const ACTIVE_WINDOW_WATCHERS: &[WatcherConstructor] = &[
watcher!(WlrForeignToplevelWatcher),
watcher!(KwinWindowWatcher),
]; ];
fn setup_logger() -> Result<(), fern::InitError> { fn setup_logger() -> Result<(), fern::InitError> {