Fix Issue #106: Clipboard flag ignored if path is qualified to file #108
Conversation
|
Hi, please rebase your changes onto freeze-feat-andreas as there's a merge conflict. |
|
Hi it seems you included a commit which already exists in freeze branch. Why? |
… feature flag Signed-off-by: Shinyzenith <[email protected]>
Shinyzenith
force-pushed
the
fix-clipboard-independence
branch
from
70a8b85 to
588e2d4
Compare
wayshot/src/wayshot.rs
Outdated
| @@ -123,40 +124,42 @@ fn main() -> Result<()> { | |||
| } | |||
| }; | |||
|
|
|||
| let mut buffer = Cursor::new(Vec::new()); | |||
There was a problem hiding this comment.
Lets only create the buffer if clipboard is specified. Else this leads to an extra allocation which we can skip. Lets just call image.save here and create the buffer in the clipboard conditional block.
There was a problem hiding this comment.
I considered that but the stdout block also uses the buffer and I didn't want it to do the buffer write twice in the case of --clipboard + stdout. Should I create the buffer there too?
wayshot/src/wayshot.rs
Outdated
| } | ||
| } | ||
|
|
||
| if !stdout_print && cli.clipboard { | ||
| let mut buffer = Cursor::new(Vec::new()); |
There was a problem hiding this comment.
Do we need the cli.clipboard conditional in the stdout conditional? Is this block outside of the conditional not enough?
let image_buf: Option<Cursor<Vec<...> = None;
if Some(path) = file {
/// save
} else {
/// to stdout
image_buf = ...;
}
if cli.clipboard && image_buf = Some(image_buffer) {
/// Daemonize / create buf if needed
}
| image_buffer.write_to(&mut buffer, requested_encoding)?; | ||
| if cli.clipboard { | ||
| let buffer = match image_buf { | ||
| Some(buf) => buf, |
There was a problem hiding this comment.
Sorry for the last and final nitpick, just do the match inside of the clipboard daemonize call
fix: Clipboard flag ignored if path is qualified to file (waycrate#108)
No description provided.