Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 48 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "GPL-3.0"
categories = ["command-line-utilities"]
keywords = ["command-line", "cli", "qrcode"]
readme = "README.md"
repository = "https://github.com/walker84837/ciphercanvas-rs"
repository = "https://github.com/walker84837/ciphercanvas"

[profile.dev]
debug = false
Expand All @@ -24,11 +24,16 @@ image = "0.24.9"
log = "0.4.21"
miette = { version = "7.5.0", features = ["fancy"] }
thiserror = "1.0"

qrcode = "0.12"
rpassword = "7.4.0"
resvg = "0.40.0"
simple_logger = "5.0.0"
resvg = "0.40.0"
tiny-skia = "0.11.4"

usvg = "0.40.0"

kitty_image = { version = "0.1.0", optional = true }

[features]
default = []
# Enables support for the Kitty graphics protocol to display QR codes directly in the terminal.
kitty_graphics = ["dep:kitty_image"]
4 changes: 2 additions & 2 deletions src/image_ops.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use usvg::{Options, Tree, fontdb};
const SUPPORTED_FORMATS: &[&str] = &["svg", "png"];

/// Load and render SVG content into a Pixmap of the specified size.
fn load_svg(contents: &[u8], size: u32) -> Result<Pixmap, Error> {
pub(crate) fn load_svg(contents: &[u8], size: u32) -> Result<Pixmap, Error> {
info!("Loading SVG content with size {size}x{size}");

let options = Options::default();
Expand All @@ -23,7 +23,7 @@ fn load_svg(contents: &[u8], size: u32) -> Result<Pixmap, Error> {
))
})?;

let mut pixmap: Pixmap =
let mut pixmap =
Pixmap::new(size, size).ok_or(Error::Image("Failed to create a new Pixmap".to_string()))?;

render(&tree, Transform::default(), &mut pixmap.as_mut());
Expand Down
27 changes: 19 additions & 8 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ fn main() -> Result<(), error::Error> {
background,
overwrite,
}) => {
let password =
get_password(password_file).map_err(error::Error::Anyhow)?;
let password = get_password(password_file).map_err(error::Error::Anyhow)?;

let options = QrCodeOptions {
ssid,
Expand All @@ -138,13 +137,25 @@ fn main() -> Result<(), error::Error> {
format: format.clone(),
overwrite,
};
qr_generator::generate_qr_code(options)?;

if let Some(path) = output {
println!(
"QR code successfully generated and saved to \"{}\"",
path.display()
);
if options.output_path.is_none() {
#[cfg(feature = "kitty_graphics")]
{
qr_generator::print_qr_code_kitty(&options)?;
}
#[cfg(not(feature = "kitty_graphics"))]
{
qr_generator::generate_qr_code(&options)?;
}
} else {
qr_generator::generate_qr_code(&options)?;

if let Some(path) = options.output_path {
println!(
"QR code successfully generated and saved to \"{}\"",
path.display()
);
}
}
}
None => {}
Expand Down
Loading