feat: account for directories in file path (waycrate#96)

Signed-off-by: Shinyzenith <[email protected]> --------- Signed-off-by: Shinyzenith <[email protected]> Authored-by: rachancheet <[email protected]> Co-authored-by: Shinyzenith <[email protected]>
Gigas002 · Mar 23, 2024 · 2afa5b0 · 2afa5b0
1 parent f53e650
commit 2afa5b0
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/wayshot/src/cli.rs b/wayshot/src/cli.rs
@@ -11,12 +11,16 @@ use clap::builder::TypedValueParser;
 #[derive(Parser)]
 #[command(version, about)]
 pub struct Cli {
-    /// Where to save the screenshot, "-" for stdout. Defaults to "$UNIX_TIMESTAMP-wayshot.$EXTENSION" unless --clipboard is present.
-    #[arg(value_name = "OUTPUT")]
+    /// Custom output path can be of the following types:
+    ///     1. Directory (Default naming scheme is used for the image output).
+    ///     2. Path (Encoding is automatically inferred from the extension).
+    ///     3. `-` (Indicates writing to terminal [stdout]).
+    #[arg(value_name = "OUTPUT", verbatim_doc_comment)]
     pub file: Option<PathBuf>,
 
-    /// Copy image to clipboard along with [OUTPUT] or stdout. Wayshot persists in the background to offer the image till the clipboard is overwritten.
-    #[arg(long)]
+    /// Copy image to clipboard along with [OUTPUT] or stdout.
+    /// Wayshot persists in the background to offer the image till the clipboard is overwritten.
+    #[arg(long, verbatim_doc_comment)]
     pub clipboard: bool,
 
     /// Log level to be used for printing to stderr
@@ -33,7 +37,7 @@ pub struct Cli {
 
     /// Set image encoder, by default uses the file extension from the OUTPUT
     /// positional argument. Otherwise defaults to png.
-    #[arg(long, visible_aliases = ["extension", "format", "output-format"], value_name = "FILE_EXTENSION")]
+    #[arg(long, verbatim_doc_comment, visible_aliases = ["extension", "format", "output-format"], value_name = "FILE_EXTENSION")]
     pub encoding: Option<EncodingFormat>,
 
     /// List all valid outputs

diff --git a/wayshot/src/wayshot.rs b/wayshot/src/wayshot.rs
@@ -106,11 +106,14 @@ fn main() -> Result<()> {
 
     let mut stdout_print = false;
     let file = match cli.file {
-        Some(pathbuf) => {
+        Some(mut pathbuf) => {
             if pathbuf.to_string_lossy() == "-" {
                 stdout_print = true;
                 None
             } else {
+                if pathbuf.is_dir() {
+                    pathbuf.push(utils::get_default_file_name(requested_encoding));
+                }
                 Some(pathbuf)
             }
         }