mirror of
https://github.com/pimalaya/himalaya.git
synced 2026-06-17 05:07:55 +08:00
clean part 1
This commit is contained in:
+12
-19
@@ -1,23 +1,18 @@
|
||||
mod account;
|
||||
#[cfg(any(feature = "imap", feature = "jmap", feature = "maildir"))]
|
||||
mod attachments;
|
||||
mod cli;
|
||||
mod config;
|
||||
mod email_client;
|
||||
mod envelopes;
|
||||
mod flags;
|
||||
#[cfg(feature = "imap")]
|
||||
mod imap;
|
||||
#[cfg(feature = "jmap")]
|
||||
mod jmap;
|
||||
mod mailboxes;
|
||||
#[cfg(feature = "maildir")]
|
||||
mod maildir;
|
||||
mod messages;
|
||||
mod shared;
|
||||
#[cfg(feature = "smtp")]
|
||||
mod smtp;
|
||||
mod wizard;
|
||||
|
||||
use anyhow::Result;
|
||||
use clap::Parser;
|
||||
use pimalaya_cli::{error::ErrorReport, log::Logger, printer::StdoutPrinter};
|
||||
|
||||
@@ -25,17 +20,15 @@ use crate::cli::HimalayaCli;
|
||||
|
||||
fn main() {
|
||||
let cli = HimalayaCli::parse();
|
||||
|
||||
Logger::init(&cli.log);
|
||||
|
||||
let mut printer = StdoutPrinter::new(&cli.json);
|
||||
let config_paths = cli.config_paths.as_ref();
|
||||
let account_name = cli.account.name.as_deref();
|
||||
let backend = cli.backend;
|
||||
|
||||
let result = cli
|
||||
.command
|
||||
.execute(&mut printer, config_paths, account_name, backend);
|
||||
|
||||
ErrorReport::eval(&mut printer, result)
|
||||
let result = execute(cli, &mut printer);
|
||||
ErrorReport::eval(&mut printer, result);
|
||||
}
|
||||
|
||||
fn execute(cli: HimalayaCli, printer: &mut StdoutPrinter) -> Result<()> {
|
||||
Logger::try_init(&cli.log)?;
|
||||
let config = cli.config_paths.as_ref();
|
||||
let account = cli.account.name.as_deref();
|
||||
let backend = cli.backend;
|
||||
cli.command.execute(printer, config, account, backend)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user