Prepare better error handling, add anyhow dependency
This commit is contained in:
parent
9e2bfaa14e
commit
00546678ca
3 changed files with 13 additions and 9 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -692,6 +692,7 @@ dependencies = [
|
||||||
name = "multibg-sway"
|
name = "multibg-sway"
|
||||||
version = "0.1.10"
|
version = "0.1.10"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"fast_image_resize",
|
"fast_image_resize",
|
||||||
|
|
|
@ -14,6 +14,7 @@ categories = ["command-line-utilities", "multimedia::images"]
|
||||||
exclude = ["/PKGBUILD", "/scripts/"]
|
exclude = ["/PKGBUILD", "/scripts/"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
anyhow = "1.0.97"
|
||||||
clap = { version = "4.5.3", features = ["derive"] }
|
clap = { version = "4.5.3", features = ["derive"] }
|
||||||
env_logger = "0.11.3"
|
env_logger = "0.11.3"
|
||||||
fast_image_resize = "5.0.0"
|
fast_image_resize = "5.0.0"
|
||||||
|
|
20
src/main.rs
20
src/main.rs
|
@ -14,7 +14,7 @@ use std::{
|
||||||
};
|
};
|
||||||
|
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use log::{debug, error};
|
use log::{debug, error, info};
|
||||||
use mio::{
|
use mio::{
|
||||||
Events, Interest, Poll, Token, Waker,
|
Events, Interest, Poll, Token, Waker,
|
||||||
unix::SourceFd,
|
unix::SourceFd,
|
||||||
|
@ -40,19 +40,21 @@ use crate::{
|
||||||
wayland::State,
|
wayland::State,
|
||||||
};
|
};
|
||||||
|
|
||||||
fn main()
|
fn main() -> Result<(), ()> {
|
||||||
{
|
run().map_err(|e| { error!("{e:#}"); })
|
||||||
#[cfg(debug_assertions)]
|
}
|
||||||
|
|
||||||
|
fn run() -> anyhow::Result<()> {
|
||||||
env_logger::Builder::from_env(
|
env_logger::Builder::from_env(
|
||||||
env_logger::Env::default().default_filter_or(
|
env_logger::Env::default().default_filter_or(
|
||||||
"warn,multibg_sway=trace"
|
#[cfg(debug_assertions)]
|
||||||
|
"info,multibg_sway=trace",
|
||||||
|
#[cfg(not(debug_assertions))]
|
||||||
|
"info",
|
||||||
)
|
)
|
||||||
).init();
|
).init();
|
||||||
|
|
||||||
#[cfg(not(debug_assertions))]
|
info!(concat!(env!("CARGO_PKG_NAME"), " ", env!("CARGO_PKG_VERSION")));
|
||||||
env_logger::Builder::from_env(
|
|
||||||
env_logger::Env::default().default_filter_or("warn")
|
|
||||||
).init();
|
|
||||||
|
|
||||||
let cli = Cli::parse();
|
let cli = Cli::parse();
|
||||||
let wallpaper_dir = Path::new(&cli.wallpaper_dir).canonicalize().unwrap();
|
let wallpaper_dir = Path::new(&cli.wallpaper_dir).canonicalize().unwrap();
|
||||||
|
|
Loading…
Add table
Reference in a new issue