chore: Update dependencies

Cargo.toml

@@ -11,9 +11,9 @@ edition = "2018"
 members = ["bin", "plugins", "service"]
 
 [dependencies]
-blocking = "1"
+blocking = "1.1.0"
-const_format = "0.2"
+const_format = "0.2.22"
-futures-lite = "1"
+futures-lite = "1.12.0"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1"
+serde_json = "1.0.79"
-serde_with = "1"
+serde_with = "1.12.0"

bin/src/main.rs

@@ -12,8 +12,6 @@ fn main() {
         .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
         .init();
 
-    std::env::args();
-
     if let Some(plugin) = std::env::args().next() {
         let start = plugin.rfind('/').map(|v| v + 1).unwrap_or(0);
         let cmd = &plugin.as_str()[start..];

plugins/Cargo.toml

@@ -7,28 +7,28 @@ edition = "2018"
 publish = false
 
 [dependencies]
-async-pidfd = "0.1"
+async-pidfd = "0.1.4"
-fork = "0.1"
+fork = "0.1.18"
-freedesktop-desktop-entry = "0.4.1"
+freedesktop-desktop-entry = "0.5.0"
-futures-lite = "1"
+futures-lite = "1.12.0"
-gtk = "0.14"
+gtk = "0.15.4"
-human_format = "1.0"
+human_format = "1.0.3"
-human-sort = "0.2"
+human-sort = "0.2.2"
-new_mime_guess = "3"
+new_mime_guess = "4.0.1"
 pop-launcher = { path = "../" }
-postage = { version = "0.4", features = ["futures-traits"] }
+postage = { version = "0.4.1", features = ["futures-traits"] }
-regex = "1"
+regex = "1.5.4"
-ron = "0.7"
+ron = "0.7.0"
-serde = "1"
+serde = "1.0.136"
-serde_json = "1.0"
+serde_json = "1.0.79"
-slab = "0.4"
+slab = "0.4.5"
-smol = "1"
+smol = "1.2.5"
-strsim = "0.10"
+strsim = "0.10.0"
-tracing = "0.1"
+tracing = "0.1.31"
-tracing-subscriber = "0.3"
+tracing-subscriber = "0.3.9"
-urlencoding = "2"
+urlencoding = "2.1.0"
-zbus = "1"
+zbus = "2.1.1"
-zvariant = "2.9"
+zvariant = "3.1.2"
 ward = "2.1.0"
-isahc = "1.5.0"
+isahc = "1.6.0"
 url = "2.2.2"

plugins/src/desktop_entries/mod.rs

@@ -94,7 +94,8 @@ impl<W: AsyncWrite + Unpin> App<W> {
             .as_ref()
             .map(|x| x.split(':').collect::<Vec<&str>>());
 
-        for (src, path) in DesktopIter::new(default_paths()) {
+        for path in DesktopIter::new(default_paths()) {
+            let src = PathSource::guess_from(&path);
             if let Ok(bytes) = std::fs::read_to_string(&path) {
                 if let Ok(entry) = DesktopEntry::decode(&path, &bytes) {
                     // Do not show if our desktop is defined in `NotShowIn`.
@@ -304,6 +305,7 @@ fn path_string(source: &PathSource) -> Cow<'static, str> {
         PathSource::LocalNix => "Nix".into(),
         PathSource::Nix => "Nix (System)".into(),
         PathSource::System => "System".into(),
+        PathSource::SystemLocal => "Local (System)".into(),
         PathSource::SystemFlatpak => "Flatpak (System)".into(),
         PathSource::SystemSnap => "Snap (System)".into(),
         PathSource::Other(other) => Cow::Owned(other.clone()),

plugins/src/pop_shell/mod.rs

@@ -6,7 +6,7 @@ use freedesktop_desktop_entry as fde;
 use futures_lite::{AsyncWrite, AsyncWriteExt, StreamExt};
 use pop_launcher::*;
 use serde::{Deserialize, Serialize};
-use std::{convert::TryFrom, fs, path::PathBuf};
+use std::{convert::TryFrom, fs, path::PathBuf, sync::Arc};
 use zbus::Connection;
 use zvariant::{Signature, Type};
 
@@ -28,7 +28,7 @@ impl Type for Item {
 }
 
 pub async fn main() {
-    let connection = match Connection::new_session() {
+    let connection = match Connection::session().await {
         Ok(conn) => conn,
         Err(_) => {
             let mut out = async_stdout();
@@ -67,24 +67,27 @@ struct App<W> {
 impl<W: AsyncWrite + Unpin> App<W> {
     fn new(connection: Connection, tx: W) -> Self {
         Self {
-            desktop_entries: fde::Iter::new(fde::default_paths()).collect(),
+            desktop_entries: fde::Iter::new(fde::default_paths())
+                .map(|path| (fde::PathSource::guess_from(&path), path))
+                .collect(),
             entries: Vec::new(),
             connection,
             tx,
         }
     }
 
-    fn call_method<A: Serialize + Type>(
+    async fn call_method<A: Serialize + Type>(
         &mut self,
         method: &str,
         args: &A,
-    ) -> zbus::Result<zbus::Message> {
+    ) -> zbus::Result<Arc<zbus::Message>> {
         self.connection
             .call_method(Some(DEST), PATH, Some(DEST), method, args)
+            .await
     }
 
     async fn reload(&mut self) {
-        if let Ok(message) = self.call_method("WindowList", &()) {
+        if let Ok(message) = self.call_method("WindowList", &()).await {
             self.entries = message
                 .body::<Vec<Item>>()
                 .expect("pop-shell returned invalid WindowList response");

service/Cargo.toml

@@ -5,27 +5,27 @@ license = "MPL-2.0"
 edition = "2018"
 
 [dependencies]
-anyhow = "1"
+anyhow = "1.0.55"
-async-io = "1"
+async-io = "1.6.0"
-async-oneshot = "0.5"
+async-oneshot = "0.5.0"
-async-trait = "0.1"
+async-trait = "0.1.52"
-futures = "0.3"
+futures = "0.3.21"
-futures_codec = "0.4"
+futures_codec = "0.4.1"
-futures-lite = "1"
+futures-lite = "1.12.0"
-gen-z = "0.1"
+gen-z = "0.1.0"
-num_cpus = "1"
+num_cpus = "1.13.1"
 pop-launcher = { path = "../" }
-postage = { version = "0.4", features = ["futures-traits"] }
+postage = { version = "0.4.1", features = ["futures-traits"] }
-regex = "1.5"
+regex = "1.5.4"
-ron = "0.7"
+ron = "0.7.0"
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1"
+serde_json = "1.0.79"
-serde_with = "1"
+serde_with = "1.12.0"
-slab = "0.4"
+slab = "0.4.5"
-smol = "1"
+smol = "1.2.5"
-strsim = "0.10"
+strsim = "0.10.0"
-toml = "0.5"
+toml = "0.5.8"
-tracing = "0.1"
+tracing = "0.1.31"
-tracing-subscriber = { version = "0.3", features = ["fmt"] }
+tracing-subscriber = { version = "0.3.9", features = ["fmt"] }
-futures-core = "0.3.16"
+futures-core = "0.3.21"
 async-process = "1.3.0"