just print events

just print events instead of using the info!() warn!() error!() macros
that result in an event beeing emmited again.
This commit is contained in:
B. Petersen
2020-06-01 16:25:41 +02:00
parent 7b3a962498
commit e579afc3bd

View File

@@ -20,7 +20,6 @@ use deltachat::context::*;
use deltachat::oauth2::*; use deltachat::oauth2::*;
use deltachat::securejoin::*; use deltachat::securejoin::*;
use deltachat::Event; use deltachat::Event;
use log::{error, info, warn};
use rustyline::completion::{Completer, FilenameCompleter, Pair}; use rustyline::completion::{Completer, FilenameCompleter, Pair};
use rustyline::config::OutputStreamType; use rustyline::config::OutputStreamType;
use rustyline::error::ReadlineError; use rustyline::error::ReadlineError;
@@ -36,34 +35,34 @@ use self::cmdline::*;
/// Event Handler /// Event Handler
fn receive_event(event: Event) { fn receive_event(event: Event) {
let yellow = Color::Yellow.normal(); let yellow = Color::Yellow.normal();
let red = Color::Red.normal();
match event { match event {
Event::Info(msg) => { Event::Info(msg) => {
/* do not show the event as this would fill the screen */ println!("[INFO] {}", msg);
info!("{}", msg);
} }
Event::SmtpConnected(msg) => { Event::SmtpConnected(msg) => {
info!("[SMTP_CONNECTED] {}", msg); println!("[INFO SMTP_CONNECTED] {}", msg);
} }
Event::ImapConnected(msg) => { Event::ImapConnected(msg) => {
info!("[IMAP_CONNECTED] {}", msg); println!("[INFO IMAP_CONNECTED] {}", msg);
} }
Event::SmtpMessageSent(msg) => { Event::SmtpMessageSent(msg) => {
info!("[SMTP_MESSAGE_SENT] {}", msg); println!("[INFO SMTP_MESSAGE_SENT] {}", msg);
} }
Event::Warning(msg) => { Event::Warning(msg) => {
warn!("{}", msg); println!("[WARNING] {}", msg);
} }
Event::Error(msg) => { Event::Error(msg) => {
error!("{}", msg); println!("[ERROR] {}", red.paint(msg));
} }
Event::ErrorNetwork(msg) => { Event::ErrorNetwork(msg) => {
error!("[NETWORK] msg={}", msg); println!("[ERROR NETWORK] msg={}", red.paint(msg));
} }
Event::ErrorSelfNotInGroup(msg) => { Event::ErrorSelfNotInGroup(msg) => {
error!("[SELF_NOT_IN_GROUP] {}", msg); println!("[ERROR SELF_NOT_IN_GROUP] {}", red.paint(msg));
} }
Event::MsgsChanged { chat_id, msg_id } => { Event::MsgsChanged { chat_id, msg_id } => {
info!( println!(
"{}", "{}",
yellow.paint(format!( yellow.paint(format!(
"Received MSGS_CHANGED(chat_id={}, msg_id={})", "Received MSGS_CHANGED(chat_id={}, msg_id={})",
@@ -72,40 +71,40 @@ fn receive_event(event: Event) {
); );
} }
Event::ContactsChanged(_) => { Event::ContactsChanged(_) => {
info!("{}", yellow.paint("Received CONTACTS_CHANGED()")); println!("{}", yellow.paint("Received CONTACTS_CHANGED()"));
} }
Event::LocationChanged(contact) => { Event::LocationChanged(contact) => {
info!( println!(
"{}", "{}",
yellow.paint(format!("Received LOCATION_CHANGED(contact={:?})", contact)) yellow.paint(format!("Received LOCATION_CHANGED(contact={:?})", contact))
); );
} }
Event::ConfigureProgress(progress) => { Event::ConfigureProgress(progress) => {
info!( println!(
"{}", "{}",
yellow.paint(format!("Received CONFIGURE_PROGRESS({} ‰)", progress)) yellow.paint(format!("Received CONFIGURE_PROGRESS({} ‰)", progress))
); );
} }
Event::ImexProgress(progress) => { Event::ImexProgress(progress) => {
info!( println!(
"{}", "{}",
yellow.paint(format!("Received IMEX_PROGRESS({} ‰)", progress)) yellow.paint(format!("Received IMEX_PROGRESS({} ‰)", progress))
); );
} }
Event::ImexFileWritten(file) => { Event::ImexFileWritten(file) => {
info!( println!(
"{}", "{}",
yellow.paint(format!("Received IMEX_FILE_WRITTEN({})", file.display())) yellow.paint(format!("Received IMEX_FILE_WRITTEN({})", file.display()))
); );
} }
Event::ChatModified(chat) => { Event::ChatModified(chat) => {
info!( println!(
"{}", "{}",
yellow.paint(format!("Received CHAT_MODIFIED({})", chat)) yellow.paint(format!("Received CHAT_MODIFIED({})", chat))
); );
} }
_ => { _ => {
info!("Received {:?}", event); println!("Received {}", yellow.paint(format!("{:?}", event)));
} }
} }
} }