Placate Clippy & small cleanups

Author: joshuamegnauth54

Cargo.toml

@@ -4,24 +4,30 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-ashpd = { version = "0.12", default-features = false, features = ["tokio", "tracing"] }
-chrono = { version = "0.4.41", default-features = false, features = [
-    "alloc",
-    "clock",
+# App
+chrono = { version = "0.4", default-features = false, features = [
+  "alloc",
+  "clock",
 ] }
+clap = { version = "4.5", features = ["derive"] }
 dirs = "6"
-tokio = { version = "1.47.1", default-features = false, features = ["macros"] }
-clap = { version = "4.5.46", features = ["derive"] }
-zbus = { version = "5", default-features = false }
+tokio = { version = "1", default-features = false, features = ["macros"] }
+
+# Screenshots/D-Bus comm
+ashpd = { version = "0.12", default-features = false, features = [
+  "tokio",
+  "tracing",
+] }
+zbus = { version = "5", default-features = false, features = ["tokio"] }
 
 # Logging
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 
 # Internationalization
 i18n-embed = { version = "0.16", features = [
-    "fluent-system",
-    "desktop-requester",
+  "fluent-system",
+  "desktop-requester",
 ] }
 i18n-embed-fl = "0.10"
 rust-embed = "8.5"

i18n/en/cosmic_screenshot.ftl

@@ -1,4 +1,10 @@
 cosmic-screenshot = COSMIC Screenshot
 
 screenshot-saved-to-clipboard = Screenshot saved to clipboard
-screenshot-saved-to = Screenshot saved to:
+screenshot-saved-to = Screenshot saved to:
+
+screenshot-cancelled = Screenshot canceled
+screenshot-dbus-err = Error from D-Bus
+screenshot-failed = Screenshot failed
+screenshot-no-dir = Unable to write screenshot to directory: {$path}
+screenshot-not-allowed = Screenshot not allowed: {$msg}

src/error.rs

@@ -2,12 +2,14 @@ use std::{
     error::Error as StdError,
     fmt::{self, Display},
     io,
-    path::PathBuf,
+    path::{Path, PathBuf},
 };
 
-use ashpd::{desktop::ResponseError, Error as AshpdError, PortalError};
+use ashpd::{Error as AshpdError, PortalError, desktop::ResponseError};
 use zbus::Error as ZbusError;
 
+use crate::fl;
+
 /// Error type for requesting screenshots from the XDG portal.
 ///
 /// The primary purpose of this type is to provide simple user facing messages.
@@ -54,27 +56,20 @@ impl Error {
     /// Localized, condensed error message for end users
     pub fn to_user_facing(&self) -> String {
         match self {
-            _ if self.unsupported() => "Portal does not support screenshots".into(),
-            _ if self.cancelled() => "Screenshot cancelled".into(),
-            _ if self.zbus() => "Problem communicating with D-Bus".into(),
-            Self::MissingSaveDirectory(p) => p
-                .as_deref()
-                .map(|path| {
-                    format!(
-                        "Unable to save screenshot to {} or the Pictures directory",
-                        path.display()
-                    )
-                })
-                .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(),
-            _ => "Failed to take screenshot".into(),
+            // _ if self.unsupported() => fl!("screenshot-unsupported"),
+            _ if self.cancelled() => fl!("screenshot-cancelled"),
+            _ if self.zbus() => fl!("screenshot-dbus-err"),
+            Self::MissingSaveDirectory(p) => {
+                fl!(
+                    "screenshot-no-dir",
+                    path = p.as_deref().unwrap_or(Path::new("")).to_string_lossy()
+                )
+            }
+            Self::Ashpd(AshpdError::Portal(PortalError::NotAllowed(msg))) => {
+                fl!("screenshot-not-allowed", msg = msg)
+            }
+            // Self::SaveScreenshot { .. } => "Screenshot captured but couldn't be saved".into(),
+            _ => fl!("screenshot-failed"),
         }
     }
 
@@ -86,13 +81,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 +111,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

@@ -3,15 +3,11 @@ mod localize;
 
 use std::{collections::HashMap, fs, os::unix::fs::MetadataExt, path::PathBuf};
 
-use ashpd::desktop::screenshot::{Screenshot, ScreenshotRequest};
+use ashpd::desktop::screenshot::Screenshot;
 use clap::{ArgAction, Parser, command};
-use tracing::{error, info};
+use tracing::{debug, error, info};
 use tracing_subscriber::{EnvFilter, fmt, prelude::*};
-use zbus::{
-    Connection, dbus_proxy,
-    export::futures_util::{TryFutureExt, future::FutureExt},
-    zvariant::Value,
-};
+use zbus::{Connection, proxy, zvariant::Value};
 
 use error::Error;
 
@@ -65,6 +61,7 @@ trait Notifications {
 }
 
 // Send a notification for the screenshot app.
+#[tracing::instrument(name = "Posting notification")]
 async fn send_notify(summary: &str, body: &str) -> Result<(), Error> {
     let connection = Connection::session().await.map_err(Error::Notify)?;
 
@@ -87,6 +84,7 @@ async fn send_notify(summary: &str, body: &str) -> Result<(), Error> {
         .map(|_| ())
 }
 
+#[tracing::instrument(name = "Requesting screenshot from D-Bus")]
 async fn request_screenshot(args: Args) -> Result<String, Error> {
     let picture_dir = (!args.interactive)
         .then(|| {
@@ -106,6 +104,7 @@ async fn request_screenshot(args: Args) -> Result<String, Error> {
         .response()?;
 
     let uri = response.uri();
+    debug!("Screenshot request URI: {uri}");
     match uri.scheme() {
         "file" => {
             let response_path = uri
@@ -157,7 +156,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())
@@ -168,26 +167,27 @@ async fn main() -> Result<(), Error> {
     let args = Args::parse();
     let notify = args.notify;
 
-    let path = 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}");
+            if path.is_empty() {
+                (fl!("screenshot-saved-to-clipboard"), "".into())
+            } else {
+                (fl!("screenshot-saved-to"), path)
+            }
         }
         Err(e) => {
-            error!("Screenshot failed with {e}");
-            e.to_user_facing()
+            if !e.cancelled() {
+                error!("Screenshot failed with {e}");
+                (fl!("screenshot-failed"), e.to_user_facing())
+            } else {
+                info!("Screenshot cancelled");
+                (fl!("screenshot-cancelled"), "".into())
+            }
         }
     };
 
-    if notify {
-        let message = if path.is_empty() {
-            fl!("screenshot-saved-to-clipboard")
-        } else {
-            fl!("screenshot-saved-to")
-        };
-
-        send_notify(&path, &message).await?;
+    if notify && let Err(e) = send_notify(&summary, &body).await {
+        error!("Failed to post notification on completion: {e}");
     }
-
-    Ok(())
 }