suport long lived plugin, and sort top level manually

wiiznokes · wash2 · commit 593e397b0371 · 2024-12-09T12:49:47.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/Cargo.toml b/bin/Cargo.toml
@@ -16,6 +16,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
     "env-filter",
     "chrono",
 ] }
+tracing-journald = "0.3.0"
 dirs.workspace = true
 mimalloc = "0.1.43"
 
diff --git a/bin/src/main.rs b/bin/src/main.rs
@@ -5,8 +5,6 @@ use pop_launcher_toolkit::plugins;
 use pop_launcher_toolkit::service;
 
 use mimalloc::MiMalloc;
-use tracing_subscriber::layer::SubscriberExt;
-use tracing_subscriber::EnvFilter;
 
 #[global_allocator]
 static GLOBAL: MiMalloc = MiMalloc;
@@ -41,7 +39,7 @@ async fn main() {
 
 // todo: support journald once this issue is resolved: https://github.com/tokio-rs/tracing/issues/2348
 fn init_logging(cmd: &str) {
-    use tracing_subscriber::{fmt, Registry};
+    use tracing_subscriber::{fmt, layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 
     let logdir = match dirs::state_dir() {
         Some(dir) => dir.join("pop-launcher/"),
@@ -59,7 +57,7 @@ fn init_logging(cmd: &str) {
 
     if let Ok(file) = logfile {
         if let Ok(meta) = file.metadata() {
-            if meta.len() > 1000 {
+            if meta.len() > 10000 {
                 let _ = file.set_len(0);
             }
         }
@@ -68,13 +66,18 @@ fn init_logging(cmd: &str) {
             .or_else(|_| EnvFilter::try_new("warn"))
             .unwrap();
 
-        let fmt_layer = fmt::layer()
-            .with_target(false)
-            .with_timer(fmt::time::ChronoLocal::new("%T".into()))
-            .with_writer(file);
+        let fmt_layer = fmt::layer().with_target(false).with_writer(file);
 
-        let subscriber = Registry::default().with(filter_layer).with(fmt_layer);
-
-        tracing::subscriber::set_global_default(subscriber).expect("Failed to set subscriber");
+        if let Ok(journal_layer) = tracing_journald::layer() {
+            tracing_subscriber::registry()
+                .with(journal_layer)
+                .with(filter_layer)
+                .init();
+        } else {
+            tracing_subscriber::registry()
+                .with(fmt_layer)
+                .with(filter_layer)
+                .init();
+        }
     }
 }
diff --git a/plugins/src/cosmic_toplevel/mod.rs b/plugins/src/cosmic_toplevel/mod.rs
@@ -1,10 +1,12 @@
 mod toplevel_handler;
 
+use cctk::cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::State;
 use cctk::wayland_client::Proxy;
 use cctk::{cosmic_protocols, sctk::reexports::calloop, toplevel_info::ToplevelInfo};
 use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;
 use fde::DesktopEntry;
 use freedesktop_desktop_entry as fde;
+use tracing::{debug, info};
 
 use crate::desktop_entries::utils::get_description;
 use crate::send;
@@ -19,12 +21,13 @@ use pop_launcher::{
 };
 use std::borrow::Cow;
 use std::iter;
+use std::collections::VecDeque;
 use tokio::io::{AsyncWrite, AsyncWriteExt};
 
 use self::toplevel_handler::{toplevel_handler, ToplevelAction, ToplevelEvent};
 
 pub async fn main() {
-    tracing::info!("starting cosmic-toplevel");
+    info!("starting cosmic-toplevel");
 
     let mut tx = async_stdout();
 
@@ -68,20 +71,37 @@ pub async fn main() {
             Either::Right((Some(event), second_to_next_request)) => {
                 next_event = toplevel_rx.next();
                 next_request = second_to_next_request;
+
                 match event {
                     ToplevelEvent::Add(handle, info) => {
-                        tracing::info!("{}", &info.app_id);
+                        tracing::info!("add {}", &info.app_id);
                         app.toplevels.retain(|t| t.0 != handle);
-                        app.toplevels.push((handle, info));
+                        app.toplevels.push_front((handle, info));
                     }
                     ToplevelEvent::Remove(handle) => {
-                        app.toplevels.retain(|t| t.0 != handle);
-                        // ignore requests for this id until after the next search
-                        app.ids_to_ignore.push(handle.id().protocol_id());
+                        if let Some(pos) = app.toplevels.iter().position(|t| t.0 == handle) {
+                            app.toplevels.remove(pos);
+                            // ignore requests for this id until after the next search
+                            app.ids_to_ignore.push(handle.id().protocol_id());
+                        } else {
+                            tracing::warn!("ToplevelEvent::Remove, no toplevel found");
+                        }
                     }
                     ToplevelEvent::Update(handle, info) => {
-                        if let Some(t) = app.toplevels.iter_mut().find(|t| t.0 == handle) {
-                            t.1 = info;
+                        debug!("Update {}", &info.app_id);
+                        debug!("Update {:?}", &info.state);
+
+                        if let Some(pos) = app.toplevels.iter().position(|t| t.0 == handle) {
+                            if info.state.contains(&State::Activated) {
+                                tracing::warn!("Update {:?}: push front", &info.app_id);
+                                app.toplevels.remove(pos);
+                                app.toplevels.push_front((handle, info));
+                            } else {
+                                app.toplevels[pos].1 = info;
+                            }
+                        } else {
+                            tracing::warn!("ToplevelEvent::Update, no toplevel found");
+                            app.toplevels.push_front((handle, info));
                         }
                     }
                 }
@@ -95,7 +115,8 @@ struct App<W> {
     locales: Vec<String>,
     desktop_entries: Vec<DesktopEntry<'static>>,
     ids_to_ignore: Vec<u32>,
-    toplevels: Vec<(ZcosmicToplevelHandleV1, ToplevelInfo)>,
+    // XXX: use LinkedList?
+    toplevels: VecDeque<(ZcosmicToplevelHandleV1, ToplevelInfo)>,
     calloop_tx: calloop::channel::Sender<ToplevelAction>,
     tx: W,
 }
@@ -119,7 +140,7 @@ impl<W: AsyncWrite + Unpin> App<W> {
                 locales,
                 desktop_entries,
                 ids_to_ignore: Vec::new(),
-                toplevels: Vec::new(),
+                toplevels: VecDeque::new(),
                 calloop_tx,
                 tx,
             },
diff --git a/plugins/src/cosmic_toplevel/plugin.ron b/plugins/src/cosmic_toplevel/plugin.ron
@@ -4,4 +4,5 @@
     query: (persistent: true, priority: High),
     bin: (path: "cosmic-toplevel"),
     icon: Name("focus-windows-symbolic"),
+    long_lived: true,
 )
diff --git a/plugins/src/desktop_entries/mod.rs b/plugins/src/desktop_entries/mod.rs
@@ -9,11 +9,13 @@ use futures::StreamExt;
 use pop_launcher::*;
 use std::borrow::Cow;
 use tokio::io::AsyncWrite;
+use tracing::info;
 use utils::get_description;
 
 pub(crate) mod utils;
 
 pub async fn main() {
+    info!("starting desktop entries");
     let mut app = App::new(async_stdout());
     app.reload().await;
 
diff --git a/service/src/lib.rs b/service/src/lib.rs
@@ -201,6 +201,15 @@ impl<O: futures::Sink<Response> + Unpin> Service<O> {
 
                             break;
                         }
+                        Request::Close => {
+                            for (_key, plugin) in self.plugins.iter_mut() {
+                                if !plugin.config.long_lived {
+                                    let tx = plugin.sender_exec();
+                                    _ = tx.send_async(Request::Exit).await;
+                                    plugin.sender_drop();
+                                }
+                            }
+                        }
                     }
                 }
 
@@ -465,6 +474,8 @@ impl<O: futures::Sink<Response> + Unpin> Service<O> {
                 }
             }
         } else {
+            self.no_sort = query.is_empty();
+
             for plugin_id in query_queue {
                 if let Some(plugin) = self.plugins.get_mut(plugin_id) {
                     if plugin
diff --git a/service/src/plugins/config.rs b/service/src/plugins/config.rs
@@ -30,6 +30,9 @@ pub struct PluginConfig {
 
     #[serde(default)]
     pub history: bool,
+
+    #[serde(default)]
+    pub long_lived: bool,
 }
 
 #[derive(Debug, Default, Deserialize, Clone)]
diff --git a/service/src/plugins/help.rs b/service/src/plugins/help.rs
@@ -24,6 +24,7 @@ pub const CONFIG: PluginConfig = PluginConfig {
     },
     icon: Some(IconSource::Name(Cow::Borrowed("system-help-symbolic"))),
     history: false,
+    long_lived: false,
 };
 pub struct HelpPlugin {
     pub id: usize,
diff --git a/service/src/plugins/mod.rs b/service/src/plugins/mod.rs
@@ -60,6 +60,9 @@ where
                     self.exit();
                     break;
                 }
+                Request::Close => {
+                    self.exit();
+                }
             }
         }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -137,6 +137,9 @@ pub enum Request {
     Context(Indice),
     /// Request to end the service.
     Exit,
+    /// The frontend was closed and the service should release resources
+    /// and prepare for the next query
+    Close,
     /// Requests to cancel any active searches.
     Interrupt,
     /// Request to close the selected item.
diff --git a/toolkit/src/plugin_trait.rs b/toolkit/src/plugin_trait.rs
@@ -89,6 +89,10 @@ where
                         self.exit();
                         break;
                     }
+                    Request::Close => {
+                        self.exit();
+                        break;
+                    }
                 },
                 Err(why) => tracing::error!("Malformed json request: {why}"),
             }

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@`
`4`	`4`	`query: (persistent: true, priority: High),`
`5`	`5`	`bin: (path: "cosmic-toplevel"),`
`6`	`6`	`icon: Name("focus-windows-symbolic"),`
	`7`	`+ long_lived: true,`
`7`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,15 @@ impl<O: futures::Sink<Response> + Unpin> Service<O> {`
`201`	`201`
`202`	`202`	`break;`
`203`	`203`	`}`
	`204`	`+ Request::Close => {`
	`205`	`+ for (_key, plugin) in self.plugins.iter_mut() {`
	`206`	`+ if !plugin.config.long_lived {`
	`207`	`+ let tx = plugin.sender_exec();`
	`208`	`+ _ = tx.send_async(Request::Exit).await;`
	`209`	`+ plugin.sender_drop();`
	`210`	`+ }`
	`211`	`+ }`
	`212`	`+ }`
`204`	`213`	`}`
`205`	`214`	`}`
`206`	`215`
`@@ -465,6 +474,8 @@ impl<O: futures::Sink<Response> + Unpin> Service<O> {`
`465`	`474`	`}`
`466`	`475`	`}`
`467`	`476`	`} else {`
	`477`	`+ self.no_sort = query.is_empty();`
	`478`	`+`
`468`	`479`	`for plugin_id in query_queue {`
`469`	`480`	`if let Some(plugin) = self.plugins.get_mut(plugin_id) {`
`470`	`481`	`if plugin`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ pub struct PluginConfig {`
`30`	`30`
`31`	`31`	`#[serde(default)]`
`32`	`32`	`pub history: bool,`
	`33`	`+`
	`34`	`+ #[serde(default)]`
	`35`	`+ pub long_lived: bool,`
`33`	`36`	`}`
`34`	`37`
`35`	`38`	`#[derive(Debug, Default, Deserialize, Clone)]`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ where`
`60`	`60`	`self.exit();`
`61`	`61`	`break;`
`62`	`62`	`}`
	`63`	`+ Request::Close => {`
	`64`	`+ self.exit();`
	`65`	`+ }`
`63`	`66`	`}`
`64`	`67`	`}`
`65`	`68`