fix to avoid empty entries

This commit is contained in:
Andrew Pamment 2023-11-15 17:49:35 +10:00
parent 08972bdbf2
commit 2d8980d00b

View File

@ -70,7 +70,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[5;42H"), esc!("[5;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].telnet, bbslist[i].telnet,
@ -80,7 +80,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[8;42H"), esc!("[8;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].ssh, bbslist[i].ssh,
@ -90,7 +90,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[11;42H"), esc!("[11;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].software, bbslist[i].software,
@ -100,7 +100,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[14;42H"), esc!("[14;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].location, bbslist[i].location,
@ -110,7 +110,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[17;42H"), esc!("[17;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].sysop, bbslist[i].sysop,
@ -120,7 +120,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
)?; )?;
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<35}{}", "{}{}{:<37}{}",
esc!("[20;42H"), esc!("[20;42H"),
esc!("[1;33m"), esc!("[1;33m"),
bbslist[i].desc, bbslist[i].desc,
@ -131,7 +131,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
} else { } else {
u.write_ln( u.write_ln(
format!( format!(
"{}{}{:<37}{}", "{}{}{:<35}{}",
p, p,
esc!("[1;37m"), esc!("[1;37m"),
bbslist[i].name, bbslist[i].name,
@ -177,6 +177,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
u.write_str(" Your BBS Name: ")?; u.write_str(" Your BBS Name: ")?;
let name = door_read_string(&mut u, 35)?; let name = door_read_string(&mut u, 35)?;
if !name.is_empty() {
u.write_str("\r\n Telnet Address: ")?; u.write_str("\r\n Telnet Address: ")?;
let telnet = door_read_string(&mut u, 37)?; let telnet = door_read_string(&mut u, 37)?;
u.write_str("\r\n SSH Address: ")?; u.write_str("\r\n SSH Address: ")?;
@ -202,7 +203,7 @@ fn door_main(mut u: User) -> Result<(), Box<dyn Error>> {
let file = File::create("bbslist.json")?; let file = File::create("bbslist.json")?;
serde_json::to_writer_pretty(file, &bbslist)?; serde_json::to_writer_pretty(file, &bbslist)?;
}
door_clear_screen(&mut u)?; door_clear_screen(&mut u)?;
door_display_file(&mut u, "bbslist.ans")?; door_display_file(&mut u, "bbslist.ans")?;
u.write_str( u.write_str(