Placate Clippy & small cleanups

Author: joshuamegnauth54

Cargo.toml

@@ -3,14 +3,17 @@ name = "cosmic-screenshot"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-ashpd = { version = "0.6.8", features = ["tracing"] }
+# App
 chrono = "0.4.24"
+clap = { version = "4.4.16", features = ["derive"] }
 dirs = "5.0.1"
 tokio = { version = "1.28.1", features = ["full"] }
-clap = { version = "4.4.16", features = ["derive"] }
-zbus = { version = "3", default-features = false, features = ["tokio"] }
+
+# Logging
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
+
+# Screenshots/D-Bus comm
+ashpd = { version = "0.6.8", features = ["tracing"] }
+zbus = { version = "3", default-features = false, features = ["tokio"] }

src/error.rs

@@ -66,14 +66,10 @@ impl Error {
                     )
                 })
                 .unwrap_or_else(|| "Unable to save screenshot to the Pictures directory".into()),
-            Self::Ashpd(e) => match e {
-                AshpdError::Portal(e) => match e {
-                    PortalError::NotAllowed(msg) => format!("Screenshot not allowed: {msg}"),
-                    _ => "Failed to take screenshot".into(),
-                },
-                _ => "Failed to take screenshot".into(),
-            },
-            Self::SaveScreenshot { .. } => "Screenshot succeeded but couldn't be saved".into(),
+            Self::Ashpd(AshpdError::Portal(PortalError::NotAllowed(msg))) => {
+                format!("Screenshot not allowed: {msg}")
+            }
+            Self::SaveScreenshot { .. } => "Screenshot captured but couldn't be saved".into(),
             _ => "Failed to take screenshot".into(),
         }
     }
@@ -86,13 +82,7 @@ impl Error {
 
         match e {
             AshpdError::Response(e) => *e == ResponseError::Cancelled,
-            AshpdError::Portal(e) => {
-                if let PortalError::Cancelled(_) = e {
-                    true
-                } else {
-                    false
-                }
-            }
+            AshpdError::Portal(PortalError::Cancelled(_)) => true,
             _ => false,
         }
     }
@@ -122,22 +112,11 @@ impl Error {
     /// [zbus::Error] encapsulates many different problems, many of which are programmer errors
     /// which shouldn't occur during normal operation.
     pub fn zbus(&self) -> bool {
-        if let Self::Ashpd(e) = self {
-            match e {
-                AshpdError::Zbus(_) => true,
-                AshpdError::Portal(PortalError::ZBus(_)) => {
-                    // if let PortalError::ZBus(_) = e {
-                    //     true
-                    // } else {
-                    //     false
-                    // }
-                    true
-                }
-                _ => false,
-            }
-        } else {
-            false
-        }
+        matches!(
+            self,
+            Self::Ashpd(AshpdError::Zbus(_))
+                | Self::Ashpd(AshpdError::Portal(PortalError::ZBus(_)))
+        )
     }
 }
 

src/main.rs

@@ -1,16 +1,13 @@
+#![allow(clippy::too_many_arguments)]
+
 mod error;
 
-use ashpd::desktop::screenshot::{Screenshot, ScreenshotRequest};
+use ashpd::desktop::screenshot::Screenshot;
 use clap::{command, ArgAction, Parser};
 use std::{collections::HashMap, fs, os::unix::fs::MetadataExt, path::PathBuf};
-use tracing::{error, info};
+use tracing::{debug, error, info};
 use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-use zbus::{
-    dbus_proxy,
-    export::futures_util::{future::FutureExt, TryFutureExt},
-    zvariant::Value,
-    Connection,
-};
+use zbus::{dbus_proxy, zvariant::Value, Connection};
 
 use error::Error;
 
@@ -85,6 +82,7 @@ async fn send_notify(summary: &str, body: &str) -> Result<(), Error> {
         .map(|_| ())
 }
 
+#[tracing::instrument]
 async fn request_screenshot(args: Args) -> Result<String, Error> {
     let picture_dir = (!args.interactive)
         .then(|| {
@@ -104,6 +102,7 @@ async fn request_screenshot(args: Args) -> Result<String, Error> {
         .response()?;
 
     let uri = response.uri();
+    debug!("Screenshot request URI: {uri}");
     match uri.scheme() {
         "file" => {
             if let Some(picture_dir) = picture_dir {
@@ -153,7 +152,7 @@ async fn request_screenshot(args: Args) -> Result<String, Error> {
 }
 
 #[tokio::main(flavor = "current_thread")]
-async fn main() -> Result<(), Error> {
+async fn main() {
     // Init tracing but don't panic if it fails
     let _ = tracing_subscriber::registry()
         .with(fmt::layer())
@@ -163,20 +162,25 @@ async fn main() -> Result<(), Error> {
     let args = Args::parse();
     let notify = args.notify;
 
-    let result = match request_screenshot(args).await {
+    let (summary, body) = match request_screenshot(args).await {
         Ok(path) => {
-            info!("Saving screenshot to {path}");
-            path
+            info!("Screenshot saved to {path}");
+            ("Screenshot captured", path)
         }
         Err(e) => {
-            error!("Screenshot failed with {e}");
-            e.to_user_facing()
+            if !e.cancelled() {
+                error!("Screenshot failed with {e}");
+                ("Screenshot failed", e.to_user_facing())
+            } else {
+                info!("Screenshot cancelled");
+                ("Screenshot cancelled", "".into())
+            }
         }
     };
 
     if notify {
-        send_notify(&result, "").await?;
+        if let Err(e) = send_notify(summary, &body).await {
+            error!("Failed to post notification on completion: {e}");
+        }
     }
-
-    Ok(())
 }