Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 17:36:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

the new MsgId type comes with a formatter that makes special formatting in the repl tool superfluous

Browse Source
This commit is contained in:
B. Petersen
2019-11-07 02:16:31 +01:00
committed by holger krekel
parent 515f0c5089
commit 2fae6890c2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/repl/cmdline.rs
View File

@@ -192,7 +192,7 @@ unsafe fn log_msg(context: &Context, prefix: impl AsRef<str>, msg: &Message) {
let msgtext = msg.get_text(); let msgtext = msg.get_text();
info!( info!(
context, context,
"{}#{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]", "{}{}{}{}: {} (Contact#{}): {} {}{}{}{}{} [{}]",
prefix.as_ref(), prefix.as_ref(),
msg.get_id(), msg.get_id(),
if msg.get_showpadlock() { "🔒" } else { "" }, if msg.get_showpadlock() { "🔒" } else { "" },
@@ -240,7 +240,7 @@ unsafe fn log_msglist(context: &Context, msglist: &Vec<MsgId>) -> Result<(), Err
lines_out += 1 lines_out += 1
} }
let msg = Message::load_from_db(context, msg_id)?; let msg = Message::load_from_db(context, msg_id)?;
log_msg(context, "Msg", &msg); log_msg(context, "", &msg);
} }
} }
if lines_out > 0 { if lines_out > 0 {
@@ -426,12 +426,12 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
if msg.is_setupmessage() { if msg.is_setupmessage() {
let setupcodebegin = msg.get_setupcodebegin(context); let setupcodebegin = msg.get_setupcodebegin(context);
println!( println!(
"The setup code for setup message Msg#{} starts with: {}", "The setup code for setup message {} starts with: {}",
msg_id, msg_id,
setupcodebegin.unwrap_or_default(), setupcodebegin.unwrap_or_default(),
); );
} else { } else {
bail!("Msg#{} is no setup message.", msg_id,); bail!("{} is no setup message.", msg_id,);
} }
} }
"continue-key-transfer" => { "continue-key-transfer" => {
@@ -726,7 +726,7 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
let marker = location.marker.as_ref().unwrap_or(&default_marker); let marker = location.marker.as_ref().unwrap_or(&default_marker);
info!( info!(
context, context,
"Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} Msg#{} {}", "Loc#{}: {}: lat={} lng={} acc={} Chat#{} Contact#{} {} {}",
location.location_id, location.location_id,
dc_timestamp_to_str(location.timestamp), dc_timestamp_to_str(location.timestamp),
location.latitude, location.latitude,
@@ -852,9 +852,9 @@ pub unsafe fn dc_cmdline(context: &Context, line: &str) -> Result<(), failure::E
println!("{} images or videos: ", images.len()); println!("{} images or videos: ", images.len());
for (i, data) in images.iter().enumerate() { for (i, data) in images.iter().enumerate() {
if 0 == i { if 0 == i {
print!("Msg#{}", data); print!("{}", data);
} else { } else {
print!(", Msg#{}", data); print!(", {}", data);
} }
} }
print!("\n"); print!("\n");